From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SJ7H7-0000QS-1t for garchives@archives.gentoo.org; Sat, 14 Apr 2012 18:00:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45FE9E0DB9; Sat, 14 Apr 2012 18:00:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 074D4E0DB9 for ; Sat, 14 Apr 2012 18:00:28 +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 40FA21B4041 for ; Sat, 14 Apr 2012 18:00:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 027B5E542C for ; Sat, 14 Apr 2012 18:00:27 +0000 (UTC) From: "Chi-Thanh Christopher Nguyen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chi-Thanh Christopher Nguyen" Message-ID: <1334426301.992d6193e2640ac4f5f72a423a14bd05f36f7e51.chithead@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: media-libs/mesa/ X-VCS-Repository: proj/x11 X-VCS-Files: media-libs/mesa/mesa-9999.ebuild media-libs/mesa/metadata.xml X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: chithead X-VCS-Committer-Name: Chi-Thanh Christopher Nguyen X-VCS-Revision: 992d6193e2640ac4f5f72a423a14bd05f36f7e51 X-VCS-Branch: master Date: Sat, 14 Apr 2012 18:00:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: cf22d637-ee03-4bd4-87d0-a605f24d3c51 X-Archives-Hash: e805b01ef46e8cd0a7f75cbb26306c22 commit: 992d6193e2640ac4f5f72a423a14bd05f36f7e51 Author: Chi-Thanh Christopher Nguyen gentoo org> AuthorDate: Sat Apr 14 17:58:21 2012 +0000 Commit: Chi-Thanh Christopher Nguyen cs tu-berli= n de> CommitDate: Sat Apr 14 17:58:21 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3D992d6193 media-lib/mesa: update for radeonsi, nouveau changes. Add gtest blocker, = bug #411825. The radeonsi driver needs to be enabled separately, because it relies on = the xorg state tracker which causes circular dependencies with xorg-server and it = needs llvm-3.1 which is not released yet. --- media-libs/mesa/mesa-9999.ebuild | 20 ++++++++++++++++---- media-libs/mesa/metadata.xml | 1 + 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999= .ebuild index 0b3f367..1987c99 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -40,7 +40,7 @@ SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc = ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-so= laris ~x64-solaris ~x86-solaris" =20 INTEL_CARDS=3D"i915 i965 intel" -RADEON_CARDS=3D"r100 r200 r300 r600 radeon" +RADEON_CARDS=3D"r100 r200 r300 r600 radeon radeonsi" VIDEO_CARDS=3D"${INTEL_CARDS} ${RADEON_CARDS} nouveau vmware" for card in ${VIDEO_CARDS}; do IUSE_VIDEO_CARDS+=3D" video_cards_${card}" @@ -49,7 +49,7 @@ done IUSE=3D"${IUSE_VIDEO_CARDS} bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +n= ptl openvg osmesa pax_kernel pic selinux +shared-glapi vdpau wayland xvmc x= a - kernel_FreeBSD" + xorg kernel_FreeBSD" =20 REQUIRED_USE=3D" d3d? ( gallium ) @@ -60,6 +60,7 @@ REQUIRED_USE=3D" g3dvl? ( || ( vdpau xvmc ) ) vdpau? ( g3dvl ) xa? ( gallium ) + xorg? ( gallium ) xvmc? ( g3dvl ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) @@ -70,10 +71,11 @@ REQUIRED_USE=3D" video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) + video_cards_radeonsi? ( gallium llvm xorg ) video_cards_vmware? ( gallium ) " =20 -LIBDRM_DEPSTRING=3D">=3Dx11-libs/libdrm-2.4.31" +LIBDRM_DEPSTRING=3D">=3Dx11-libs/libdrm-2.4.34" # not a runtime dependency of this package, but dependency of packages w= hich # depend on this package, bug #342393 EXTERNAL_DEPEND=3D" @@ -82,7 +84,9 @@ EXTERNAL_DEPEND=3D" " # keep correct libdrm and dri2proto dep # keep blocks in rdepend for binpkg +# gtest file collision bug #411825 RDEPEND=3D"${EXTERNAL_DEPEND} + !dev-cpp/gtest !=3Dx11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) + xorg? ( + x11-base/xorg-server + x11-libs/libdrm[libkms] + ) xvmc? ( >=3Dx11-libs/libXvMC-1.0.6 ) ${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?] " @@ -114,7 +122,10 @@ for card in ${RADEON_CARDS}; do done =20 DEPEND=3D"${RDEPEND} - llvm? ( >=3Dsys-devel/llvm-2.9 ) + llvm? ( + >=3Dsys-devel/llvm-2.9 + video_cards_radeonsi? ( >=3Dsys-devel/llvm-3.1 ) + ) =3Ddev-lang/python-2* dev-libs/libxml2[python] dev-util/pkgconfig @@ -226,6 +237,7 @@ src_configure() { =20 gallium_enable video_cards_r300 r300 gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi if ! use video_cards_r300 && \ ! use video_cards_r600; then gallium_enable video_cards_radeon r300 r600 diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml index 4e26781..ce969ec 100644 --- a/media-libs/mesa/metadata.xml +++ b/media-libs/mesa/metadata.xml @@ -21,6 +21,7 @@ Enable the VDPAU acceleration interface for the Ga= llium3D Video Layer. Enable support for dev-libs/wayland Enable the XA (X Acceleration) API for Gallium3D. + Enable the Xorg state tracker for Gallium3D. This i= s not required for OpenGL acceleration in X. Enable the XvMC acceleration interface for the Gall= ium3D Video Layer.