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 841861381F3 for ; Mon, 6 May 2013 17:37:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B62CE0948; Mon, 6 May 2013 17:37:27 +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 C4317E0942 for ; Mon, 6 May 2013 17:37: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 C275633DFC1 for ; Mon, 6 May 2013 17:37:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 28C47E4CD7 for ; Mon, 6 May 2013 17:37:14 +0000 (UTC) From: "Chi-Thanh Christopher Nguyen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chi-Thanh Christopher Nguyen" Message-ID: <1347467287.0e16c8a0a8b9ebcd763ac3aae53cb173a278fed2.chithead@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: / X-VCS-Repository: proj/x11 X-VCS-Committer: chithead X-VCS-Committer-Name: Chi-Thanh Christopher Nguyen X-VCS-Revision: 0e16c8a0a8b9ebcd763ac3aae53cb173a278fed2 X-VCS-Branch: master Date: Mon, 6 May 2013 17:37:14 +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: ddc0d5e7-e1dc-4ac8-8a34-63f2bf156dd9 X-Archives-Hash: ebabb1a9f1605f2bb0a9b13a42ea76ca commit: 0e16c8a0a8b9ebcd763ac3aae53cb173a278fed2 Author: Alexey Shvetsov gentoo org> AuthorDate: Wed Sep 12 16:28:07 2012 +0000 Commit: Chi-Thanh Christopher Nguyen cs tu-berlin de> CommitDate: Wed Sep 12 16:28:07 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=0e16c8a0 Merge branch 'master' into opencl Conflicts: media-libs/mesa/mesa-9999.ebuild Signed-off-by: Alexey Shvetsov gentoo.org> dev-libs/weston/Manifest | 1 + dev-libs/weston/metadata.xml | 13 +++++++++++++ dev-libs/weston/weston-0.85.0.ebuild | 2 +- .../{weston-9999.ebuild => weston-0.95.0.ebuild} | 4 ++-- dev-libs/weston/weston-9999.ebuild | 4 ++-- media-libs/mesa/mesa-9999.ebuild | 9 +++------ media-libs/mesa/metadata.xml | 1 - x11-base/xorg-drivers/xorg-drivers-9999.ebuild | 5 +++-- x11-drivers/ati-drivers/Manifest | 1 + x11-drivers/xf86-video-intel/metadata.xml | 2 ++ .../xf86-video-intel/xf86-video-intel-9999.ebuild | 16 ++++++++++------ 11 files changed, 38 insertions(+), 20 deletions(-) diff --cc media-libs/mesa/mesa-9999.ebuild index 413c40c,a094a48..7c2cea0 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@@ -46,12 -46,11 +46,11 @@@ for card in ${VIDEO_CARDS}; d done IUSE="${IUSE_VIDEO_CARDS} - bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl - opencl openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi - vdpau wayland xvmc xa xorg kernel_FreeBSD" + bindist +classic debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl - openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau ++ opencl openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau + wayland xvmc xa xorg kernel_FreeBSD" REQUIRED_USE=" - d3d? ( gallium ) g3dvl? ( gallium ) llvm? ( gallium ) openvg? ( egl gallium ) @@@ -99,11 -97,6 +98,10 @@@ RDEPEND="${EXTERNAL_DEPEND x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 - d3d? ( app-emulation/wine ) + opencl? ( + app-admin/eselect-opencl + dev-libs/libclc + ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xorg? (