From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 90A9D138200 for ; Sat, 6 Apr 2013 10:34:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0712FE0DF6; Sat, 6 Apr 2013 10:34:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5FFE4E0DF5 for ; Sat, 6 Apr 2013 10:34:16 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4C7F533DC52 for ; Sat, 6 Apr 2013 10:34:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D2DFCE408E for ; Sat, 6 Apr 2013 10:34:13 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1365244410.4f15ee97eea258c3d96d05db57b59c846d8f9aca.alexxy@gentoo> Subject: [gentoo-commits] proj/x11:opencl commit in: / X-VCS-Repository: proj/x11 X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: 4f15ee97eea258c3d96d05db57b59c846d8f9aca X-VCS-Branch: opencl Date: Sat, 6 Apr 2013 10:34:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4609ce51-731d-4aa4-ac87-f3062f91167d X-Archives-Hash: 69445425fbb3afbd640ef9c8b4d3a62a commit: 4f15ee97eea258c3d96d05db57b59c846d8f9aca Author: Alexey Shvetsov gentoo org> AuthorDate: Sat Apr 6 10:33:30 2013 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Sat Apr 6 10:33:30 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4f15ee97 Merge branch 'master' into opencl Signed-off-by: Alexey Shvetsov gentoo.org> Conflicts: media-libs/mesa/mesa-9999.ebuild media-libs/mesa/mesa-9999.ebuild | 23 +- sys-apps/kmscon/kmscon-9999.ebuild | 164 +++++ sys-apps/kmscon/metadata.xml | 14 + x11-apps/mesa-progs/mesa-progs-9999.ebuild | 6 +- x11-base/xorg-drivers/xorg-drivers-9999.ebuild | 19 +- x11-drivers/ati-drivers/Manifest | 3 +- x11-drivers/ati-drivers/ati-drivers-12.10.ebuild | 629 -------------------- x11-drivers/ati-drivers/ati-drivers-13.1.ebuild | 7 +- .../ati-drivers/ati-drivers-13.1_pre897.ebuild | 9 +- .../ati-drivers/ati-drivers-13.2_beta7.ebuild | 30 +- ..._beta3.ebuild => ati-drivers-13.3_beta3.ebuild} | 37 +- .../xf86-input-evdev/xf86-input-evdev-9999.ebuild | 2 +- .../xf86-input-keyboard-9999.ebuild | 2 +- .../xf86-input-mouse/xf86-input-mouse-9999.ebuild | 2 +- .../xf86-input-wacom/xf86-input-wacom-9999.ebuild | 2 +- .../xf86-video-ati/xf86-video-ati-9999.ebuild | 4 +- x11-libs/glamor/glamor-9999.ebuild | 7 +- x11-libs/libSM/libSM-9999.ebuild | 10 +- x11-libs/libXaw3d/libXaw3d-9999.ebuild | 6 +- x11-libs/libdrm/libdrm-9999.ebuild | 3 +- x11-libs/libxcb/libxcb-9999.ebuild | 14 +- x11-libs/libxkbcommon/libxkbcommon-9999.ebuild | 27 +- .../xinput => x11-libs/libxkbcommon}/metadata.xml | 0 x11-libs/xpyb/xpyb-9999.ebuild | 16 +- x11-proto/inputproto/inputproto-9999.ebuild | 2 +- x11-proto/xcb-proto/xcb-proto-9999.ebuild | 22 +- 26 files changed, 328 insertions(+), 732 deletions(-) diff --cc media-libs/mesa/mesa-9999.ebuild index 627442d,0145944..c2d9368 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@@ -117,16 -114,11 +119,16 @@@ don DEPEND="${RDEPEND} llvm? ( >=sys-devel/llvm-2.9 - r600-llvm-compiler? ( >=sys-devel/llvm-3.1 ) - video_cards_radeonsi? ( >=sys-devel/llvm-3.1 ) + r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) + video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) ) + opencl? ( - >=sys-devel/llvm-3.2[multitarget] - >=sys-devel/clang-3.2[multitarget] ++ >=sys-devel/llvm[video_cards_radeon] ++ >=sys-devel/clang-3.3 + >=sys-devel/gcc-4.6 + ) - =dev-lang/python-2* - dev-libs/libxml2[python] + ${PYTHON_DEPS} + dev-libs/libxml2[python,${PYTHON_USEDEP}] sys-devel/bison sys-devel/flex virtual/pkgconfig