[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Tomas Chvatal]

commit:     3e860ff9a528bb57f37813643c98f00964cd05e5
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  7 22:34:47 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Mon Mar  7 22:34:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3e860ff9

[media-libs/mesa] Enable shared dricode by default. Fix bug #357177.

---
 media-libs/mesa/mesa-9999.ebuild |   24 +++++++++++++-----------
 1 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 7f739ef..c8403af 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -202,7 +202,7 @@ src_configure() {
 		driver_enable video_cards_via unichrome
 	fi
 
-	myconf="${myconf} $(use_enable gallium)"
+	myconf+=" $(use_enable gallium)"
 	if use !gallium && use !classic; then
 		ewarn "You enabled neither classic nor gallium USE flags. No hardware"
 		ewarn "drivers will be built."
@@ -216,7 +216,7 @@ src_configure() {
 		elog "    Radeon: Newest implementation of r300-r700 driver."
 		elog "    Svga: VMWare Virtual GPU driver."
 		echo
-		myconf="${myconf}
+		myconf+="
 			--with-state-trackers=glx,dri,egl,vega$(use d3d && echo ",d3d1x")
 			$(use_enable llvm gallium-llvm)
 			$(use_enable gles gles1)
@@ -227,30 +227,31 @@ src_configure() {
 			$(use_enable video_cards_intel gallium-i915)
 			$(use_enable video_cards_intel gallium-i965)
 			$(use_enable video_cards_radeon gallium-radeon)
-			$(use_enable video_cards_radeon gallium-r600)"
+			$(use_enable video_cards_radeon gallium-r600)
+		"
 		if use video_cards_i915 || \
 				use video_cards_intel; then
-			myconf="${myconf} --enable-gallium-i915"
+			myconf+=" --enable-gallium-i915"
 		else
-			myconf="${myconf} --disable-gallium-i915"
+			myconf+=" --disable-gallium-i915"
 		fi
 		if use video_cards_i965 || \
 				use video_cards_intel; then
-			myconf="${myconf} --enable-gallium-i965"
+			myconf+=" --enable-gallium-i965"
 		else
-			myconf="${myconf} --disable-gallium-i965"
+			myconf+=" --disable-gallium-i965"
 		fi
 		if use video_cards_r300 || \
 				use video_cards_radeon; then
-			myconf="${myconf} --enable-gallium-radeon"
+			myconf+=" --enable-gallium-radeon"
 		else
-			myconf="${myconf} --disable-gallium-radeon"
+			myconf+=" --disable-gallium-radeon"
 		fi
 		if use video_cards_r600 || \
 				use video_cards_radeon; then
-			myconf="${myconf} --enable-gallium-r600"
+			myconf+=" --enable-gallium-r600"
 		else
-			myconf="${myconf} --disable-gallium-r600"
+			myconf+=" --disable-gallium-r600"
 		fi
 	else
 		if use video_cards_nouveau || use video_cards_vmware; then
@@ -261,6 +262,7 @@ src_configure() {
 
 	# --with-driver=dri|xlib|osmesa || do we need osmesa?
 	econf \
+		--enable-shared-dricore
 		--disable-option-checking \
 		--with-driver=dri \
 		--disable-glut \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Tomas Chvatal]

commit:     eaf0343b92c88d9602d36c58b2f2d2b2dc2c9ec1
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  9 13:51:13 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Wed Mar  9 13:51:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=eaf0343b

[media-libs/mesa] Fix typo ; missing \

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index c8403af..c30a0aa 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -262,7 +262,7 @@ src_configure() {
 
 	# --with-driver=dri|xlib|osmesa || do we need osmesa?
 	econf \
-		--enable-shared-dricore
+		--enable-shared-dricore \
 		--disable-option-checking \
 		--with-driver=dri \
 		--disable-glut \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Tomas Chvatal]

commit:     e116cbf735a0e7e3e828fc3079a78250640dc61f
Author:     David Heidelberger <d.okias <AT> gmail <DOT> com>
AuthorDate: Sun Mar 13 22:17:43 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 22:17:35 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=e116cbf7

remove udis86 dep, require llvm-2.7

---
 media-libs/mesa/mesa-9999.ebuild |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index c30a0aa..bd4d163 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -67,12 +67,7 @@ RDEPEND="
 	d3d? ( app-emulation/wine )
 	motif? ( x11-libs/openmotif )
 	gallium? (
-		llvm? (
-			amd64? ( dev-libs/udis86 )
-			x86? ( dev-libs/udis86 )
-			x86-fbsd? ( dev-libs/udis86 )
-			sys-devel/llvm
-		)
+		llvm? ( >=sys-devel/llvm-2.7 )
 	)
 	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
 "

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     75708b1dc884318da597ababea4384030a878a0e
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 26 05:47:51 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Mar 26 05:47:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=75708b1d

add egl, openvg, and wayland USE flags

---
 media-libs/mesa/mesa-9999.ebuild |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index bd4d163..82f54fb 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -45,7 +45,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d debug +gallium gles llvm motif +nptl pic selinux kernel_FreeBSD"
+	+classic d3d debug egl +gallium gles llvm motif +nptl openvg pic selinux wayland kernel_FreeBSD"
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
 # keep correct libdrm and dri2proto dep
@@ -69,6 +69,7 @@ RDEPEND="
 	gallium? (
 		llvm? ( >=sys-devel/llvm-2.7 )
 	)
+	wayland? ( x11-base/wayland )
 	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
 "
 for card in ${INTEL_CARDS}; do
@@ -197,7 +198,15 @@ src_configure() {
 		driver_enable video_cards_via unichrome
 	fi
 
-	myconf+=" $(use_enable gallium)"
+	if use egl; then
+		myconf+="--with-egl-platforms=$(use wayland && echo "wayland,")drm,x11"
+	fi
+
+	myconf+="
+		$(use_enable gles gles1)
+		$(use_enable gles gles2)
+		$(use_enable gallium)
+	"
 	if use !gallium && use !classic; then
 		ewarn "You enabled neither classic nor gallium USE flags. No hardware"
 		ewarn "drivers will be built."
@@ -212,11 +221,8 @@ src_configure() {
 		elog "    Svga: VMWare Virtual GPU driver."
 		echo
 		myconf+="
-			--with-state-trackers=glx,dri,egl,vega$(use d3d && echo ",d3d1x")
+			--with-state-trackers=glx,dri$(use egl && echo ",egl")$(use openvg && echo ",vega")$(use d3d && echo ",d3d1x")
 			$(use_enable llvm gallium-llvm)
-			$(use_enable gles gles1)
-			$(use_enable gles gles2)
-			$(use_enable gles gles-overlay)
 			$(use_enable video_cards_vmware gallium-svga)
 			$(use_enable video_cards_nouveau gallium-nouveau)
 			$(use_enable video_cards_intel gallium-i915)

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     9bf6a2e57b43894bf96471e202f24f63556913f9
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 26 13:29:14 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Mar 26 13:29:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=9bf6a2e5

properly disable egl and openvg when not requested

---
 media-libs/mesa/mesa-9999.ebuild |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 82f54fb..bdbe933 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -200,11 +200,14 @@ src_configure() {
 
 	if use egl; then
 		myconf+="--with-egl-platforms=$(use wayland && echo "wayland,")drm,x11"
+	else
+		myconf+="--disable-egl"
 	fi
 
 	myconf+="
 		$(use_enable gles gles1)
 		$(use_enable gles gles2)
+		$(use_enable openvg)
 		$(use_enable gallium)
 	"
 	if use !gallium && use !classic; then

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Tomas Chvatal]

commit:     955fbacf29abdd1eddf50b96ce172cb09f5a9cbe
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 13:32:53 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 13:32:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=955fbacf

[media-libs/mesa] Parse the egl more nicely.

---
 media-libs/mesa/mesa-9999.ebuild |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index bdbe933..5573dd6 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -198,18 +198,15 @@ src_configure() {
 		driver_enable video_cards_via unichrome
 	fi
 
-	if use egl; then
-		myconf+="--with-egl-platforms=$(use wayland && echo "wayland,")drm,x11"
-	else
-		myconf+="--disable-egl"
-	fi
-
 	myconf+="
 		$(use_enable gles gles1)
 		$(use_enable gles gles2)
+		$(use_enable egl)
+		$(use_with egl egl-platforms "$(use wayland && echo "wayland,")drm,x11")
 		$(use_enable openvg)
 		$(use_enable gallium)
 	"
+
 	if use !gallium && use !classic; then
 		ewarn "You enabled neither classic nor gallium USE flags. No hardware"
 		ewarn "drivers will be built."

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     928f50daf1fa7e360b9fd7ad05b7f4bef320e972
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 26 13:50:28 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Mar 26 13:50:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=928f50da

mesa's configure can't handle --without-egl-platforms

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 5573dd6..b6cdb4c 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -202,10 +202,10 @@ src_configure() {
 		$(use_enable gles gles1)
 		$(use_enable gles gles2)
 		$(use_enable egl)
-		$(use_with egl egl-platforms "$(use wayland && echo "wayland,")drm,x11")
 		$(use_enable openvg)
 		$(use_enable gallium)
 	"
+	use egl && myconf+="--with-egl-platforms=$(use wayland && echo "wayland,")drm,x11"
 
 	if use !gallium && use !classic; then
 		ewarn "You enabled neither classic nor gallium USE flags. No hardware"

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Tomas Chvatal]

commit:     0f096988223464364670b5b0fe9c9c742bbb89a1
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 15:45:23 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 15:45:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=0f096988

[media-libs/mesa] Enable egl by default.

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index b6cdb4c..caafebc 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -45,7 +45,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d debug egl +gallium gles llvm motif +nptl openvg pic selinux wayland kernel_FreeBSD"
+	+classic d3d debug +egl +gallium gles llvm motif +nptl openvg pic selinux wayland kernel_FreeBSD"
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
 # keep correct libdrm and dri2proto dep

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     8e6f990867ccd16ed586338224cf66daee86dc25
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 10:44:17 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Apr 10 10:44:17 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=8e6f9908

media-libs/mesa: disable shared-dricore by default.

---
 media-libs/mesa/mesa-9999.ebuild |    4 ++--
 media-libs/mesa/metadata.xml     |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index caafebc..8b0ffe6 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -45,7 +45,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d debug +egl +gallium gles llvm motif +nptl openvg pic selinux wayland kernel_FreeBSD"
+	+classic d3d debug +egl +gallium gles llvm motif +nptl openvg pic selinux shared-dricore wayland kernel_FreeBSD"
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
 # keep correct libdrm and dri2proto dep
@@ -263,7 +263,6 @@ src_configure() {
 
 	# --with-driver=dri|xlib|osmesa || do we need osmesa?
 	econf \
-		--enable-shared-dricore \
 		--disable-option-checking \
 		--with-driver=dri \
 		--disable-glut \
@@ -274,6 +273,7 @@ src_configure() {
 		$(use_enable motif) \
 		$(use_enable nptl glx-tls) \
 		$(use_enable !pic asm) \
+		$(use_enable shared-dricore) \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		${myconf}
 }

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 3f8d840..5d7a13e 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -9,5 +9,6 @@
 	<flag name='gles'>Enable GLES support for Gallium3D.</flag>
 	<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
+	<flag name='shared-dricore'>Enable sharing of common code for classic DRI drivers.</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     70dc23cf99bc6412089668322d963a8f2e37840b
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 11:25:53 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Mon Apr 11 11:25:53 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=70dc23cf

media-libs/mesa: sync with portage

---
 media-libs/mesa/mesa-9999.ebuild |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 8b0ffe6..54a96b9 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -53,7 +53,8 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
 RDEPEND="
 	!<x11-base/xorg-server-1.7
 	!<=x11-proto/xf86driproto-2.0.3
-	>=app-admin/eselect-mesa-0.0.3
+	classic? ( app-admin/eselect-mesa )
+	gallium? ( app-admin/eselect-mesa )
 	>=app-admin/eselect-opengl-1.1.1-r2
 	dev-libs/expat
 	dev-libs/libxml2[python]
@@ -316,8 +317,9 @@ src_install() {
 	eend $?
 
 	if use classic || use gallium; then
-		ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			ebegin "Moving DRI/Gallium drivers for dynamic switching"
 			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			keepdir /usr/$(get_libdir)/dri
 			dodir /usr/$(get_libdir)/mesa
 			for x in ${gallium_drivers[@]}; do
 				if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then
@@ -354,7 +356,9 @@ pkg_postinst() {
 	echo
 	eselect opengl set --use-old ${OPENGL_DIR}
 	# Select classic/gallium drivers
-	eselect mesa set --auto
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
 }
 
 # $1 - VIDEO_CARDS flag

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     b1971fb0c296b5b2c8d4cd5993a039f2fe0fce5f
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Apr 15 16:48:23 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Apr 15 16:48:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b1971fb0

[media-libs/mesa] add texture-float USE flag

---
 media-libs/mesa/mesa-9999.ebuild |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 54a96b9..060498e 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -45,7 +45,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d debug +egl +gallium gles llvm motif +nptl openvg pic selinux shared-dricore wayland kernel_FreeBSD"
+	+classic d3d debug +egl texture-float +gallium gles llvm motif +nptl openvg pic selinux shared-dricore wayland kernel_FreeBSD"
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
 # keep correct libdrm and dri2proto dep
@@ -200,6 +200,7 @@ src_configure() {
 	fi
 
 	myconf+="
+		$(use_enable texture-float)
 		$(use_enable gles gles1)
 		$(use_enable gles gles2)
 		$(use_enable egl)

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     07530341e75e8d954c9ab5241ae8b03cb69e6947
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 20:42:14 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Fri Apr 15 20:42:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=07530341

media-libs/mesa: RESTRICT=bindist for texture-float, add description to metadata

---
 media-libs/mesa/mesa-9999.ebuild |    4 ++++
 media-libs/mesa/metadata.xml     |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 060498e..d383e0d 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -97,6 +97,10 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto
 "
 
+RESTRICT="
+	texture-float? ( bindist )
+"
+
 S="${WORKDIR}/${MY_P}"
 
 # It is slow without texrels, if someone wants slow

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 5d7a13e..bfe1b8a 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -10,5 +10,6 @@
 	<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
 	<flag name='shared-dricore'>Enable sharing of common code for classic DRI drivers.</flag>
+	<flag name='texture-float'>Enable support for floating point textures.</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     01b11b0f50aa78dfc36e3559da61202fe71dca1e
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 10:50:31 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sat Apr 16 10:50:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=01b11b0f

media-libs/mesa: change texture-float flag to bindist, bug #363747

---
 media-libs/mesa/mesa-9999.ebuild |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index d383e0d..cdb843c 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -45,7 +45,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	+classic d3d debug +egl texture-float +gallium gles llvm motif +nptl openvg pic selinux shared-dricore wayland kernel_FreeBSD"
+	bindist +classic d3d debug +egl +gallium gles llvm motif +nptl openvg pic selinux shared-dricore wayland kernel_FreeBSD"
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
 # keep correct libdrm and dri2proto dep
@@ -97,10 +97,6 @@ DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto
 "
 
-RESTRICT="
-	texture-float? ( bindist )
-"
-
 S="${WORKDIR}/${MY_P}"
 
 # It is slow without texrels, if someone wants slow
@@ -204,7 +200,7 @@ src_configure() {
 	fi
 
 	myconf+="
-		$(use_enable texture-float)
+		$(use_enable !bindist texture-float)
 		$(use_enable gles gles1)
 		$(use_enable gles gles2)
 		$(use_enable egl)
@@ -287,6 +283,10 @@ src_configure() {
 src_install() {
 	base_src_install
 
+	if use !bindist; then
+		dodoc docs/patents.txt || die
+	fi
+
 	# Save the glsl-compiler for later use
 	if ! tc-is-cross-compiler; then
 		dobin "${S}"/src/glsl/glsl_compiler || die
@@ -364,6 +364,12 @@ pkg_postinst() {
 	if use classic || use gallium; then
 		eselect mesa set --auto
 	fi
+	
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see patents.txt for an explanation."
+	fi
 }
 
 # $1 - VIDEO_CARDS flag

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     55e61b29c9337fdda1374a3b30d60dfc45a68c2a
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 10:51:46 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sat Apr 16 10:51:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=55e61b29

media-libs/mesa: remove gallium log messages

---
 media-libs/mesa/mesa-9999.ebuild |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index cdb843c..d451fe3 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -214,14 +214,6 @@ src_configure() {
 		ewarn "drivers will be built."
 	fi
 	if use gallium; then
-		elog "You have enabled gallium infrastructure."
-		elog "This infrastructure currently support these drivers:"
-		elog "    Intel: works only i915 and i965 somehow."
-		elog "    LLVMpipe: Software renderer."
-		elog "    Nouveau: Support for nVidia NV30 and later cards."
-		elog "    Radeon: Newest implementation of r300-r700 driver."
-		elog "    Svga: VMWare Virtual GPU driver."
-		echo
 		myconf+="
 			--with-state-trackers=glx,dri$(use egl && echo ",egl")$(use openvg && echo ",vega")$(use d3d && echo ",d3d1x")
 			$(use_enable llvm gallium-llvm)

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     491849a080ba407094c0dc35ee4995cfc349a58b
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 21:41:02 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Apr 17 21:41:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=491849a0

media-libs/mesa: sync with portage

---
 media-libs/mesa/mesa-9999.ebuild |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index d451fe3..7ad6f2e 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -48,9 +48,15 @@ IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic d3d debug +egl +gallium gles llvm motif +nptl openvg pic selinux shared-dricore wayland kernel_FreeBSD"
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
+# not a runtime dependency of this package, but dependency of packages which
+# depend on this package, bug #342393
+EXTERNAL_DEPEND="
+	>=x11-proto/dri2proto-2.2
+	>=x11-proto/glproto-1.4.11
+"
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
-RDEPEND="
+RDEPEND="${EXTERNAL_DEPEND}
 	!<x11-base/xorg-server-1.7
 	!<=x11-proto/xf86driproto-2.0.3
 	classic? ( app-admin/eselect-mesa )
@@ -89,8 +95,6 @@ DEPEND="${RDEPEND}
 	=dev-lang/python-2*
 	dev-util/pkgconfig
 	x11-misc/makedepend
-	>=x11-proto/dri2proto-2.2
-	>=x11-proto/glproto-1.4.11
 	x11-proto/inputproto
 	>=x11-proto/xextproto-7.0.99.1
 	x11-proto/xf86driproto

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Tomas Chvatal]

commit:     afdc57526be09b59a49adf20c8f4c4219a6e087e
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 12:14:02 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 12:14:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=afdc5752

[media-libs/mesa] Migrate to git-2 eclass. Update radeon to match trunk configure.ac

---
 media-libs/mesa/mesa-9999.ebuild |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 7ad6f2e..be7f604 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=3
 EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
 
 if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git"
+	GIT_ECLASS="git-2"
 	EXPERIMENTAL="true"
 fi
 
@@ -124,7 +124,7 @@ pkg_setup() {
 }
 
 src_unpack() {
-	[[ $PV = 9999* ]] && git_src_unpack || base_src_unpack
+	[[ $PV = 9999* ]] && git-2_src_unpack || base_src_unpack
 }
 
 src_prepare() {
@@ -155,7 +155,6 @@ src_prepare() {
 			"${S}"/src/mesa/shader/slang/library/Makefile || die
 	fi
 
-	[[ $PV = 9999* ]] && git_src_prepare
 	base_src_prepare
 
 	eautoreconf
@@ -225,7 +224,7 @@ src_configure() {
 			$(use_enable video_cards_nouveau gallium-nouveau)
 			$(use_enable video_cards_intel gallium-i915)
 			$(use_enable video_cards_intel gallium-i965)
-			$(use_enable video_cards_radeon gallium-radeon)
+			$(use_enable video_cards_radeon gallium-r300)
 			$(use_enable video_cards_radeon gallium-r600)
 		"
 		if use video_cards_i915 || \
@@ -242,9 +241,9 @@ src_configure() {
 		fi
 		if use video_cards_r300 || \
 				use video_cards_radeon; then
-			myconf+=" --enable-gallium-radeon"
+			myconf+=" --enable-gallium-r300"
 		else
-			myconf+=" --disable-gallium-radeon"
+			myconf+=" --disable-gallium-r300"
 		fi
 		if use video_cards_r600 || \
 				use video_cards_radeon; then
@@ -360,7 +359,7 @@ pkg_postinst() {
 	if use classic || use gallium; then
 		eselect mesa set --auto
 	fi
-	
+
 	# warn about patent encumbered texture-float
 	if use !bindist; then
 		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Tomas Chvatal]

commit:     e3615e7bd0928db49e25173581f00a2e4a1b6579
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 11:35:27 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 11:35:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=e3615e7b

[media-libs/mesa] enable llvm by default. Damn i need eapi4 so i could use required_use

---
 media-libs/mesa/mesa-9999.ebuild |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index be7f604..1e430f7 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -45,7 +45,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d debug +egl +gallium gles llvm motif +nptl openvg pic selinux shared-dricore wayland kernel_FreeBSD"
+	bindist +classic d3d debug +egl +gallium gles +llvm motif +nptl openvg pic selinux shared-dricore wayland kernel_FreeBSD"
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
 # not a runtime dependency of this package, but dependency of packages which
@@ -74,7 +74,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 	d3d? ( app-emulation/wine )
 	motif? ( x11-libs/openmotif )
 	gallium? (
-		llvm? ( >=sys-devel/llvm-2.7 )
+		llvm? ( >=sys-devel/llvm-2.9 )
 	)
 	wayland? ( x11-base/wayland )
 	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Donnie Berkholz]

commit:     acb114990bde9cb0858688297233ae3b76cea12e
Author:     Donnie Berkholz <dberkholz <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 03:05:10 2011 +0000
Commit:     Donnie Berkholz <dberkholz <AT> gentoo <DOT> org>
CommitDate: Thu May 26 03:05:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=acb11499

mesa: allow patches to live-git 9999 versions.

---
 media-libs/mesa/mesa-9999.ebuild |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 1e430f7..670fdc4 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -124,12 +124,13 @@ pkg_setup() {
 }
 
 src_unpack() {
-	[[ $PV = 9999* ]] && git-2_src_unpack || base_src_unpack
+	default
+	[[ $PV = 9999* ]] && git-2_src_unpack
 }
 
 src_prepare() {
 	# apply patches
-	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
+	if [[ -n ${SRC_PATCHES} ]]; then
 		EPATCH_FORCE="yes" \
 		EPATCH_SOURCE="${WORKDIR}/patches" \
 		EPATCH_SUFFIX="patch" \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     bd63f69b147e4c2bef3b3bedd76965849dc52819
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 20:33:23 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Fri Jul  1 20:33:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=bd63f69b

media-libs/mesa: enable gallium-egl to fix openvg build failure, bug #373735

---
 media-libs/mesa/mesa-9999.ebuild |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index fe3f798..b77d967 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -212,7 +212,10 @@ src_configure() {
 	"
 	if use egl; then
 		use shared-glapi || die "egl needs shared-glapi. Please either enable shared-glapi or disable the egl use flag ."
-		myconf+="--with-egl-platforms=$(use wayland && echo "wayland,")drm,x11"
+		myconf+="
+			--with-egl-platforms=$(use wayland && echo "wayland,")drm,x11
+			$(use_enable gallium gallium-egl)
+		"
 	fi
 
 	if use !gallium && use !classic; then

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     ef2fa7f74c6df342180c34fb7690b0166614ea8a
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 21:50:25 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sat Jul  9 21:50:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=ef2fa7f7

media-libs/mesa: sync with portage

---
 media-libs/mesa/mesa-9999.ebuild |   17 ++++++++++++++---
 media-libs/mesa/metadata.xml     |    4 +++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index b77d967..14db3c8 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -61,7 +61,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 	!<=x11-proto/xf86driproto-2.0.3
 	classic? ( app-admin/eselect-mesa )
 	gallium? ( app-admin/eselect-mesa )
-	>=app-admin/eselect-opengl-1.1.1-r2
+	>=app-admin/eselect-opengl-1.2.2
 	dev-libs/expat
 	dev-libs/libxml2[python]
 	x11-libs/libICE
@@ -130,12 +130,16 @@ src_unpack() {
 
 src_prepare() {
 	# apply patches
-	if [[ -n ${SRC_PATCHES} ]]; then
+	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
 		EPATCH_FORCE="yes" \
 		EPATCH_SOURCE="${WORKDIR}/patches" \
 		EPATCH_SUFFIX="patch" \
 		epatch
 	fi
+
+	# fix for hardened, bug 240956
+	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
+
 	# FreeBSD 6.* doesn't have posix_memalign().
 	if [[ ${CHOST} == *-freebsd6.* ]]; then
 		sed -i \
@@ -250,6 +254,13 @@ src_configure() {
 		fi
 	fi
 
+	# x86 hardened needs glx-rts, bug 240956
+	if use hardened; then
+		myconf+="
+			$(use_enable x86 glx-rts)
+		"
+	fi
+
 	# --with-driver=dri|xlib|osmesa || do we need osmesa?
 	econf \
 		--disable-option-checking \
@@ -296,7 +307,7 @@ src_install() {
 	ebegin "Moving libGL and friends for dynamic switching"
 		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
 		local x
-		for x in "${ED}"/usr/$(get_libdir)/libGL.{la,a,so*}; do
+		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL,OpenVG}.{la,a,so*}; do
 			if [ -f ${x} -o -L ${x} ]; then
 				mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
 					|| die "Failed to move ${x}"

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index bfe1b8a..d66c89e 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -5,11 +5,13 @@
 <use>
 	<flag name='classic'>Build drivers based on the classic architecture.</flag>
 	<flag name='d3d'>Enable DirectX 10/10.1/11 backend for Gallium3D.</flag>
+	<flag name='egl'>Enable EGL support for Gallium3D.</flag>
 	<flag name='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
 	<flag name='gles'>Enable GLES support for Gallium3D.</flag>
 	<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
+	<flag name='openvg'>Enable the OpenVG 2D acceleration API</flag>
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
 	<flag name='shared-dricore'>Enable sharing of common code for classic DRI drivers.</flag>
-	<flag name='texture-float'>Enable support for floating point textures.</flag>
+	<flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     c625df2e0f23c288c5f52bc53562828a6425da0f
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 22:45:39 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Jul 10 22:45:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=c625df2e

media-libs/mesa: bump dri2proto, glproto dependency

---
 media-libs/mesa/mesa-9999.ebuild |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 14db3c8..9d21b01 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -51,8 +51,8 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
 # not a runtime dependency of this package, but dependency of packages which
 # depend on this package, bug #342393
 EXTERNAL_DEPEND="
-	>=x11-proto/dri2proto-2.2
-	>=x11-proto/glproto-1.4.11
+	>=x11-proto/dri2proto-2.6
+	>=x11-proto/glproto-1.4.14
 "
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     b4cfa6e759a2912e81b360e1d0fa02c4835ba227
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 15:48:52 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Thu Jul 14 15:48:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b4cfa6e7

media-libs/mesa: adapt ebuild for configure.ac changes following the pipe-video merge.

---
 media-libs/mesa/mesa-9999.ebuild |    9 ++++++++-
 media-libs/mesa/metadata.xml     |    4 ++++
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 9d21b01..6a8c687 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -45,7 +45,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d debug +egl +gallium gles +llvm motif +nptl openvg pic selinux shared-dricore +shared-glapi wayland kernel_FreeBSD"
+	bindist +classic d3d debug +egl g3dvl +gallium gles +llvm motif +nptl openvg pic selinux shared-dricore +shared-glapi vaapi vdpau wayland xvmc kernel_FreeBSD"
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
 # not a runtime dependency of this package, but dependency of packages which
@@ -76,7 +76,10 @@ RDEPEND="${EXTERNAL_DEPEND}
 	gallium? (
 		llvm? ( >=sys-devel/llvm-2.9 )
 	)
+	vaapi? ( x11-libs/libva )
+	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
 	wayland? ( x11-base/wayland )
+	xvmc? ( x11-libs/libXvMC )
 	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
 "
 for card in ${INTEL_CARDS}; do
@@ -269,12 +272,16 @@ src_configure() {
 		--without-demos \
 		--enable-xcb \
 		$(use_enable debug) \
+		$(use_enable g3dvl) \
 		$(use_enable motif glw) \
 		$(use_enable motif) \
 		$(use_enable nptl glx-tls) \
 		$(use_enable !pic asm) \
 		$(use_enable shared-dricore) \
 		$(use_enable shared-glapi) \
+		$(use_enable vaapi va) \
+		$(use_enable vdpau) \
+		$(use_enable xvmc) \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
 		${myconf}

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index d66c89e..d1fd3ca 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -7,11 +7,15 @@
 	<flag name='d3d'>Enable DirectX 10/10.1/11 backend for Gallium3D.</flag>
 	<flag name='egl'>Enable EGL support for Gallium3D.</flag>
 	<flag name='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
+	<flag name='g3dvl'>Enable video decode acceleration support for Gallium3D.</flag>
 	<flag name='gles'>Enable GLES support for Gallium3D.</flag>
 	<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
 	<flag name='openvg'>Enable the OpenVG 2D acceleration API</flag>
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
 	<flag name='shared-dricore'>Enable sharing of common code for classic DRI drivers.</flag>
 	<flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag>
+	<flag name='vaapi'>Enable the VA-API acceleration interface.</flag>
+	<flag name='vdpau'>Enable the VDPAU acceleration interface.</flag>
+	<flag name='xvmc'>Enable the XvMC acceleration interface.</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     9d366014948383ac4712e593f7190fd8687793bc
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 17 10:32:42 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Jul 17 10:32:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=9d366014

media-libs/mesa: drop nonfunctional VA-API support that depends on old libva.

---
 media-libs/mesa/mesa-9999.ebuild |    4 +---
 media-libs/mesa/metadata.xml     |    1 -
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 6a8c687..0884e3c 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -45,7 +45,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d debug +egl g3dvl +gallium gles +llvm motif +nptl openvg pic selinux shared-dricore +shared-glapi vaapi vdpau wayland xvmc kernel_FreeBSD"
+	bindist +classic d3d debug +egl g3dvl +gallium gles +llvm motif +nptl openvg pic selinux shared-dricore +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
 # not a runtime dependency of this package, but dependency of packages which
@@ -76,7 +76,6 @@ RDEPEND="${EXTERNAL_DEPEND}
 	gallium? (
 		llvm? ( >=sys-devel/llvm-2.9 )
 	)
-	vaapi? ( x11-libs/libva )
 	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
 	wayland? ( x11-base/wayland )
 	xvmc? ( x11-libs/libXvMC )
@@ -279,7 +278,6 @@ src_configure() {
 		$(use_enable !pic asm) \
 		$(use_enable shared-dricore) \
 		$(use_enable shared-glapi) \
-		$(use_enable vaapi va) \
 		$(use_enable vdpau) \
 		$(use_enable xvmc) \
 		--with-dri-drivers=${DRI_DRIVERS} \

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index d1fd3ca..430cbe5 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -14,7 +14,6 @@
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
 	<flag name='shared-dricore'>Enable sharing of common code for classic DRI drivers.</flag>
 	<flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag>
-	<flag name='vaapi'>Enable the VA-API acceleration interface.</flag>
 	<flag name='vdpau'>Enable the VDPAU acceleration interface.</flag>
 	<flag name='xvmc'>Enable the XvMC acceleration interface.</flag>
 </use>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     ec0d885532cd0cb716e28cd84d01bd99408fa58e
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Jul 21 16:32:34 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Thu Jul 21 16:33:18 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=ec0d8855

media-libs/mesa: Add sys-devel/{bison,flex} to DEPEND

Bug 375793.

Signed-off-by: Matt Turner <mattst88 <AT> gmail.com>

---
 media-libs/mesa/mesa-9999.ebuild |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 0884e3c..c65a8fb 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -96,6 +96,8 @@ done
 DEPEND="${RDEPEND}
 	=dev-lang/python-2*
 	dev-util/pkgconfig
+	sys-devel/bison
+	sys-devel/flex
 	x11-misc/makedepend
 	x11-proto/inputproto
 	>=x11-proto/xextproto-7.0.99.1

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     4c5aff8024370f0505de0436a5717acf65422f7d
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Jul 29 23:07:46 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Jul 29 23:07:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4c5aff80

media-libs/mesa: specify x11 before drm for egl-platforms

Bug 376981.

Signed-off-by: Matt Turner <mattst88 <AT> gmail.com>

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index c65a8fb..f2624db 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -221,7 +221,7 @@ src_configure() {
 	if use egl; then
 		use shared-glapi || die "egl needs shared-glapi. Please either enable shared-glapi or disable the egl use flag ."
 		myconf+="
-			--with-egl-platforms=$(use wayland && echo "wayland,")drm,x11
+			--with-egl-platforms=x11,$(use wayland && echo "wayland,")drm
 			$(use_enable gallium gallium-egl)
 		"
 	fi

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     e47a0709444522cad3a83b9279ca860b85f19033
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Jul 31 16:06:05 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sun Jul 31 16:06:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=e47a0709

media-libs/mesa: move libxml2 from RDEPEND to DEPEND

Bug 376015. (Maybe it should only be in DEPEND based on conditional doc
generation?)

Signed-off-by: Matt Turner <mattst88 <AT> gmail.com>

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index f2624db..7e447a1 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -63,7 +63,6 @@ RDEPEND="${EXTERNAL_DEPEND}
 	gallium? ( app-admin/eselect-mesa )
 	>=app-admin/eselect-opengl-1.2.2
 	dev-libs/expat
-	dev-libs/libxml2[python]
 	x11-libs/libICE
 	>=x11-libs/libX11-1.3.99.901
 	x11-libs/libXdamage
@@ -95,6 +94,7 @@ done
 
 DEPEND="${RDEPEND}
 	=dev-lang/python-2*
+	dev-libs/libxml2[python]
 	dev-util/pkgconfig
 	sys-devel/bison
 	sys-devel/flex

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     5caef71d115a5b838d3b02bc9b7496d3890787b2
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  1 22:43:44 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Mon Aug  1 22:43:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=5caef71d

media-libs/mesa: sync with portage

---
 media-libs/mesa/mesa-9999.ebuild |    6 ++++--
 media-libs/mesa/metadata.xml     |    1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 7e447a1..cda6a88 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -45,7 +45,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d debug +egl g3dvl +gallium gles +llvm motif +nptl openvg pic selinux shared-dricore +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
+	bindist +classic d3d debug +egl g3dvl +gallium gbm gles +llvm motif +nptl openvg pic selinux shared-dricore +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
 # not a runtime dependency of this package, but dependency of packages which
@@ -63,6 +63,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 	gallium? ( app-admin/eselect-mesa )
 	>=app-admin/eselect-opengl-1.2.2
 	dev-libs/expat
+	gbm? ( sys-fs/udev )
 	x11-libs/libICE
 	>=x11-libs/libX11-1.3.99.901
 	x11-libs/libXdamage
@@ -221,7 +222,7 @@ src_configure() {
 	if use egl; then
 		use shared-glapi || die "egl needs shared-glapi. Please either enable shared-glapi or disable the egl use flag ."
 		myconf+="
-			--with-egl-platforms=x11,$(use wayland && echo "wayland,")drm
+			--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")
 			$(use_enable gallium gallium-egl)
 		"
 	fi
@@ -274,6 +275,7 @@ src_configure() {
 		--enable-xcb \
 		$(use_enable debug) \
 		$(use_enable g3dvl) \
+		$(use_enable gbm) \
 		$(use_enable motif glw) \
 		$(use_enable motif) \
 		$(use_enable nptl glx-tls) \

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 430cbe5..34bed90 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -8,6 +8,7 @@
 	<flag name='egl'>Enable EGL support for Gallium3D.</flag>
 	<flag name='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
 	<flag name='g3dvl'>Enable video decode acceleration support for Gallium3D.</flag>
+	<flag name='gbm'>Enable the Graphics Buffer Manager for EGL on KMS.</flag>
 	<flag name='gles'>Enable GLES support for Gallium3D.</flag>
 	<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
 	<flag name='openvg'>Enable the OpenVG 2D acceleration API</flag>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     20cb95266e0f9b9bc526f509ec79a03a7e66eed6
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  2 00:01:34 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Tue Aug  2 00:01:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=20cb9526

media-libs/mesa: sync with portage

---
 media-libs/mesa/mesa-9999.ebuild |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index cda6a88..fc3e29a 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -142,7 +142,7 @@ src_prepare() {
 		epatch
 	fi
 
-	# fix for hardened, bug 240956
+	# fix for hardened pax_kernel, bug 240956
 	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
 
 	# FreeBSD 6.* doesn't have posix_memalign().
@@ -259,8 +259,8 @@ src_configure() {
 		fi
 	fi
 
-	# x86 hardened needs glx-rts, bug 240956
-	if use hardened; then
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if use pax_kernel; then
 		myconf+="
 			$(use_enable x86 glx-rts)
 		"

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     be768228c44a7c45a0cf7923a373773efa56b2ce
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  3 00:01:03 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Wed Aug  3 00:01:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=be768228

media-libs/mesa: sync with portage

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 media-libs/mesa/metadata.xml     |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index fc3e29a..779580f 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -45,7 +45,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d debug +egl g3dvl +gallium gbm gles +llvm motif +nptl openvg pic selinux shared-dricore +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
+	bindist +classic d3d debug +egl g3dvl +gallium gbm gles +llvm motif +nptl openvg pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
 # not a runtime dependency of this package, but dependency of packages which

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 34bed90..626a948 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -12,6 +12,7 @@
 	<flag name='gles'>Enable GLES support for Gallium3D.</flag>
 	<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
 	<flag name='openvg'>Enable the OpenVG 2D acceleration API</flag>
+	<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
 	<flag name='shared-dricore'>Enable sharing of common code for classic DRI drivers.</flag>
 	<flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     7df3cb873131245ad17089519b535848de0204e6
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Aug  6 18:14:25 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Aug  6 18:14:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=7df3cb87

media-libs/mesa: openvg should only be enabled with Gallium

Bug 377689.

Signed-off-by: Matt Turner <mattst88 <AT> gmail.com>

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 779580f..a9f26ba 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -217,7 +217,6 @@ src_configure() {
 		$(use_enable gles gles1)
 		$(use_enable gles gles2)
 		$(use_enable egl)
-		$(use_enable openvg)
 	"
 	if use egl; then
 		use shared-glapi || die "egl needs shared-glapi. Please either enable shared-glapi or disable the egl use flag ."
@@ -235,6 +234,7 @@ src_configure() {
 		myconf+="
 			--with-state-trackers=glx,dri$(use egl && echo ",egl")$(use openvg && echo ",vega")$(use d3d && echo ",d3d1x")
 			$(use_enable llvm gallium-llvm)
+			$(use_enable openvg)
 		"
 		gallium_enable swrast
 		gallium_enable video_cards_vmware svga

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     661851016d12d2fc845836a1c1a8da93bb1feb57
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Mon Aug 15 23:07:02 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Mon Aug 15 23:07:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=66185101

media-libs/mesa: remove motif USE flag

glw has been removed from upstream mesa in commit
63720114b4234f5522eb8dee8f4b0c0db561a8c3.

---
 media-libs/mesa/mesa-9999.ebuild |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index a9f26ba..3617fed 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -45,7 +45,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d debug +egl g3dvl +gallium gbm gles +llvm motif +nptl openvg pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
+	bindist +classic d3d debug +egl g3dvl +gallium gbm gles +llvm +nptl openvg pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
 # not a runtime dependency of this package, but dependency of packages which
@@ -72,7 +72,6 @@ RDEPEND="${EXTERNAL_DEPEND}
 	x11-libs/libXmu
 	x11-libs/libXxf86vm
 	d3d? ( app-emulation/wine )
-	motif? ( x11-libs/openmotif )
 	gallium? (
 		llvm? ( >=sys-devel/llvm-2.9 )
 	)
@@ -276,8 +275,6 @@ src_configure() {
 		$(use_enable debug) \
 		$(use_enable g3dvl) \
 		$(use_enable gbm) \
-		$(use_enable motif glw) \
-		$(use_enable motif) \
 		$(use_enable nptl glx-tls) \
 		$(use_enable !pic asm) \
 		$(use_enable shared-dricore) \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     3900de5da9f34fec79b226621c0c3b29f39e5514
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Aug 16 00:13:32 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Tue Aug 16 00:13:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3900de5d

media-libs/mesa: make use of REQUIRED_USE

---
 media-libs/mesa/mesa-9999.ebuild |   34 +++++++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index c3520c0..f741b96 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -47,6 +47,30 @@ done
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic d3d debug +egl g3dvl +gallium gbm gles +llvm +nptl openvg pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
 
+REQUIRED_USE="
+	d3d?    ( gallium )
+	g3dvl?  ( gallium )
+	llvm?   ( gallium )
+	openvg? ( gallium )
+	egl? ( shared-glapi )
+	gallium? (
+		video_cards_r300?   ( llvm )
+		video_cards_radeon? ( llvm )
+	)
+	video_cards_i810?   ( classic )
+	video_cards_i915?   ( classic )
+	video_cards_mach64? ( classic )
+	video_cards_mga?    ( classic )
+	video_cards_r100?   ( classic )
+	video_cards_r128?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_savage? ( classic )
+	video_cards_sis?    ( classic )
+	video_cards_vmware? ( gallium )
+	video_cards_tdfx?   ( classic )
+	video_cards_via?    ( classic )
+"
+
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
 # not a runtime dependency of this package, but dependency of packages which
 # depend on this package, bug #342393
@@ -72,9 +96,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 	x11-libs/libXmu
 	x11-libs/libXxf86vm
 	d3d? ( app-emulation/wine )
-	gallium? (
-		llvm? ( >=sys-devel/llvm-2.9 )
-	)
+	llvm? ( >=sys-devel/llvm-2.9 )
 	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
 	wayland? ( x11-base/wayland )
 	xvmc? ( x11-libs/libXvMC )
@@ -215,7 +237,6 @@ src_configure() {
 		$(use_enable egl)
 	"
 	if use egl; then
-		use shared-glapi || die "egl needs shared-glapi. Please either enable shared-glapi or disable the egl use flag ."
 		myconf+="
 			--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")
 			$(use_enable gallium gallium-egl)
@@ -248,11 +269,6 @@ src_configure() {
 				! use video_cards_r600; then
 			gallium_enable video_cards_radeon r300 r600
 		fi
-	else
-		if use video_cards_nouveau || use video_cards_vmware; then
-			elog "SVGA and nouveau drivers are available only via gallium interface."
-			elog "Enable gallium useflag if you want to use them."
-		fi
 	fi
 
 	# x86 hardened pax_kernel needs glx-rts, bug 240956

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     10d8acbfefe6a28d5af525ad0949a7be27b231bb
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Mon Aug 15 23:52:13 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Mon Aug 15 23:52:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=10d8acbf

media-libs/mesa: remove python eclass usage and bump to EAPI=4

Mesa explicity checks for and calls python2, so we shouldn't need to use
the python eclass to force python2.

---
 media-libs/mesa/mesa-9999.ebuild |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 3617fed..c3520c0 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
 
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	EXPERIMENTAL="true"
 fi
 
-inherit base autotools multilib flag-o-matic python toolchain-funcs ${GIT_ECLASS}
+inherit base autotools multilib flag-o-matic toolchain-funcs ${GIT_ECLASS}
 
 OPENGL_DIR="xorg-x11"
 
@@ -122,9 +122,6 @@ pkg_setup() {
 
 	# recommended by upstream
 	append-flags -ffast-math
-
-	python_set_active_version 2
-	python_pkg_setup
 }
 
 src_unpack() {
@@ -290,12 +287,12 @@ src_install() {
 	base_src_install
 
 	if use !bindist; then
-		dodoc docs/patents.txt || die
+		dodoc docs/patents.txt
 	fi
 
 	# Save the glsl-compiler for later use
 	if ! tc-is-cross-compiler; then
-		dobin "${S}"/src/glsl/glsl_compiler || die
+		dobin "${S}"/src/glsl/glsl_compiler
 	fi
 	# Remove redundant headers
 	# GLUT thing
@@ -306,7 +303,7 @@ src_install() {
 
 	# Install config file for eselect mesa
 	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.7.12" eselect-mesa.conf || die
+	newins "${FILESDIR}/eselect-mesa.conf.7.12" eselect-mesa.conf
 
 	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
 	# because user can eselect desired GL provider.
@@ -339,7 +336,7 @@ src_install() {
 					insinto "/usr/$(get_libdir)/dri/"
 					if [ -f "${S}/$(get_libdir)/${x}" ]; then
 						insopts -m0755
-						doins "${S}/$(get_libdir)/${x}" || die "failed to install ${x}"
+						doins "${S}/$(get_libdir)/${x}"
 					fi
 				fi
 			done

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     19c52f6d3badc75cf994b04cb2819f55dc372143
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Aug 16 00:19:33 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Tue Aug 16 00:19:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=19c52f6d

media-libs/mesa: correct metadata.xml about Gallium3D

---
 media-libs/mesa/metadata.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 626a948..e3b237b 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -5,13 +5,13 @@
 <use>
 	<flag name='classic'>Build drivers based on the classic architecture.</flag>
 	<flag name='d3d'>Enable DirectX 10/10.1/11 backend for Gallium3D.</flag>
-	<flag name='egl'>Enable EGL support for Gallium3D.</flag>
+	<flag name='egl'>Enable EGL support.</flag>
 	<flag name='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
 	<flag name='g3dvl'>Enable video decode acceleration support for Gallium3D.</flag>
 	<flag name='gbm'>Enable the Graphics Buffer Manager for EGL on KMS.</flag>
-	<flag name='gles'>Enable GLES support for Gallium3D.</flag>
+	<flag name='gles'>Enable GLES support.</flag>
 	<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
-	<flag name='openvg'>Enable the OpenVG 2D acceleration API</flag>
+	<flag name='openvg'>Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
 	<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
 	<flag name='shared-dricore'>Enable sharing of common code for classic DRI drivers.</flag>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     2f039c2b09bdc58abe3da1c0c59ce6746629a6a5
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Aug 16 02:32:57 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Tue Aug 16 02:32:57 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=2f039c2b

media-libs/mesa: add g3dvl/vdpau/xvmc to REQUIRED_USE

---
 media-libs/mesa/mesa-9999.ebuild |    7 +++++--
 media-libs/mesa/metadata.xml     |    4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index f741b96..010a192 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -57,6 +57,9 @@ REQUIRED_USE="
 		video_cards_r300?   ( llvm )
 		video_cards_radeon? ( llvm )
 	)
+	g3dvl? ( || ( vdpau xvmc ) )
+	vdpau? ( g3dvl )
+	xvmc?  ( g3dvl )
 	video_cards_i810?   ( classic )
 	video_cards_i915?   ( classic )
 	video_cards_mach64? ( classic )
@@ -252,6 +255,8 @@ src_configure() {
 			--with-state-trackers=glx,dri$(use egl && echo ",egl")$(use openvg && echo ",vega")$(use d3d && echo ",d3d1x")
 			$(use_enable llvm gallium-llvm)
 			$(use_enable openvg)
+			$(use_enable vdpau)
+			$(use_enable xvmc)
 		"
 		gallium_enable swrast
 		gallium_enable video_cards_vmware svga
@@ -292,8 +297,6 @@ src_configure() {
 		$(use_enable !pic asm) \
 		$(use_enable shared-dricore) \
 		$(use_enable shared-glapi) \
-		$(use_enable vdpau) \
-		$(use_enable xvmc) \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
 		${myconf}

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index e3b237b..99a4ec7 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -16,7 +16,7 @@
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
 	<flag name='shared-dricore'>Enable sharing of common code for classic DRI drivers.</flag>
 	<flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag>
-	<flag name='vdpau'>Enable the VDPAU acceleration interface.</flag>
-	<flag name='xvmc'>Enable the XvMC acceleration interface.</flag>
+	<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
+	<flag name='xvmc'>Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     aaf00162ef15fd889c52ca3b3f63243444cda158
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Aug 16 02:35:00 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Tue Aug 16 02:35:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=aaf00162

media-libs/mesa: r300g only requires llvm on x86/amd64

---
 media-libs/mesa/mesa-9999.ebuild |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 010a192..c6c1ded 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -54,8 +54,8 @@ REQUIRED_USE="
 	openvg? ( gallium )
 	egl? ( shared-glapi )
 	gallium? (
-		video_cards_r300?   ( llvm )
-		video_cards_radeon? ( llvm )
+		video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
+		video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
 	)
 	g3dvl? ( || ( vdpau xvmc ) )
 	vdpau? ( g3dvl )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     4af82728f50b070399f67c5d56c6297f7c4cf1d7
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Aug 16 17:54:50 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Tue Aug 16 17:54:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4af82728

media-libs/mesa: g3dvl can only be enabled with gallium

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index c6c1ded..5553c5c 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -253,6 +253,7 @@ src_configure() {
 	if use gallium; then
 		myconf+="
 			--with-state-trackers=glx,dri$(use egl && echo ",egl")$(use openvg && echo ",vega")$(use d3d && echo ",d3d1x")
+			$(use_enable g3dvl)
 			$(use_enable llvm gallium-llvm)
 			$(use_enable openvg)
 			$(use_enable vdpau)
@@ -291,7 +292,6 @@ src_configure() {
 		--without-demos \
 		--enable-xcb \
 		$(use_enable debug) \
-		$(use_enable g3dvl) \
 		$(use_enable gbm) \
 		$(use_enable nptl glx-tls) \
 		$(use_enable !pic asm) \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Michał Górny]

commit:     4bfbc741d09d83b4a574978685a2010e4b27e58c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 09:51:39 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 09:51:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4bfbc741

media-libs/mesa: Scare Radeon users without libtxc_dxtn that they want to install it.

(Portage version: 2.2.0_alpha51_p9/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 42B9401D)

---
 media-libs/mesa/mesa-9999.ebuild |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 5553c5c..66abc32 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -392,6 +392,20 @@ pkg_postinst() {
 		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
 		elog "enabled. Please see patents.txt for an explanation."
 	fi
+
+	local using_radeon r_flag
+	for r_flag in ${RADEON_CARDS}; do
+		if use video_cards_${r_flag}; then
+			using_radeon=1
+			break
+		fi
+	done
+
+	if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
+		elog "Note that in order to have full S3TC support, it is necessary to install"
+		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
+		elog "textures in some apps, and some others even require this to run."
+	fi
 }
 
 # $1 - VIDEO_CARDS flag

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     28ed507885702c4a7e7ea89b53b5fe9b75dde10c
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Aug 24 23:57:24 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed Aug 24 23:57:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=28ed5078

media-libs/mesa: remove deleted drivers

Drivers removed are:
i810, mach64, mga, r128, savage, sis, tdfx, unichrome.

---
 media-libs/mesa/mesa-9999.ebuild |   27 ++++-----------------------
 1 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 66abc32..c25d246 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -37,9 +37,9 @@ LICENSE="LGPL-2 kilgard"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
-INTEL_CARDS="i810 i915 i965 intel"
+INTEL_CARDS="i915 i965 intel"
 RADEON_CARDS="r100 r200 r300 r600 radeon"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} mach64 mga nouveau r128 savage sis vmware tdfx via"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} nouveau vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
@@ -60,18 +60,10 @@ REQUIRED_USE="
 	g3dvl? ( || ( vdpau xvmc ) )
 	vdpau? ( g3dvl )
 	xvmc?  ( g3dvl )
-	video_cards_i810?   ( classic )
 	video_cards_i915?   ( classic )
-	video_cards_mach64? ( classic )
-	video_cards_mga?    ( classic )
 	video_cards_r100?   ( classic )
-	video_cards_r128?   ( classic )
 	video_cards_r200?   ( classic )
-	video_cards_savage? ( classic )
-	video_cards_sis?    ( classic )
 	video_cards_vmware? ( gallium )
-	video_cards_tdfx?   ( classic )
-	video_cards_via?    ( classic )
 "
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
@@ -199,23 +191,17 @@ src_configure() {
 		driver_enable swrast
 
 	# Intel code
-		driver_enable video_cards_i810 i810
 		driver_enable video_cards_i915 i915
 		driver_enable video_cards_i965 i965
-			if ! use video_cards_i810 && \
-				! use video_cards_i915 && \
+			if ! use video_cards_i915 && \
 				! use video_cards_i965; then
-			driver_enable video_cards_intel i810 i915 i965
+			driver_enable video_cards_intel i915 i965
 		fi
 
 		# Nouveau code
 		driver_enable video_cards_nouveau nouveau
 
 		# ATI code
-		driver_enable video_cards_mach64 mach64
-		driver_enable video_cards_mga mga
-		driver_enable video_cards_r128 r128
-
 		driver_enable video_cards_r100 radeon
 		driver_enable video_cards_r200 r200
 		driver_enable video_cards_r300 r300
@@ -226,11 +212,6 @@ src_configure() {
 				! use video_cards_r600; then
 			driver_enable video_cards_radeon radeon r200 r300 r600
 		fi
-
-		driver_enable video_cards_savage savage
-		driver_enable video_cards_sis sis
-		driver_enable video_cards_tdfx tdfx
-		driver_enable video_cards_via unichrome
 	fi
 
 	myconf+="

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     30344233700858fcef4c4cef72402811208e8948
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Sep 16 04:16:38 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Sep 16 04:16:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=30344233

media-libs/mesa: move llvm from RDEPEND to DEPEND

The LLVM libraries linked against are static.

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index c25d246..ec275b1 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -91,7 +91,6 @@ RDEPEND="${EXTERNAL_DEPEND}
 	x11-libs/libXmu
 	x11-libs/libXxf86vm
 	d3d? ( app-emulation/wine )
-	llvm? ( >=sys-devel/llvm-2.9 )
 	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
 	wayland? ( x11-base/wayland )
 	xvmc? ( x11-libs/libXvMC )
@@ -110,6 +109,7 @@ for card in ${RADEON_CARDS}; do
 done
 
 DEPEND="${RDEPEND}
+	llvm? ( >=sys-devel/llvm-2.9 )
 	=dev-lang/python-2*
 	dev-libs/libxml2[python]
 	dev-util/pkgconfig

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     2469ee7c074402fe073e93a86b1dd279cf113ff1
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Sep 16 19:03:13 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Sep 16 19:03:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=2469ee7c

media-libs/mesa: remove kilgard from LICENSE

We've never shipped the bundled glut for which the license applies.
Also, the bundled glut was removed before 7.11.

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ec275b1..3268222 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -33,7 +33,7 @@ else
 		${SRC_PATCHES}"
 fi
 
-LICENSE="LGPL-2 kilgard"
+LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     82e39e95477ea18729cc20df24eb4b8f3e1a4a44
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Sep 16 19:10:05 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Sep 16 19:10:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=82e39e95

media-libs/mesa: remove glut/glew handling

These were removed before 7.11.

---
 media-libs/mesa/mesa-9999.ebuild |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 3268222..e0921f9 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -269,7 +269,6 @@ src_configure() {
 	econf \
 		--disable-option-checking \
 		--with-driver=dri \
-		--disable-glut \
 		--without-demos \
 		--enable-xcb \
 		$(use_enable debug) \
@@ -294,12 +293,6 @@ src_install() {
 	if ! tc-is-cross-compiler; then
 		dobin "${S}"/src/glsl/glsl_compiler
 	fi
-	# Remove redundant headers
-	# GLUT thing
-	rm -f "${ED}"/usr/include/GL/glut*.h || die "Removing glut include failed."
-	# Glew includes
-	rm -f "${ED}"/usr/include/GL/{glew,glxew,wglew}.h \
-		|| die "Removing glew includes failed."
 
 	# Install config file for eselect mesa
 	insinto /usr/share/mesa

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     ce2216d3bb0695161907c2a7b96cf7131243a213
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Sep 16 19:19:30 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Sep 16 19:19:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=ce2216d3

media-libs/mesa: remove --without-demos

Demos were removed before 7.9.

---
 media-libs/mesa/mesa-9999.ebuild |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index e0921f9..1029364 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -269,7 +269,6 @@ src_configure() {
 	econf \
 		--disable-option-checking \
 		--with-driver=dri \
-		--without-demos \
 		--enable-xcb \
 		$(use_enable debug) \
 		$(use_enable gbm) \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     6eb48acfb330686698571036f0afca5f4c5d6dc0
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Sep 16 19:30:02 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Sep 16 19:30:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=6eb48acf

media-libs/mesa: correct LICENSE, bug 333143

---
 media-libs/mesa/mesa-9999.ebuild |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 1029364..7e21aa1 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -33,7 +33,10 @@ else
 		${SRC_PATCHES}"
 fi
 
-LICENSE="LGPL-2"
+# Most of the code is MIT/X11.
+# ralloc is LGPL-3
+# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
+LICENSE="MIT LGPL-3 SGI-B-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     1208283f859421b9330fc993dc8b759ee049adde
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Sep 17 23:15:32 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Sep 17 23:15:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=1208283f

media-libs/mesa: remove unnecessary dependencies

libXmu, libXi, libICE, and inputproto.

Signed-off-by: Matt Turner <mattst88 <AT> gmail.com>

---
 media-libs/mesa/mesa-9999.ebuild |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 7e21aa1..6efbc54 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -86,12 +86,9 @@ RDEPEND="${EXTERNAL_DEPEND}
 	>=app-admin/eselect-opengl-1.2.2
 	dev-libs/expat
 	gbm? ( sys-fs/udev )
-	x11-libs/libICE
 	>=x11-libs/libX11-1.3.99.901
 	x11-libs/libXdamage
 	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXmu
 	x11-libs/libXxf86vm
 	d3d? ( app-emulation/wine )
 	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
@@ -119,7 +116,6 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
 	x11-misc/makedepend
-	x11-proto/inputproto
 	>=x11-proto/xextproto-7.0.99.1
 	x11-proto/xf86driproto
 	x11-proto/xf86vidmodeproto

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     f3ee5f7276a4e5314b7b372de419a09e48dbc14f
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Sep 18 01:27:31 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sun Sep 18 01:27:31 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=f3ee5f72

media-libs/mesa: slang was removed before 7.9

---
 media-libs/mesa/mesa-9999.ebuild |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 6efbc54..ff45d27 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -169,14 +169,6 @@ src_prepare() {
 		sed -i -e 's/uint/unsigned int/g' src/egl/drivers/glx/egl_glx.c || die
 	fi
 
-	# In order for mesa to complete it's build process we need to use a tool
-	# that it compiles. When we cross compile this clearly does not work
-	# so we require mesa to be built on the host system first. -solar
-	if tc-is-cross-compiler; then
-		sed -i -e "s#^GLSL_CL = .*\$#GLSL_CL = glsl_compiler#g" \
-			"${S}"/src/mesa/shader/slang/library/Makefile || die
-	fi
-
 	base_src_prepare
 
 	eautoreconf

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     5da533482945a8f239d0307226d5fe094e778a48
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Sep 18 01:35:02 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sun Sep 18 01:35:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=5da53348

media-libs/mesa: split gles USE flag into gles1 and gles2

---
 media-libs/mesa/mesa-9999.ebuild |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ff45d27..f7afc20 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -48,7 +48,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d debug +egl g3dvl +gallium gbm gles +llvm +nptl openvg pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
+	bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl openvg pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
 
 REQUIRED_USE="
 	d3d?    ( gallium )
@@ -207,8 +207,8 @@ src_configure() {
 
 	myconf+="
 		$(use_enable !bindist texture-float)
-		$(use_enable gles gles1)
-		$(use_enable gles gles2)
+		$(use_enable gles1)
+		$(use_enable gles2)
 		$(use_enable egl)
 	"
 	if use egl; then

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     06279bda46b8b1fb6e262b9a19817b1b8371cc3f
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Sep 18 15:55:18 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sun Sep 18 15:55:36 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=06279bda

media-libs/mesa: remove hack for HAVE_POSIX_MEMALIGN

configure.ac has checked for posix_memalign since 2008, see 985e1cdf.

---
 media-libs/mesa/mesa-9999.ebuild |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index f7afc20..ba7ffce 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -157,12 +157,6 @@ src_prepare() {
 	# fix for hardened pax_kernel, bug 240956
 	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
 
-	# FreeBSD 6.* doesn't have posix_memalign().
-	if [[ ${CHOST} == *-freebsd6.* ]]; then
-		sed -i \
-			-e "s/-DHAVE_POSIX_MEMALIGN//" \
-			configure.ac || die
-	fi
 	# Solaris needs some recent POSIX stuff in our case
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     452e9a95916aa7dc8a81d3d5b4b7389245be1236
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Mon Sep 19 18:48:15 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Mon Sep 19 18:48:15 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=452e9a95

media-libs/mesa: remove unneeded Solaris uint hack

Fixed upstream with 75eb92fb.

---
 media-libs/mesa/mesa-9999.ebuild |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ba7ffce..c7d6699 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -160,7 +160,6 @@ src_prepare() {
 	# Solaris needs some recent POSIX stuff in our case
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
-		sed -i -e 's/uint/unsigned int/g' src/egl/drivers/glx/egl_glx.c || die
 	fi
 
 	base_src_prepare

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     ffd34fd64520ca4333978df926ac2a93aba856a3
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Sep 21 20:23:44 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed Sep 21 20:23:44 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=ffd34fd6

media-libs/mesa: remove deprecated --with-state-trackers

See upstream 440d71db.

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 3b16015..00a4a38 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -217,7 +217,7 @@ src_configure() {
 	fi
 	if use gallium; then
 		myconf+="
-			--with-state-trackers=glx,dri$(use egl && echo ",egl")$(use openvg && echo ",vega")$(use d3d && echo ",d3d1x")
+			$(use_enable d3d d3d1x)
 			$(use_enable g3dvl)
 			$(use_enable llvm gallium-llvm)
 			$(use_enable openvg)

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     d4ab4a183673bfae505eb1d45fca2a31ece7efcc
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Sep 21 20:17:56 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed Sep 21 20:17:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d4ab4a18

media-libs/mesa: remove deprecated --with-drivers=

See upstream 9e7a4147.

---
 media-libs/mesa/mesa-9999.ebuild |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index c7d6699..3b16015 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -249,10 +249,11 @@ src_configure() {
 		"
 	fi
 
-	# --with-driver=dri|xlib|osmesa || do we need osmesa?
+	# do we need osmesa?
 	econf \
 		--disable-option-checking \
-		--with-driver=dri \
+		--enable-dri \
+		--enable-glx \
 		--enable-xcb \
 		$(use_enable debug) \
 		$(use_enable gbm) \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     fe4d719370a27242228653fd80066777f5ea3daa
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Sep 21 20:28:49 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed Sep 21 20:28:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=fe4d7193

media-libs/mesa: simplify src_configure()

---
 media-libs/mesa/mesa-9999.ebuild |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 00a4a38..10b0236 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -198,12 +198,6 @@ src_configure() {
 		fi
 	fi
 
-	myconf+="
-		$(use_enable !bindist texture-float)
-		$(use_enable gles1)
-		$(use_enable gles2)
-		$(use_enable egl)
-	"
 	if use egl; then
 		myconf+="
 			--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")
@@ -255,8 +249,12 @@ src_configure() {
 		--enable-dri \
 		--enable-glx \
 		--enable-xcb \
+		$(use_enable !bindist texture-float) \
 		$(use_enable debug) \
+		$(use_enable egl) \
 		$(use_enable gbm) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
 		$(use_enable nptl glx-tls) \
 		$(use_enable !pic asm) \
 		$(use_enable shared-dricore) \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     686559cd631cabfb7ecadc95edf7fa41db3abe2f
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Sep 21 20:32:46 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed Sep 21 20:32:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=686559cd

media-libs/mesa: add osmesa USE flag, bug 155109

---
 media-libs/mesa/mesa-9999.ebuild |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 10b0236..1e239b7 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -48,7 +48,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl openvg pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
+	bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl openvg osmesa pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
 
 REQUIRED_USE="
 	d3d?    ( gallium )
@@ -243,7 +243,6 @@ src_configure() {
 		"
 	fi
 
-	# do we need osmesa?
 	econf \
 		--disable-option-checking \
 		--enable-dri \
@@ -256,6 +255,7 @@ src_configure() {
 		$(use_enable gles1) \
 		$(use_enable gles2) \
 		$(use_enable nptl glx-tls) \
+		$(use_enable osmesa) \
 		$(use_enable !pic asm) \
 		$(use_enable shared-dricore) \
 		$(use_enable shared-glapi) \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     79142b4a29a9aa074124102c653e8b56d94cb2c4
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Sep 21 20:34:34 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed Sep 21 20:34:34 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=79142b4a

media-libs/mesa: correct g3dvl use_enable statement

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 1e239b7..751a1d1 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -212,7 +212,7 @@ src_configure() {
 	if use gallium; then
 		myconf+="
 			$(use_enable d3d d3d1x)
-			$(use_enable g3dvl)
+			$(use_enable g3dvl gallium-g3dvl)
 			$(use_enable llvm gallium-llvm)
 			$(use_enable openvg)
 			$(use_enable vdpau)

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     beb5234f323d6e7f5ee2c0be80734c265f10073a
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Oct 29 03:57:06 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Oct 29 03:57:06 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=beb5234f

media-libs/mesa: r300 and r600 classic drivers have been removed

---
 media-libs/mesa/mesa-9999.ebuild |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 751a1d1..efe0511 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -66,6 +66,8 @@ REQUIRED_USE="
 	video_cards_i915?   ( classic )
 	video_cards_r100?   ( classic )
 	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium )
+	video_cards_r600?   ( gallium )
 	video_cards_vmware? ( gallium )
 "
 
@@ -188,13 +190,9 @@ src_configure() {
 		# ATI code
 		driver_enable video_cards_r100 radeon
 		driver_enable video_cards_r200 r200
-		driver_enable video_cards_r300 r300
-		driver_enable video_cards_r600 r600
 		if ! use video_cards_r100 && \
-				! use video_cards_r200 && \
-				! use video_cards_r300 && \
-				! use video_cards_r600; then
-			driver_enable video_cards_radeon radeon r200 r300 r600
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
 		fi
 	fi
 

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     7ed347291c874b5e7a0ceba6f80943921670977f
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Oct 30 18:32:02 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sun Oct 30 18:32:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=7ed34729

media-libs/mesa: bump libdrm requirement to 2.4.27

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index efe0511..d0ab971 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -71,7 +71,7 @@ REQUIRED_USE="
 	video_cards_vmware? ( gallium )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.27"
 # not a runtime dependency of this package, but dependency of packages which
 # depend on this package, bug #342393
 EXTERNAL_DEPEND="

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     be57fa5e335ef0e2b511ca6a01e8be05f6dc7c45
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  6 16:01:12 2011 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Nov  6 16:01:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=be57fa5e

media-libs/mesa: import ppc64 build fix from portage

---
 media-libs/mesa/mesa-9999.ebuild |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index d0ab971..697dfa4 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -140,6 +140,8 @@ pkg_setup() {
 
 	# recommended by upstream
 	append-flags -ffast-math
+	# workaround toc-issue wrt #386545
+	use ppc64 && append-flags -mminimal-toc
 }
 
 src_unpack() {

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     97ef7d9909e83b775e60547cca5c7e7053043f30
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Nov 29 22:55:42 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Tue Nov 29 22:55:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=97ef7d99

media-libs/mesa: remove i965/gallium driver

It was deleted upstream in 2c27f204f1ca6f09f9520712be1da9a13ed5c01d

---
 media-libs/mesa/mesa-9999.ebuild |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 697dfa4..751a59d 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -64,6 +64,7 @@ REQUIRED_USE="
 	vdpau? ( g3dvl )
 	xvmc?  ( g3dvl )
 	video_cards_i915?   ( classic )
+	video_cards_i965?   ( classic )
 	video_cards_r100?   ( classic )
 	video_cards_r200?   ( classic )
 	video_cards_r300?   ( gallium )
@@ -222,10 +223,8 @@ src_configure() {
 		gallium_enable video_cards_vmware svga
 		gallium_enable video_cards_nouveau nouveau
 		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-				! use video_cards_i965; then
-			gallium_enable video_cards_intel i915 i965
+		if ! use video_cards_i915; then
+			gallium_enable video_cards_intel i915
 		fi
 
 		gallium_enable video_cards_r300 r300

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     b7f1da42cdaa5eceee51c2b8e7efb8dac934b6d5
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Nov 29 22:57:42 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Tue Nov 29 22:57:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b7f1da42

media-libs/mesa: don't require USE=classic with i915 driver

i915g exists too.

---
 media-libs/mesa/mesa-9999.ebuild |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 751a59d..84cb8ad 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -63,7 +63,6 @@ REQUIRED_USE="
 	g3dvl? ( || ( vdpau xvmc ) )
 	vdpau? ( g3dvl )
 	xvmc?  ( g3dvl )
-	video_cards_i915?   ( classic )
 	video_cards_i965?   ( classic )
 	video_cards_r100?   ( classic )
 	video_cards_r200?   ( classic )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     a1aafb438cb252b02509cc4ab8710d203db6f142
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Dec 16 05:46:22 2011 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Dec 16 05:46:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=a1aafb43

media-libs/mesa: openvg requires egl

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 84cb8ad..8e09546 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -54,7 +54,7 @@ REQUIRED_USE="
 	d3d?    ( gallium )
 	g3dvl?  ( gallium )
 	llvm?   ( gallium )
-	openvg? ( gallium )
+	openvg? ( egl gallium )
 	egl? ( shared-glapi )
 	gallium? (
 		video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     8f48af03e8602e8436d11a86448b106a6cb8c217
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Jan  4 03:08:53 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed Jan  4 03:08:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=8f48af03

media-libs/mesa: remove --enable-xcb flag

xcb is now required (see upstream commit b518dfb513), so the flag is now
gone. We don't need to depend on libxcb directly since libX11-1.4
requires it.

---
 media-libs/mesa/mesa-9999.ebuild |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 8e09546..f7d558f 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -245,7 +245,6 @@ src_configure() {
 		--disable-option-checking \
 		--enable-dri \
 		--enable-glx \
-		--enable-xcb \
 		$(use_enable !bindist texture-float) \
 		$(use_enable debug) \
 		$(use_enable egl) \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     c6e1c9cb746a56cc16536b452ed2720e37880912
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Jan 11 20:41:35 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed Jan 11 20:41:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=c6e1c9cb

media-libs/mesa: depend on >=x11-libs/libxcb-1.8

libxcb-1.8 (specifically libxcb built against xcb-proto-1.7, but
libxcb-1.8 is the first to require xcb-proto-1.7, so.) is required for
GLX_ARB_create_context* extensions for OpenGL 3.0.

---
 media-libs/mesa/mesa-9999.ebuild |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index f7d558f..ec83a5f 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -92,6 +92,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 	x11-libs/libXdamage
 	x11-libs/libXext
 	x11-libs/libXxf86vm
+	>=x11-libs/libxcb-1.8
 	d3d? ( app-emulation/wine )
 	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
 	wayland? ( x11-base/wayland )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     9956ad59a0203da83c935c2235de5d82f06a1f3c
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Jan 12 00:05:20 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Thu Jan 12 00:05:20 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=9956ad59

media-libs/mesa: drop appending -ffast-math

-ffast-math breaks glsl-const-folding-01.

---
 media-libs/mesa/mesa-9999.ebuild |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ec83a5f..ff2ff14 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -139,8 +139,6 @@ pkg_setup() {
 		append-flags -fno-ivopts
 	fi
 
-	# recommended by upstream
-	append-flags -ffast-math
 	# workaround toc-issue wrt #386545
 	use ppc64 && append-flags -mminimal-toc
 }

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     aa69e9ff1855d96c27e4322429009b144767b108
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Jan 14 16:03:10 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Jan 14 16:03:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=aa69e9ff

media-libs/mesa: bump libdrm dependency to >=2.4.30

Bug 398883.

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ff2ff14..ed7e205 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -71,7 +71,7 @@ REQUIRED_USE="
 	video_cards_vmware? ( gallium )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.27"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.30"
 # not a runtime dependency of this package, but dependency of packages which
 # depend on this package, bug #342393
 EXTERNAL_DEPEND="

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     d68fac91bf9f83ecb9fac9850aa9bf38ae90482e
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Jan 20 21:57:32 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Jan 20 21:57:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d68fac91

media-libs/mesa: remove gcc-4.2 workaround

---
 media-libs/mesa/mesa-9999.ebuild |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 42c7f99..d5b7a78 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -137,11 +137,6 @@ QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
 # Think about: ggi, fbcon, no-X configs
 
 pkg_setup() {
-	# gcc 4.2 has buggy ivopts
-	if [[ $(gcc-version) = "4.2" ]]; then
-		append-flags -fno-ivopts
-	fi
-
 	# workaround toc-issue wrt #386545
 	use ppc64 && append-flags -mminimal-toc
 }

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     2fdacfcc317f8f5ce1704ae761777b156b30e569
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Jan 20 22:21:02 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Jan 20 22:21:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=2fdacfcc

media-libs/mesa: don't disable option tracking

---
 media-libs/mesa/mesa-9999.ebuild |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index d5b7a78..806eb32 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -235,7 +235,6 @@ src_configure() {
 	fi
 
 	econf \
-		--disable-option-checking \
 		--enable-dri \
 		--enable-glx \
 		$(use_enable !bindist texture-float) \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     70718eb4d9be7b53d7c56ef0e6f64894ae357bbf
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Jan 20 21:42:30 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Jan 20 21:42:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=70718eb4

media-libs/mesa: 8.0-rc1 wasn't in the RC folder

---
 media-libs/mesa/mesa-9999.ebuild |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ed7e205..d37b131 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -20,7 +20,6 @@ MY_P="${MY_PN}-${PV/_/-}"
 MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
 
 FOLDER="${PV/_rc*/}"
-[[ ${PV/_rc*/} == ${PV} ]] || FOLDER+="/RC"
 
 DESCRIPTION="OpenGL-like graphic library for Linux"
 HOMEPAGE="http://mesa3d.sourceforge.net/"

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     ade55eae813bf27f637a5c5cf57cff16956b966f
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Jan 20 21:46:10 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Jan 20 21:46:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=ade55eae

media-libs/mesa: require classic/gallium when selecting a VIDEO_CARD

---
 media-libs/mesa/mesa-9999.ebuild |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index d37b131..42c7f99 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -62,7 +62,11 @@ REQUIRED_USE="
 	g3dvl? ( || ( vdpau xvmc ) )
 	vdpau? ( g3dvl )
 	xvmc?  ( g3dvl )
+	video_cards_intel?  ( || ( classic gallium ) )
+	video_cards_i915?   ( || ( classic gallium ) )
 	video_cards_i965?   ( classic )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium ) )
 	video_cards_r100?   ( classic )
 	video_cards_r200?   ( classic )
 	video_cards_r300?   ( gallium )
@@ -203,10 +207,6 @@ src_configure() {
 		"
 	fi
 
-	if use !gallium && use !classic; then
-		ewarn "You enabled neither classic nor gallium USE flags. No hardware"
-		ewarn "drivers will be built."
-	fi
 	if use gallium; then
 		myconf+="
 			$(use_enable d3d d3d1x)

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     093972d18d8d25646215a292320cf77ec187a9c7
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Jan 20 22:27:36 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Jan 20 22:27:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=093972d1

media-libs/mesa: remove shared-glapi/dricore USE flags

Shared dricore and glapi are always built now.

---
 media-libs/mesa/mesa-9999.ebuild |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index eeb347b..097dc98 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -47,14 +47,13 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl openvg osmesa pax_kernel pic selinux shared-dricore +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
+	bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl openvg osmesa pax_kernel pic selinux vdpau wayland xvmc kernel_FreeBSD"
 
 REQUIRED_USE="
 	d3d?    ( gallium )
 	g3dvl?  ( gallium )
 	llvm?   ( gallium )
 	openvg? ( egl gallium )
-	egl? ( shared-glapi )
 	gallium? (
 		video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
 		video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
@@ -246,8 +245,6 @@ src_configure() {
 		$(use_enable nptl glx-tls) \
 		$(use_enable osmesa) \
 		$(use_enable !pic asm) \
-		$(use_enable shared-dricore) \
-		$(use_enable shared-glapi) \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
 		${myconf}

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     5b9ef903aa15573d5c623c02e3232f4d4a84dbe6
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Jan 24 20:37:48 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Tue Jan 24 20:37:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=5b9ef903

media-libs/mesa: add back USE=shared-glapi

---
 media-libs/mesa/mesa-9999.ebuild |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 097dc98..417d667 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -47,13 +47,15 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl openvg osmesa pax_kernel pic selinux vdpau wayland xvmc kernel_FreeBSD"
+	bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl
+	openvg osmesa pax_kernel pic selinux +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
 
 REQUIRED_USE="
 	d3d?    ( gallium )
 	g3dvl?  ( gallium )
 	llvm?   ( gallium )
 	openvg? ( egl gallium )
+	gbm?    ( shared-glapi )
 	gallium? (
 		video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
 		video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
@@ -245,6 +247,7 @@ src_configure() {
 		$(use_enable nptl glx-tls) \
 		$(use_enable osmesa) \
 		$(use_enable !pic asm) \
+		$(use_enable shared-glapi) \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
 		${myconf}

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     8a890394ddd97fca5502fabfe7b2a85a14ab3931
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Jan 26 20:59:06 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Thu Jan 26 20:59:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=8a890394

media-libs/mesa: kill .la files

---
 media-libs/mesa/mesa-9999.ebuild |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 417d667..de1af38 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -256,6 +256,8 @@ src_configure() {
 src_install() {
 	base_src_install
 
+	find "${ED}" -name '*.la' -exec rm -f {} + || die
+
 	if use !bindist; then
 		dodoc docs/patents.txt
 	fi

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     785ca7fb43f5a004875589f6da180bf3ad875494
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Feb  1 16:16:32 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed Feb  1 16:16:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=785ca7fb

media-libs/mesa: version bump to 8.0-rc2

---
 .../{mesa-8.0_rc1.ebuild => mesa-8.0_rc2.ebuild}   |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/mesa-8.0_rc1.ebuild b/media-libs/mesa/mesa-8.0_rc2.ebuild
similarity index 100%
rename from media-libs/mesa/mesa-8.0_rc1.ebuild
rename to media-libs/mesa/mesa-8.0_rc2.ebuild

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     550f795991252a446ca6fbb8e4a45d5556128a8a
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Feb 10 16:41:05 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Feb 10 16:41:05 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=550f7959

media-libs/mesa: bump to 8.0

---
 .../mesa/{mesa-8.0_rc2.ebuild => mesa-8.0.ebuild}  |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/mesa-8.0_rc2.ebuild b/media-libs/mesa/mesa-8.0.ebuild
similarity index 100%
rename from media-libs/mesa/mesa-8.0_rc2.ebuild
rename to media-libs/mesa/mesa-8.0.ebuild

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     d4e98f98da111e3e9f8577727262ec86ed2d7068
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Feb 10 16:41:37 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Feb 10 16:41:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d4e98f98

media-libs/mesa: bump libdrm dependency to 2.4.31

---
 media-libs/mesa/mesa-8.0.ebuild  |    2 +-
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-8.0.ebuild b/media-libs/mesa/mesa-8.0.ebuild
index e0e16a0..d01651e 100644
--- a/media-libs/mesa/mesa-8.0.ebuild
+++ b/media-libs/mesa/mesa-8.0.ebuild
@@ -74,7 +74,7 @@ REQUIRED_USE="
 	video_cards_vmware? ( gallium )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.30"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.31"
 # not a runtime dependency of this package, but dependency of packages which
 # depend on this package, bug #342393
 EXTERNAL_DEPEND="

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 6f2b7f7..22607aa 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -75,7 +75,7 @@ REQUIRED_USE="
 	video_cards_vmware? ( gallium )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.30"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.31"
 # not a runtime dependency of this package, but dependency of packages which
 # depend on this package, bug #342393
 EXTERNAL_DEPEND="

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     d1b9e22218ecb3e55b4c7e205504bbaad39c5f04
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Feb 10 16:43:52 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Feb 10 16:43:52 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d1b9e222

media-libs/mesa: gbm requires shared-glapi, now egl.

---
 media-libs/mesa/mesa-8.0.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-8.0.ebuild b/media-libs/mesa/mesa-8.0.ebuild
index d01651e..33cfe25 100644
--- a/media-libs/mesa/mesa-8.0.ebuild
+++ b/media-libs/mesa/mesa-8.0.ebuild
@@ -54,7 +54,7 @@ REQUIRED_USE="
 	g3dvl?  ( gallium )
 	llvm?   ( gallium )
 	openvg? ( egl gallium )
-	egl? ( shared-glapi )
+	gbm?    ( shared-glapi )
 	gallium? (
 		video_cards_r300?   ( x86? ( llvm ) amd64? ( llvm ) )
 		video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     3f2fa5c8b644bd5aac956337ac56317724012b8a
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Feb 10 17:12:27 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Feb 10 17:12:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3f2fa5c8

media-libs/mesa: add missing USE flags to metadata.xml

---
 media-libs/mesa/metadata.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 99a4ec7..02ab291 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -9,14 +9,17 @@
 	<flag name='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
 	<flag name='g3dvl'>Enable video decode acceleration support for Gallium3D.</flag>
 	<flag name='gbm'>Enable the Graphics Buffer Manager for EGL on KMS.</flag>
-	<flag name='gles'>Enable GLES support.</flag>
+	<flag name='gles1'>Enable GLESv1 support.</flag>
+	<flag name='gles2'>Enable GLESv2 support.</flag>
 	<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
 	<flag name='openvg'>Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
+	<flag name='osmesa'>Enable the Off-screen Rendering Mesa API</flag>
 	<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
 	<flag name='shared-dricore'>Enable sharing of common code for classic DRI drivers.</flag>
 	<flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag>
 	<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
+	<flag name='wayland'>Enable support for dev-libs/wayland</flag>
 	<flag name='xvmc'>Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     51388b4088595c1fa233a045be04e996850707c1
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Feb 10 17:53:44 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Feb 10 17:53:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=51388b40

media-libs/mesa: bump glproto dependency to 1.4.15

---
 media-libs/mesa/mesa-8.0.ebuild  |    2 +-
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-8.0.ebuild b/media-libs/mesa/mesa-8.0.ebuild
index 33cfe25..469c078 100644
--- a/media-libs/mesa/mesa-8.0.ebuild
+++ b/media-libs/mesa/mesa-8.0.ebuild
@@ -79,7 +79,7 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.31"
 # depend on this package, bug #342393
 EXTERNAL_DEPEND="
 	>=x11-proto/dri2proto-2.6
-	>=x11-proto/glproto-1.4.14
+	>=x11-proto/glproto-1.4.15
 "
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 22607aa..1f868f5 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -80,7 +80,7 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.31"
 # depend on this package, bug #342393
 EXTERNAL_DEPEND="
 	>=x11-proto/dri2proto-2.6
-	>=x11-proto/glproto-1.4.14
+	>=x11-proto/glproto-1.4.15
 "
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     458bfd5f8c72f6b01697bf9838ba981f50a74d86
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 16:14:44 2012 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Wed Feb 15 16:14:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=458bfd5f

media-libs/mesa: sync with portage to work around bug 374647

---
 media-libs/mesa/mesa-9999.ebuild |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index fea2d84..6023f73 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -328,6 +328,14 @@ pkg_postinst() {
 	# Switch to the xorg implementation.
 	echo
 	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# switch to xorg-x11 and back if necessary, bug #374647 comment 11
+	OLD_IMPLEM="$(eselect opengl show)"
+	if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
+		eselect opengl set ${OPENGL_DIR}
+		eselect opengl set ${OLD_IMPLEM}
+	fi
+
 	# Select classic/gallium drivers
 	if use classic || use gallium; then
 		eselect mesa set --auto

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     e3645fb44d82cb63ce1670890c962333e2055e8b
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 11 22:09:12 2012 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Mar 11 22:09:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=e3645fb4

media-libs/mesa: add USE flag for the XA state tracker.

---
 media-libs/mesa/mesa-9999.ebuild |    5 ++++-
 media-libs/mesa/metadata.xml     |    1 +
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 6023f73..b039e8e 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -48,7 +48,8 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl
-	openvg osmesa pax_kernel pic selinux +shared-glapi vdpau wayland xvmc kernel_FreeBSD"
+	openvg osmesa pax_kernel pic selinux +shared-glapi vdpau wayland xvmc xa
+	kernel_FreeBSD"
 
 REQUIRED_USE="
 	d3d?    ( gallium )
@@ -58,6 +59,7 @@ REQUIRED_USE="
 	gbm?    ( shared-glapi )
 	g3dvl? ( || ( vdpau xvmc ) )
 	vdpau? ( g3dvl )
+	xa?  ( gallium )
 	xvmc?  ( g3dvl )
 	video_cards_intel?  ( || ( classic gallium ) )
 	video_cards_i915?   ( || ( classic gallium ) )
@@ -247,6 +249,7 @@ src_configure() {
 		$(use_enable osmesa) \
 		$(use_enable !pic asm) \
 		$(use_enable shared-glapi) \
+		$(use_enable xa) \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
 		${myconf}

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 02ab291..4e26781 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -20,6 +20,7 @@
 	<flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag>
 	<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
 	<flag name='wayland'>Enable support for dev-libs/wayland</flag>
+	<flag name='xa'>Enable the XA (X Acceleration) API for Gallium3D.</flag>
 	<flag name='xvmc'>Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     43c581afd29519401eb45b04f2a0003d4a644625
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 14:40:29 2012 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Thu Mar 29 14:40:29 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=43c581af

media-libs/mesa: import python3 test fix from bug #407887.

---
 media-libs/mesa/mesa-9999.ebuild |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index b039e8e..a8cb901 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -165,6 +165,9 @@ src_prepare() {
 		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
 	fi
 
+	# Tests fail against python-3, bug #407887
+	sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/glsl/tests/compare_ir || die
+
 	base_src_prepare
 
 	eautoreconf

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     09a0e677fa7829cfd50e2a7f1b47dd973c372486
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 29 21:00:30 2012 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Thu Mar 29 21:00:30 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=09a0e677

media-libs/mesa: update libXvMC dependency for bug #410185.

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index a8cb901..0b3f367 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -98,7 +98,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 	d3d? ( app-emulation/wine )
 	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
 	wayland? ( dev-libs/wayland )
-	xvmc? ( x11-libs/libXvMC )
+	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
 	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
 "
 for card in ${INTEL_CARDS}; do

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     992d6193e2640ac4f5f72a423a14bd05f36f7e51
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 14 17:58:21 2012 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sat Apr 14 17:58:21 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=992d6193

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="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 INTEL_CARDS="i915 i965 intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon"
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
 VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} nouveau vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
@@ -49,7 +49,7 @@ done
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl
 	openvg osmesa pax_kernel pic selinux +shared-glapi vdpau wayland xvmc xa
-	kernel_FreeBSD"
+	xorg kernel_FreeBSD"
 
 REQUIRED_USE="
 	d3d?    ( gallium )
@@ -60,6 +60,7 @@ REQUIRED_USE="
 	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="
 	video_cards_r200?   ( classic )
 	video_cards_r300?   ( gallium )
 	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm xorg )
 	video_cards_vmware? ( gallium )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.31"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.34"
 # not a runtime dependency of this package, but dependency of packages which
 # depend on this package, bug #342393
 EXTERNAL_DEPEND="
@@ -82,7 +84,9 @@ EXTERNAL_DEPEND="
 "
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
+# gtest file collision bug #411825
 RDEPEND="${EXTERNAL_DEPEND}
+	!dev-cpp/gtest
 	!<x11-base/xorg-server-1.7
 	!<=x11-proto/xf86driproto-2.0.3
 	classic? ( app-admin/eselect-mesa )
@@ -98,6 +102,10 @@ RDEPEND="${EXTERNAL_DEPEND}
 	d3d? ( app-emulation/wine )
 	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
 	wayland? ( dev-libs/wayland )
+	xorg? (
+		x11-base/xorg-server
+		x11-libs/libdrm[libkms]
+	)
 	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
 	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
 "
@@ -114,7 +122,10 @@ for card in ${RADEON_CARDS}; do
 done
 
 DEPEND="${RDEPEND}
-	llvm? ( >=sys-devel/llvm-2.9 )
+	llvm? (
+		>=sys-devel/llvm-2.9
+		video_cards_radeonsi? ( >=sys-devel/llvm-3.1 )
+	)
 	=dev-lang/python-2*
 	dev-libs/libxml2[python]
 	dev-util/pkgconfig
@@ -226,6 +237,7 @@ src_configure() {
 
 		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 @@
 	<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
 	<flag name='wayland'>Enable support for dev-libs/wayland</flag>
 	<flag name='xa'>Enable the XA (X Acceleration) API for Gallium3D.</flag>
+	<flag name='xorg'>Enable the Xorg state tracker for Gallium3D. This is not required for OpenGL acceleration in X.</flag>
 	<flag name='xvmc'>Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     cecae6c92f9f9b3e242b6afe8baa17aa4bb7ee76
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 14 18:04:37 2012 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sat Apr 14 18:04:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=cecae6c9

media-libs/mesa: actually enable xorg state tracker.

---
 media-libs/mesa/mesa-9999.ebuild |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 1987c99..776c961 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -265,6 +265,7 @@ src_configure() {
 		$(use_enable !pic asm) \
 		$(use_enable shared-glapi) \
 		$(use_enable xa) \
+		$(use_enable xorg) \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
 		${myconf}

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     de3cb71e1d3aa81e576c8d5c8ecf312e3412348a
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 25 22:37:28 2012 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Wed Apr 25 22:37:28 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=de3cb71e

media-libs/mesa: unblock gtest, bug #411825.

---
 media-libs/mesa/mesa-9999.ebuild |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index d5d5965..19cc270 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -86,7 +86,6 @@ EXTERNAL_DEPEND="
 # keep blocks in rdepend for binpkg
 # gtest file collision bug #411825
 RDEPEND="${EXTERNAL_DEPEND}
-	!dev-cpp/gtest
 	!<x11-base/xorg-server-1.7
 	!<=x11-proto/xf86driproto-2.0.3
 	classic? ( app-admin/eselect-mesa )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     36b5319e1cac0f145ab4c60c7a15d3816e3b196c
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Tue May  1 18:56:10 2012 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Tue May  1 18:56:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=36b5319e

media-libs/mesa: Add support for r600-llvm-compiler, shut up repoman.

The r600-llvm-compiler requires llvm-3.1 which is not in the portage tree yet.

---
 media-libs/mesa/mesa-9999.ebuild |   11 +++++++----
 media-libs/mesa/metadata.xml     |    2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 19cc270..ebd5fca 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -48,8 +48,8 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl
-	openvg osmesa pax_kernel pic selinux +shared-glapi vdpau wayland xvmc xa
-	xorg kernel_FreeBSD"
+	openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau
+	wayland xvmc xa xorg kernel_FreeBSD"
 
 REQUIRED_USE="
 	d3d?    ( gallium )
@@ -59,6 +59,7 @@ REQUIRED_USE="
 	gbm?    ( shared-glapi )
 	g3dvl? ( || ( vdpau xvmc ) )
 	vdpau? ( g3dvl )
+	r600-llvm-compiler ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
 	xa?  ( gallium )
 	xorg?  ( gallium )
 	xvmc?  ( g3dvl )
@@ -71,7 +72,7 @@ REQUIRED_USE="
 	video_cards_r200?   ( classic )
 	video_cards_r300?   ( gallium )
 	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm xorg )
+	video_cards_radeonsi?   ( gallium llvm )
 	video_cards_vmware? ( gallium )
 "
 
@@ -123,6 +124,7 @@ done
 DEPEND="${RDEPEND}
 	llvm? (
 		>=sys-devel/llvm-2.9
+		r600-llvm-compiler? ( >=sys-devel/llvm-3.1 )
 		video_cards_radeonsi? ( >=sys-devel/llvm-3.1 )
 	)
 	=dev-lang/python-2*
@@ -223,6 +225,7 @@ src_configure() {
 			$(use_enable g3dvl gallium-g3dvl)
 			$(use_enable llvm gallium-llvm)
 			$(use_enable openvg)
+			$(use_enable r600-llvm-compiler)
 			$(use_enable vdpau)
 			$(use_enable xvmc)
 		"

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index ce969ec..a918a88 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -15,8 +15,8 @@
 	<flag name='openvg'>Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
 	<flag name='osmesa'>Enable the Off-screen Rendering Mesa API</flag>
 	<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
+	<flag name='r600-llvm-compiler'>Enable r600 shader compiler LLVM backend.</flag>
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
-	<flag name='shared-dricore'>Enable sharing of common code for classic DRI drivers.</flag>
 	<flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag>
 	<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
 	<flag name='wayland'>Enable support for dev-libs/wayland</flag>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     54edc967473999a938548eea7f882f71ba80a6a2
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Wed May  2 09:20:35 2012 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Wed May  2 09:20:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=54edc967

media-libs/mesa: add missing question mark, bug #414343.

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ebd5fca..63448fe 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -59,7 +59,7 @@ REQUIRED_USE="
 	gbm?    ( shared-glapi )
 	g3dvl? ( || ( vdpau xvmc ) )
 	vdpau? ( g3dvl )
-	r600-llvm-compiler ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
+	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
 	xa?  ( gallium )
 	xorg?  ( gallium )
 	xvmc?  ( g3dvl )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     75eb1b1bedbb2ed21e5716b3545a9998e6d8c198
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue May 29 20:15:24 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Tue May 29 20:15:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=75eb1b1b

media-libs/mesa: add dev-util/indent as a dependency

As of upstream commit 0ce0f7c0c8fa some source code is generated at
build-time which is run through indent.

---
 media-libs/mesa/mesa-9999.ebuild |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 63448fe..e211f82 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -87,6 +87,7 @@ EXTERNAL_DEPEND="
 # keep blocks in rdepend for binpkg
 # gtest file collision bug #411825
 RDEPEND="${EXTERNAL_DEPEND}
+	dev-util/indent
 	!<x11-base/xorg-server-1.7
 	!<=x11-proto/xf86driproto-2.0.3
 	classic? ( app-admin/eselect-mesa )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Tomas Chvatal]

commit:     0e96e74763ee40943e8896e24c4e2caea5f7a102
Author:     Tomas Chvatal <tchvatal <AT> suse <DOT> cz>
AuthorDate: Mon Jun 11 12:41:17 2012 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 12:41:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=0e96e747

[media-libs/mesa] sync with main tree.

---
 media-libs/mesa/mesa-9999.ebuild |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index e211f82..2bb17a8 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -81,7 +81,7 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.34"
 # depend on this package, bug #342393
 EXTERNAL_DEPEND="
 	>=x11-proto/dri2proto-2.6
-	>=x11-proto/glproto-1.4.15
+	>=x11-proto/glproto-1.4.15-r1
 "
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
@@ -92,7 +92,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 	!<=x11-proto/xf86driproto-2.0.3
 	classic? ( app-admin/eselect-mesa )
 	gallium? ( app-admin/eselect-mesa )
-	>=app-admin/eselect-opengl-1.2.2
+	>=app-admin/eselect-opengl-1.2.6
 	dev-libs/expat
 	gbm? ( sys-fs/udev )
 	>=x11-libs/libX11-1.3.99.901
@@ -130,9 +130,9 @@ DEPEND="${RDEPEND}
 	)
 	=dev-lang/python-2*
 	dev-libs/libxml2[python]
-	dev-util/pkgconfig
 	sys-devel/bison
 	sys-devel/flex
+	virtual/pkgconfig
 	x11-misc/makedepend
 	>=x11-proto/xextproto-7.0.99.1
 	x11-proto/xf86driproto
@@ -295,17 +295,24 @@ src_install() {
 	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
 	# because user can eselect desired GL provider.
 	ebegin "Moving libGL and friends for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
 		local x
-		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL,OpenVG}.{la,a,so*}; do
+		local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
+		dodir ${gl_dir}/{lib,extensions,include/GL}
+		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
 			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
+				mv -f "${x}" "${ED}${gl_dir}"/lib \
 					|| die "Failed to move ${x}"
 			fi
 		done
 		for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
 			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \
+				mv -f "${x}" "${ED}${gl_dir}"/include/GL \
+					|| die "Failed to move ${x}"
+			fi
+		done
+		for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
+			if [ -d ${x} ]; then
+				mv -f "${x}" "${ED}${gl_dir}"/include \
 					|| die "Failed to move ${x}"
 			fi
 		done

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     70c5543aee0b2090ef0232711164dde93176727c
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Jun 30 18:00:37 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Jun 30 18:00:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=70c5543a

media-libs/mesa: correct LICENSE

ralloc is MIT, not GPL.

---
 media-libs/mesa/mesa-9999.ebuild |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index be4cf17..b40f17c 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -32,10 +32,9 @@ else
 		${SRC_PATCHES}"
 fi
 
-# Most of the code is MIT/X11.
-# ralloc is LGPL-3
+# The code is MIT/X11.
 # GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
-LICENSE="MIT LGPL-3 SGI-B-2.0"
+LICENSE="MIT SGI-B-2.0"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     92deea37eda48dc3ddf195e8ff4f2ac3ef1893bb
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Aug 11 17:59:53 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Aug 11 17:59:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=92deea37

media-libs/mesa: Remove indent dependency

Only compiled code is indented, so it's not really needed.

---
 media-libs/mesa/mesa-9999.ebuild |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index b40f17c..2c67290 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -86,7 +86,6 @@ EXTERNAL_DEPEND="
 # keep blocks in rdepend for binpkg
 # gtest file collision bug #411825
 RDEPEND="${EXTERNAL_DEPEND}
-	dev-util/indent
 	!<x11-base/xorg-server-1.7
 	!<=x11-proto/xf86driproto-2.0.3
 	classic? ( app-admin/eselect-mesa )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     8aa5e79b16c092327c53347fb8d9878a098fb9f4
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  1 11:12:38 2012 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sat Sep  1 11:12:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=8aa5e79b

media-libs/mesa: raise libdrm and libxcb dependencies, bug #431966.

---
 media-libs/mesa/mesa-9999.ebuild |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 2c67290..e47374b 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -75,7 +75,7 @@ REQUIRED_USE="
 	video_cards_vmware? ( gallium )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.34"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.37"
 # not a runtime dependency of this package, but dependency of packages which
 # depend on this package, bug #342393
 EXTERNAL_DEPEND="
@@ -97,7 +97,7 @@ RDEPEND="${EXTERNAL_DEPEND}
 	x11-libs/libXdamage
 	x11-libs/libXext
 	x11-libs/libXxf86vm
-	>=x11-libs/libxcb-1.8
+	>=x11-libs/libxcb-1.8.1
 	d3d? ( app-emulation/wine )
 	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
 	wayland? ( dev-libs/wayland )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     c3aaab7fb8e7e0e58d25eb6a4aafb964a4ef1fcb
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  1 12:03:10 2012 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sat Sep  1 12:03:10 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=c3aaab7f

media-libs/mesa: actually needs even newer libdrm

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index e47374b..040c3e2 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -75,7 +75,7 @@ REQUIRED_USE="
 	video_cards_vmware? ( gallium )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.37"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.39"
 # not a runtime dependency of this package, but dependency of packages which
 # depend on this package, bug #342393
 EXTERNAL_DEPEND="

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     d8745ded27ba81bfbe0a383f197820e2af8bbc4a
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Sep  6 23:24:22 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Thu Sep  6 23:24:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d8745ded

media-libs/mesa: Remove broken d3d USE flag

d3d disabled upstream because it's broken and unmaintained.

---
 media-libs/mesa/mesa-9999.ebuild |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 040c3e2..a094a48 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -46,12 +46,11 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic d3d debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl
+	bindist +classic debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl
 	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 )
@@ -98,7 +97,6 @@ RDEPEND="${EXTERNAL_DEPEND}
 	x11-libs/libXext
 	x11-libs/libXxf86vm
 	>=x11-libs/libxcb-1.8.1
-	d3d? ( app-emulation/wine )
 	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
 	wayland? ( dev-libs/wayland )
 	xorg? (
@@ -220,7 +218,6 @@ src_configure() {
 
 	if use gallium; then
 		myconf+="
-			$(use_enable d3d d3d1x)
 			$(use_enable g3dvl gallium-g3dvl)
 			$(use_enable llvm gallium-llvm)
 			$(use_enable openvg)

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     1a0d5feb7b63067bf2e3fa6d1d0e3b697017be84
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Sep  6 23:25:12 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Thu Sep  6 23:25:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=1a0d5feb

media-libs/mesa/metadata.xml: Remove d3d

---
 media-libs/mesa/metadata.xml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index a918a88..db34d3b 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -4,7 +4,6 @@
 <herd>x11</herd>
 <use>
 	<flag name='classic'>Build drivers based on the classic architecture.</flag>
-	<flag name='d3d'>Enable DirectX 10/10.1/11 backend for Gallium3D.</flag>
 	<flag name='egl'>Enable EGL support.</flag>
 	<flag name='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
 	<flag name='g3dvl'>Enable video decode acceleration support for Gallium3D.</flag>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     ffb9c33d5309c420c5e4dc94a6f6e7115f151a14
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Sep 12 18:34:24 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed Sep 12 18:34:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=ffb9c33d

media-libs/mesa: Remove old gtest comment

Missed in commit de3cb71e1d3aa81e576c8d5c8ecf312e3412348a.

---
 media-libs/mesa/mesa-9999.ebuild |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ddaffc7..0d70c9b 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -77,7 +77,6 @@ REQUIRED_USE="
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.39"
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
-# gtest file collision bug #411825
 RDEPEND="
 	!<x11-base/xorg-server-1.7
 	!<=x11-proto/xf86driproto-2.0.3

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     1e4f4e209c232a60c27cbdb9d9b67ba98a434470
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Wed Sep 12 18:33:06 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Wed Sep 12 18:33:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=1e4f4e20

media-libs/mesa: Don't RDEPEND on glproto/dri2proto

Bug 342393.

---
 media-libs/mesa/mesa-9999.ebuild |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index a094a48..ddaffc7 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -75,16 +75,10 @@ REQUIRED_USE="
 "
 
 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.39"
-# not a runtime dependency of this package, but dependency of packages which
-# depend on this package, bug #342393
-EXTERNAL_DEPEND="
-	>=x11-proto/dri2proto-2.6
-	>=x11-proto/glproto-1.4.15-r1
-"
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 # gtest file collision bug #411825
-RDEPEND="${EXTERNAL_DEPEND}
+RDEPEND="
 	!<x11-base/xorg-server-1.7
 	!<=x11-proto/xf86driproto-2.0.3
 	classic? ( app-admin/eselect-mesa )
@@ -130,6 +124,8 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/pkgconfig
 	x11-misc/makedepend
+	>=x11-proto/dri2proto-2.6
+	>=x11-proto/glproto-1.4.15-r1
 	>=x11-proto/xextproto-7.0.99.1
 	x11-proto/xf86driproto
 	x11-proto/xf86vidmodeproto

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     b3fd52484b380541ed54dd7c97489684897f11cb
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  6 04:26:02 2012 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Tue Nov  6 04:26:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b3fd5248

media-libs/mesa: require libdrm-2.4.40 for radeon changes.

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 0d70c9b..5cf6172 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -74,7 +74,7 @@ REQUIRED_USE="
 	video_cards_vmware? ( gallium )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.39"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.40"
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND="

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     a98e5c8e2ea02ca955bdd9ce2c50a9a089fb417d
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 11 00:49:15 2012 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Nov 11 00:49:15 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=a98e5c8e

media-libs/mesa: import BSD indent workaround from bug #428112.

---
 media-libs/mesa/mesa-9999.ebuild |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 5cf6172..4b6ca7a 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -244,6 +244,9 @@ src_configure() {
 		"
 	fi
 
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
 	econf \
 		--enable-dri \
 		--enable-glx \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     f9e5967f80a063c47c082758d52a3ed74aafbad2
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Dec 29 17:04:33 2012 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Dec 29 17:04:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=f9e5967f

media-libs/mesa: Add bindist description (bug 448932)

Also update osmesa and r600-llvm-compiler descriptions.

---
 media-libs/mesa/metadata.xml |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index db34d3b..fef0d22 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
 <herd>x11</herd>
 <use>
+	<flag name='bindist'>Disable patent-encumbered ARB_texture_float, EXT_texture_shared_exponent, and EXT_packed_float extensions.</flag>
 	<flag name='classic'>Build drivers based on the classic architecture.</flag>
 	<flag name='egl'>Enable EGL support.</flag>
 	<flag name='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
@@ -12,10 +13,10 @@
 	<flag name='gles2'>Enable GLESv2 support.</flag>
 	<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
 	<flag name='openvg'>Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
-	<flag name='osmesa'>Enable the Off-screen Rendering Mesa API</flag>
+	<flag name='osmesa'>Build the Mesa library for off-screen rendering.</flag>
 	<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
-	<flag name='r600-llvm-compiler'>Enable r600 shader compiler LLVM backend.</flag>
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
+	<flag name='r600-llvm-compiler'>Build the LLVM based r600 shader compiler.</flag>
 	<flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag>
 	<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
 	<flag name='wayland'>Enable support for dev-libs/wayland</flag>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     53fde6d7e0fa5a93afe7f462e5def6f3ab39aa20
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Jan 11 02:13:02 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Jan 11 02:13:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=53fde6d7

media-libs/mesa: makedepend is no longer required

See upstream 424f2008.

---
 media-libs/mesa/mesa-9999.ebuild |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 4b6ca7a..6e79a23 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -122,7 +122,6 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
-	x11-misc/makedepend
 	>=x11-proto/dri2proto-2.6
 	>=x11-proto/glproto-1.4.15-r1
 	>=x11-proto/xextproto-7.0.99.1

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     e7fc6489abdd92ebceb7c21cbb007ce3b5c4ff3c
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Mon Jan 21 17:53:44 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Mon Jan 21 17:53:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=e7fc6489

media-libs/mesa: Depend on >=wayland-1.0.3

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 6e79a23..c887c0a 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -91,7 +91,7 @@ RDEPEND="
 	x11-libs/libXxf86vm
 	>=x11-libs/libxcb-1.8.1
 	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
-	wayland? ( dev-libs/wayland )
+	wayland? ( >=dev-libs/wayland-1.0.3 )
 	xorg? (
 		x11-base/xorg-server
 		x11-libs/libdrm[libkms]

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     96d4c45bbb100dffff588f9040a90c79ac739db1
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Fri Jan 25 23:12:43 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Fri Jan 25 23:13:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=96d4c45b

media-libs/mesa: Don't save glsl_compiler. It's gone.

See upstream 569f0e40.

---
 media-libs/mesa/mesa-9999.ebuild |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 03cc5b0..118a196 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -275,11 +275,6 @@ src_install() {
 		dodoc docs/patents.txt
 	fi
 
-	# Save the glsl-compiler for later use
-	if ! tc-is-cross-compiler; then
-		dobin "${S}"/src/glsl/glsl_compiler
-	fi
-
 	# Install config file for eselect mesa
 	insinto /usr/share/mesa
 	newins "${FILESDIR}/eselect-mesa.conf.8.1" eselect-mesa.conf

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     e2a635ff47aad2735f094f1be3eee90bf8363894
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Jan 26 04:10:45 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Jan 26 04:10:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=e2a635ff

media-libs/mesa: Bump eselect-opengl dependency to 1.2.7

1.2.7 is required for switching GLES3 headers.

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 118a196..48c5bc8 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -82,7 +82,7 @@ RDEPEND="
 	!<=x11-proto/xf86driproto-2.0.3
 	classic? ( app-admin/eselect-mesa )
 	gallium? ( app-admin/eselect-mesa )
-	>=app-admin/eselect-opengl-1.2.6
+	>=app-admin/eselect-opengl-1.2.7
 	dev-libs/expat
 	gbm? ( sys-fs/udev )
 	>=x11-libs/libX11-1.3.99.901

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     fd7d168bb8d15f7ada2741a224c91d4ccea92c22
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Feb  7 02:52:50 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Thu Feb  7 02:52:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=fd7d168b

media-libs/mesa: Add gles1/2? ( egl ) to REQUIRED_USE

---
 media-libs/mesa/mesa-9999.ebuild |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index c12be11..06c91e8 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -54,6 +54,8 @@ REQUIRED_USE="
 	llvm?   ( gallium )
 	openvg? ( egl gallium )
 	gbm?    ( shared-glapi )
+	gles1?  ( egl )
+	gles2?  ( egl )
 	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
 	xa?  ( gallium )
 	xorg?  ( gallium )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     f35d49d1388f404dc965a90d9906cb7631020428
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Feb  7 02:44:38 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Thu Feb  7 02:44:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=f35d49d1

media-libs/mesa: Remove useless g3dvl USE flag

It doesn't do anything. It's only useful if you want to detect
XvMC/VDPAU availability. We don't.

---
 media-libs/mesa/mesa-9999.ebuild |    7 +------
 media-libs/mesa/metadata.xml     |    1 -
 2 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 3cb360e..c12be11 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -46,21 +46,17 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +egl g3dvl +gallium gbm gles1 gles2 +llvm +nptl
+	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl
 	openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau
 	wayland xvmc xa xorg kernel_FreeBSD"
 
 REQUIRED_USE="
-	g3dvl?  ( gallium )
 	llvm?   ( gallium )
 	openvg? ( egl gallium )
 	gbm?    ( shared-glapi )
-	g3dvl? ( || ( vdpau xvmc ) )
-	vdpau? ( g3dvl )
 	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
 	xa?  ( gallium )
 	xorg?  ( gallium )
-	xvmc?  ( g3dvl )
 	video_cards_intel?  ( || ( classic gallium ) )
 	video_cards_i915?   ( || ( classic gallium ) )
 	video_cards_i965?   ( classic )
@@ -212,7 +208,6 @@ src_configure() {
 
 	if use gallium; then
 		myconf+="
-			$(use_enable g3dvl gallium-g3dvl)
 			$(use_enable llvm gallium-llvm)
 			$(use_enable openvg)
 			$(use_enable r600-llvm-compiler)

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index fef0d22..19fdbbe 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -7,7 +7,6 @@
 	<flag name='classic'>Build drivers based on the classic architecture.</flag>
 	<flag name='egl'>Enable EGL support.</flag>
 	<flag name='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
-	<flag name='g3dvl'>Enable video decode acceleration support for Gallium3D.</flag>
 	<flag name='gbm'>Enable the Graphics Buffer Manager for EGL on KMS.</flag>
 	<flag name='gles1'>Enable GLESv1 support.</flag>
 	<flag name='gles2'>Enable GLESv2 support.</flag>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     b27aa4c19afc30eb4100073eb9e4f58fb1188759
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 21:55:04 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Mar 10 21:55:04 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b27aa4c1

media-libs/mesa: sync xorg-server subslot dependency with portage

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 2f04276..fe2835e 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -93,7 +93,7 @@ RDEPEND="
 	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
 	wayland? ( >=dev-libs/wayland-1.0.3 )
 	xorg? (
-		x11-base/xorg-server
+		x11-base/xorg-server:=
 		x11-libs/libdrm[libkms]
 	)
 	xvmc? ( >=x11-libs/libXvMC-1.0.6 )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     894a65ed7b062914e7411fcb8f3f18117194145c
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 13:06:15 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Tue Mar 19 13:06:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=894a65ed

media-libs/mesa: depend on llvm that has r600 shader compiler enabled when necessary.

---
 media-libs/mesa/mesa-9999.ebuild |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index fe2835e..0145944 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -114,8 +114,8 @@ done
 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] )
 	)
 	${PYTHON_DEPS}
 	dev-libs/libxml2[python,${PYTHON_USEDEP}]

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[David Heidelberger]

commit:     e3e7eca8d4428a9db42bcc36fa9584fa2fbaca78
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Sat Apr 27 19:56:25 2013 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Sat Apr 27 19:56:25 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=e3e7eca8

media-libs/mesa: wayland requires egl use flag

---
 media-libs/mesa/mesa-9999.ebuild |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 0145944..4c015b4 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -59,6 +59,7 @@ REQUIRED_USE="
 	gles1?  ( egl )
 	gles2?  ( egl )
 	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
+	wayland? ( egl )
 	xa?  ( gallium )
 	xorg?  ( gallium )
 	video_cards_intel?  ( || ( classic gallium ) )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     53878f2d1bcaf77eaad5fb7a7313456409d23a94
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 13:30:49 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Apr 28 13:30:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=53878f2d

media-libs/mesa: unbreak moving of drivers for eselect-mesa switching.

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 3d020b4..6a8e655 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -313,7 +313,7 @@ src_install() {
 
 	if use classic || use gallium; then
 			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so ilo_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
 			keepdir /usr/$(get_libdir)/dri
 			dodir /usr/$(get_libdir)/mesa
 			for x in ${gallium_drivers[@]}; do

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     1577fb12fd44ada226e567c1fd2f4ba12e064e91
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu May 16 01:25:55 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Thu May 16 01:25:55 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=1577fb12

media-libs/mesa: raise libdrm dependency

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 1d33cf4..072a01d 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -76,7 +76,7 @@ REQUIRED_USE="
 	video_cards_vmware? ( gallium )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.44"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.45"
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND="

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     6d1e5cc0c423875f8f5ef58c34939a1dfe255acb
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 18:25:07 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun May 26 18:25:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=6d1e5cc0

media-libs/mesa: build ilo only when user explicitly requests it

Do not build ilo unless VIDEO_CARDS=ilo is set, to avoid users accidentally
building it.

---
 media-libs/mesa/mesa-9999.ebuild |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 0f02e71..bb75b6b 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -202,7 +202,6 @@ src_configure() {
 		driver_enable video_cards_i965 i965
 		if ! use video_cards_i915 && \
 			! use video_cards_i965 && \
-				! use video_cards_ilo; then
 			driver_enable video_cards_intel i915 i965
 		fi
 
@@ -240,8 +239,7 @@ src_configure() {
 		gallium_enable video_cards_ilo ilo
 		if ! use video_cards_i915 && \
 			! use video_cards_i965 && \
-				! use video_cards_ilo; then
-			gallium_enable video_cards_intel i915 ilo
+			gallium_enable video_cards_intel i915
 		fi
 
 		gallium_enable video_cards_r300 r300

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     d917a072dda6811bf5eb4cdf0687a3c3b943513a
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 18:33:40 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun May 26 18:33:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d917a072

media-libs/mesa: add freedreno support

---
 media-libs/mesa/mesa-9999.ebuild |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index bb75b6b..44d2e44 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -42,7 +42,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 
 INTEL_CARDS="i915 i965 ilo intel"
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} nouveau vmware"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
@@ -63,6 +63,7 @@ REQUIRED_USE="
 	wayland? ( egl )
 	xa?  ( gallium )
 	xorg?  ( gallium )
+	video_cards_freedreno?  ( gallium )
 	video_cards_intel?  ( || ( classic gallium ) )
 	video_cards_i915?   ( || ( classic gallium ) )
 	video_cards_i965?   ( classic )
@@ -104,7 +105,7 @@ RDEPEND="
 		x11-libs/libdrm[libkms]
 	)
 	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
-	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
+	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?]
 "
 for card in ${INTEL_CARDS}; do
 	RDEPEND="${RDEPEND}
@@ -201,7 +202,7 @@ src_configure() {
 		driver_enable video_cards_i915 i915
 		driver_enable video_cards_i965 i965
 		if ! use video_cards_i915 && \
-			! use video_cards_i965 && \
+			! use video_cards_i965; then
 			driver_enable video_cards_intel i915 i965
 		fi
 
@@ -249,6 +250,8 @@ src_configure() {
 				! use video_cards_r600; then
 			gallium_enable video_cards_radeon r300 r600
 		fi
+
+		gallium_enable video_cards_freedreno freedreno
 		# opencl stuff
 		if use opencl; then
 			myconf+="

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     110295ecac13a72b6ab7bb81d66a9c6bccb473d1
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 18:35:22 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun May 26 18:35:22 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=110295ec

media-libs/mesa: fix bash syntax errors

---
 media-libs/mesa/mesa-9999.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 44d2e44..5f32bfa 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -239,7 +239,7 @@ src_configure() {
 		gallium_enable video_cards_i915 i915
 		gallium_enable video_cards_ilo ilo
 		if ! use video_cards_i915 && \
-			! use video_cards_i965 && \
+			! use video_cards_i965; then
 			gallium_enable video_cards_intel i915
 		fi
 

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     d047210175bcbb12a50a7bdb018c10c808b2278c
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 19 15:15:38 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Wed Jun 19 15:15:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d0472101

media-libs/mesa: improve opencl switching

---
 media-libs/mesa/mesa-9999.ebuild | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 5c2b81b..ee3ae95 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -366,10 +366,16 @@ src_install() {
 		eend $?
 	fi
 	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implentation for dynamic switching"
+		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
+		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+		dodir ${cl_dir}/{lib,include}
 		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
 			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"/usr/$(get_libdir)/OpenCL/vendors/mesa
+			"${ED}"${cl_dir}
+		fi
+		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+			mv -f "${ED}"/usr/include/CL \
+			"${ED}"${cl_dir}/include
 		fi
 		eend $?
 	fi
@@ -392,6 +398,11 @@ pkg_postinst() {
 		eselect mesa set --auto
 	fi
 
+	# Switch to mesa opencl
+	if use opencl; then
+		eselect opencl set --use-old ${PN}
+	fi
+
 	# warn about patent encumbered texture-float
 	if use !bindist; then
 		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     d3f04287ac2fae97eb2e5663602b4dbecc76b422
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Jun 22 20:36:46 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gmail <DOT> com>
CommitDate: Sat Jun 22 20:36:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d3f04287

media-libs/mesa: Remove shared-glapi USE flag.

---
 media-libs/mesa/mesa-9999.ebuild | 5 ++---
 media-libs/mesa/metadata.xml     | 1 -
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ee3ae95..dc003fc 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -49,14 +49,13 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl
-	openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau
+	openvg osmesa pax_kernel pic r600-llvm-compiler selinux vdpau
 	wayland xvmc xa xorg kernel_FreeBSD"
 
 REQUIRED_USE="
 	llvm?   ( gallium )
 	openvg? ( egl gallium )
 	opencl? ( gallium r600-llvm-compiler )
-	gbm?    ( shared-glapi )
 	gles1?  ( egl )
 	gles2?  ( egl )
 	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
@@ -275,6 +274,7 @@ src_configure() {
 	econf \
 		--enable-dri \
 		--enable-glx \
+		--enable-shared-glapi \
 		$(use_enable !bindist texture-float) \
 		$(use_enable debug) \
 		$(use_enable egl) \
@@ -284,7 +284,6 @@ src_configure() {
 		$(use_enable nptl glx-tls) \
 		$(use_enable osmesa) \
 		$(use_enable !pic asm) \
-		$(use_enable shared-glapi) \
 		$(use_enable xa) \
 		$(use_enable xorg) \
 		--with-dri-drivers=${DRI_DRIVERS} \

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 2c774e6..bb27bfa 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -17,7 +17,6 @@
 	<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
 	<flag name='r600-llvm-compiler'>Build the LLVM based r600 shader compiler.</flag>
-	<flag name='shared-glapi'>Enable sharing of common code for the OpenGL API.</flag>
 	<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
 	<flag name='wayland'>Enable support for dev-libs/wayland</flag>
 	<flag name='xa'>Enable the XA (X Acceleration) API for Gallium3D.</flag>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     025a7ebda925f0bc23b6a29e4ac0af84324f8558
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  2 13:20:15 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Fri Aug  2 13:20:15 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=025a7ebd

media-libs/mesa: raise libdrm and llvm dependencies

---
 media-libs/mesa/mesa-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index dc003fc..61b381b 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -77,7 +77,7 @@ REQUIRED_USE="
 	video_cards_vmware? ( gallium )
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.45"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.46"
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND="
@@ -125,7 +125,7 @@ DEPEND="${RDEPEND}
 		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
 	)
 	opencl? (
-				>=sys-devel/llvm-3.3[video_cards_radeon]
+				>=sys-devel/llvm-3.3-r1[video_cards_radeon]
 				>=sys-devel/clang-3.3
 				>=sys-devel/gcc-4.6
 	)

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[David Heidelberger]

commit:     09030d55e859ef79f49a805f9a0beb8c2dbec667
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Sun Aug  4 16:04:51 2013 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Sun Aug  4 16:04:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=09030d55

media-libs/mesa: -9999 fix radeonsi dep

Package-Manager: portage-2.2.0_alpha192

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 61b381b..4891d83 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -58,7 +58,7 @@ REQUIRED_USE="
 	opencl? ( gallium r600-llvm-compiler )
 	gles1?  ( egl )
 	gles2?  ( egl )
-	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
+	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) )
 	wayland? ( egl )
 	xa?  ( gallium )
 	xorg?  ( gallium )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     ba8209f6e3e003f6d23ca6ca40ab90786594bb91
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 10:38:59 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Aug 25 10:38:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=ba8209f6

media-libs/mesa: import REQUIRED_USE changes from portage.

---
 media-libs/mesa/mesa-9999.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 4891d83..f12d703 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -55,7 +55,12 @@ IUSE="${IUSE_VIDEO_CARDS}
 REQUIRED_USE="
 	llvm?   ( gallium )
 	openvg? ( egl gallium )
-	opencl? ( gallium r600-llvm-compiler )
+	opencl? (
+		gallium
+		video_cards_r600? ( r600-llvm-compiler )
+		video_cards_radeon? ( r600-llvm-compiler )
+		video_cards_radeonsi? ( r600-llvm-compiler )
+	)
 	gles1?  ( egl )
 	gles2?  ( egl )
 	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[David Heidelberger]

commit:     845b61ca37978d3310216fd8e4f90f41ca37dfda
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Tue Aug 27 17:20:45 2013 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Tue Aug 27 17:20:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=845b61ca

media-libs/mesa: Since 8d29b52 wayland 1.2.0 is required.

Package-Manager: portage-2.2.1

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 81a437c..5349fbf 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -105,7 +105,7 @@ RDEPEND="
 				dev-libs/libclc
 			)
 	vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.3[${MULTILIB_USEDEP}] )
+	wayland? ( >=dev-libs/wayland-1.2.0[${MULTILIB_USEDEP}] )
 	xorg? (
 		x11-base/xorg-server:=
 		x11-libs/libdrm[libkms]

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Michał Górny]

commit:     c79dafb7cda256ff81e14e9ebbf1b0bfa85fe70a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 21 21:31:57 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 21 21:31:57 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=c79dafb7

media-libs/mesa: Fix renaming gallium drivers, bug #485614.

Package-Manager: portage-2.2.6

---
 media-libs/mesa/mesa-9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 5349fbf..f953f45 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -337,13 +337,13 @@ multilib_src_install() {
 			keepdir /usr/$(get_libdir)/dri
 			dodir /usr/$(get_libdir)/mesa
 			for x in ${gallium_drivers[@]}; do
-				if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then
+				if [ -f "$(get_libdir)/gallium/${x}" ]; then
 					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
 						|| die "Failed to move ${x}"
 					insinto "/usr/$(get_libdir)/dri/"
-					if [ -f "${S}/$(get_libdir)/${x}" ]; then
+					if [ -f "$(get_libdir)/${x}" ]; then
 						insopts -m0755
-						doins "${S}/$(get_libdir)/${x}"
+						doins "$(get_libdir)/${x}"
 					fi
 				fi
 			done

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Michał Górny]

commit:     e795094d40965db8811a59d97e89bac4eb5a970c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 29 21:03:14 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 29 21:03:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=e795094d

media-libs/mesa: Convert to python-any-r1, using the new python_gen_any_dep function.

Package-Manager: portage-2.2.7

---
 media-libs/mesa/mesa-9999.ebuild | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index f953f45..ee11af7 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -14,7 +14,7 @@ fi
 PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit base autotools multilib multilib-minimal flag-o-matic \
-	python-single-r1 toolchain-funcs ${GIT_ECLASS}
+	python-any-r1 toolchain-funcs ${GIT_ECLASS}
 
 OPENGL_DIR="xorg-x11"
 
@@ -136,8 +136,6 @@ DEPEND="${RDEPEND}
 				>=sys-devel/clang-3.3[${MULTILIB_USEDEP}]
 				>=sys-devel/gcc-4.6
 	)
-	${PYTHON_DEPS}
-	dev-libs/libxml2[python,${PYTHON_USEDEP}]
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
@@ -146,8 +144,13 @@ DEPEND="${RDEPEND}
 	>=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
 	x11-proto/xf86driproto[${MULTILIB_USEDEP}]
 	x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+	$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
 "
 
+python_check_deps() {
+	has_version "dev-libs/libxml2[python,${PYTHON_USEDEP}]"
+}
+
 S="${WORKDIR}/${MY_P}"
 
 # It is slow without texrels, if someone wants slow
@@ -161,7 +164,7 @@ pkg_setup() {
 	# workaround toc-issue wrt #386545
 	use ppc64 && append-flags -mminimal-toc
 
-	python-single-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 src_unpack() {

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Michał Górny]

commit:     efe6145202aedb87cbe328474d7d440ceb2288a7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  9 16:52:50 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct  9 16:52:50 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=efe61452

media-libs/mesa: Always use LLVM shared libs.

Package-Manager: portage-2.2.7

---
 media-libs/mesa/mesa-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ee11af7..1131e26 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -301,6 +301,7 @@ multilib_src_configure() {
 		$(use_enable xorg) \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		--with-llvm-shared-libs \
 		PYTHON2="${PYTHON}" \
 		${myconf}
 }

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Michał Górny]

commit:     67e547a8064d275b599ccdcd3756365edd19feba
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 20:45:07 2013 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 20:45:07 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=67e547a8

media-libs/mesa: Explicitly call einstalldocs in multilib_src_install_all() to accomodate bug #483304.

Package-Manager: portage-2.2.7

---
 media-libs/mesa/mesa-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 1131e26..b188a19 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -385,7 +385,8 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	find "${ED}" -name '*.la' -exec rm -f {} + || die
+	prune_libtool_files --all
+	einstalldocs
 
 	if use !bindist; then
 		dodoc docs/patents.txt

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     b055298f643027b3283ecbf14ea17e0033185228
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Nov  3 03:29:08 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Nov  3 03:29:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b055298f

media-libs/mesa: Move 9.2.2 to tree.

---
 media-libs/mesa/mesa-9.2.2.ebuild | 478 --------------------------------------
 1 file changed, 478 deletions(-)

diff --git a/media-libs/mesa/mesa-9.2.2.ebuild b/media-libs/mesa/mesa-9.2.2.ebuild
deleted file mode 100644
index 2e44083..0000000
--- a/media-libs/mesa/mesa-9.2.2.ebuild
+++ /dev/null
@@ -1,478 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
-	GIT_ECLASS="git-2"
-	EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit base autotools multilib multilib-minimal flag-o-matic \
-	python-any-r1 toolchain-funcs ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV/_/-}"
-MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
-
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
-else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
-		${SRC_PATCHES}"
-fi
-
-# The code is MIT/X11.
-# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
-LICENSE="MIT SGI-B-2.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl
-	openvg osmesa pax_kernel pic r600-llvm-compiler selinux vdpau
-	wayland xvmc xa xorg kernel_FreeBSD"
-
-REQUIRED_USE="
-	llvm?   ( gallium )
-	openvg? ( egl gallium )
-	opencl? (
-		gallium
-		video_cards_r600? ( r600-llvm-compiler )
-		video_cards_radeon? ( r600-llvm-compiler )
-		video_cards_radeonsi? ( r600-llvm-compiler )
-	)
-	gles1?  ( egl )
-	gles2?  ( egl )
-	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) )
-	wayland? ( egl )
-	xa?  ( gallium )
-	xorg?  ( gallium )
-	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( || ( classic gallium ) )
-	video_cards_i915?   ( || ( classic gallium ) )
-	video_cards_i965?   ( classic )
-	video_cards_ilo?    ( gallium )
-	video_cards_nouveau? ( || ( classic gallium ) )
-	video_cards_radeon? ( || ( classic gallium ) )
-	video_cards_r100?   ( classic )
-	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium )
-	video_cards_r600?   ( gallium )
-	video_cards_radeonsi?   ( gallium llvm )
-	video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.46"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
-	!<x11-base/xorg-server-1.7
-	!<=x11-proto/xf86driproto-2.0.3
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
-	classic? ( app-admin/eselect-mesa )
-	gallium? ( app-admin/eselect-mesa )
-	>=app-admin/eselect-opengl-1.2.7
-	dev-libs/expat[${MULTILIB_USEDEP}]
-	gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
-	>=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}]
-	x11-libs/libXdamage[${MULTILIB_USEDEP}]
-	x11-libs/libXext[${MULTILIB_USEDEP}]
-	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.8.1[${MULTILIB_USEDEP}]
-	opencl? (
-				app-admin/eselect-opencl
-				dev-libs/libclc
-			)
-	vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] )
-	wayland? ( >=dev-libs/wayland-1.0.3[${MULTILIB_USEDEP}] )
-	xorg? (
-		x11-base/xorg-server:=
-		x11-libs/libdrm[libkms]
-	)
-	xvmc? ( >=x11-libs/libXvMC-1.0.6[${MULTILIB_USEDEP}] )
-	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-	"
-done
-
-for card in ${RADEON_CARDS}; do
-	RDEPEND="${RDEPEND}
-		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
-	"
-done
-
-DEPEND="${RDEPEND}
-	llvm? (
-		>=sys-devel/llvm-2.9[${MULTILIB_USEDEP}]
-		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
-		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
-	)
-	opencl? (
-				>=sys-devel/llvm-3.3-r1[video_cards_radeon,${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.3[${MULTILIB_USEDEP}]
-				>=sys-devel/gcc-4.6
-	)
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	>=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}]
-	>=x11-proto/glproto-1.4.15-r1[${MULTILIB_USEDEP}]
-	>=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
-	x11-proto/xf86driproto[${MULTILIB_USEDEP}]
-	x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	has_version "dev-libs/libxml2[python,${PYTHON_USEDEP}]"
-}
-
-S="${WORKDIR}/${MY_P}"
-
-# It is slow without texrels, if someone wants slow
-# mesa without texrels +pic use is worth the shot
-QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
-
-# Think about: ggi, fbcon, no-X configs
-
-pkg_setup() {
-	# workaround toc-issue wrt #386545
-	use ppc64 && append-flags -mminimal-toc
-
-	python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-2_src_unpack
-}
-
-src_prepare() {
-	# apply patches
-	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
-	# relax the requirement that r300 must have llvm, bug 380303
-	epatch "${FILESDIR}"/${PN}-9.2-dont-require-llvm-for-r300.patch
-
-	# fix for hardened pax_kernel, bug 240956
-	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
-	# Solaris needs some recent POSIX stuff in our case
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
-	fi
-
-	base_src_prepare
-
-	eautoreconf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local myconf
-
-	if use classic; then
-	# Configurable DRI drivers
-		driver_enable swrast
-
-	# Intel code
-		driver_enable video_cards_i915 i915
-		driver_enable video_cards_i965 i965
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			driver_enable video_cards_intel i915 i965
-		fi
-
-		# Nouveau code
-		driver_enable video_cards_nouveau nouveau
-
-		# ATI code
-		driver_enable video_cards_r100 radeon
-		driver_enable video_cards_r200 r200
-		if ! use video_cards_r100 && \
-				! use video_cards_r200; then
-			driver_enable video_cards_radeon radeon r200
-		fi
-	fi
-
-	if use egl; then
-		myconf+="
-			--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")
-			$(use_enable gallium gallium-egl)
-		"
-	fi
-
-	if use gallium; then
-		myconf+="
-			$(use_enable llvm gallium-llvm)
-			$(use_enable openvg)
-			$(use_enable r600-llvm-compiler)
-			$(use_enable vdpau)
-			$(use_enable xvmc)
-		"
-		gallium_enable swrast
-		gallium_enable video_cards_vmware svga
-		gallium_enable video_cards_nouveau nouveau
-		gallium_enable video_cards_i915 i915
-		gallium_enable video_cards_ilo ilo
-		if ! use video_cards_i915 && \
-			! use video_cards_i965; then
-			gallium_enable video_cards_intel i915
-		fi
-
-		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
-		fi
-
-		gallium_enable video_cards_freedreno freedreno
-		# opencl stuff
-		if use opencl; then
-			myconf+="
-				$(use_enable opencl)
-				--with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
-				--with-clang-libdir="${EPREFIX}/usr/lib"
-				"
-		fi
-	fi
-
-	# x86 hardened pax_kernel needs glx-rts, bug 240956
-	if use pax_kernel; then
-		myconf+="
-			$(use_enable x86 glx-rts)
-		"
-	fi
-
-	# build fails with BSD indent, bug #428112
-	use userland_GNU || export INDENT=cat
-
-	if ! multilib_is_native_abi; then
-		myconf+="--disable-xorg
-			LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}"
-	fi
-
-	econf \
-		--enable-dri \
-		--enable-glx \
-		--enable-shared-glapi \
-		$(use_enable !bindist texture-float) \
-		$(use_enable debug) \
-		$(use_enable egl) \
-		$(use_enable gbm) \
-		$(use_enable gles1) \
-		$(use_enable gles2) \
-		$(use_enable nptl glx-tls) \
-		$(use_enable osmesa) \
-		$(use_enable !pic asm) \
-		$(use_enable xa) \
-		$(use_enable xorg) \
-		--with-dri-drivers=${DRI_DRIVERS} \
-		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		--with-llvm-shared-libs \
-		PYTHON2="${PYTHON}" \
-		${myconf}
-}
-
-multilib_src_install() {
-	emake install DESTDIR="${D}"
-
-	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
-	# because user can eselect desired GL provider.
-	ebegin "Moving libGL and friends for dynamic switching"
-		local x
-		local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
-		dodir ${gl_dir}/{lib,extensions,include/GL}
-		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/lib \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include/GL \
-					|| die "Failed to move ${x}"
-			fi
-		done
-		for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
-			if [ -d ${x} ]; then
-				mv -f "${x}" "${ED}${gl_dir}"/include \
-					|| die "Failed to move ${x}"
-			fi
-		done
-	eend $?
-
-	if use classic || use gallium; then
-			ebegin "Moving DRI/Gallium drivers for dynamic switching"
-			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
-			keepdir /usr/$(get_libdir)/dri
-			dodir /usr/$(get_libdir)/mesa
-			for x in ${gallium_drivers[@]}; do
-				if [ -f "$(get_libdir)/gallium/${x}" ]; then
-					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
-						|| die "Failed to move ${x}"
-					insinto "/usr/$(get_libdir)/dri/"
-					if [ -f "$(get_libdir)/${x}" ]; then
-						insopts -m0755
-						doins "$(get_libdir)/${x}"
-					fi
-				fi
-			done
-			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
-				if [ -f ${x} -o -L ${x} ]; then
-					mv -f "${x}" "${x/dri/mesa}" \
-						|| die "Failed to move ${x}"
-				fi
-			done
-			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
-			ln -s ../mesa/*.so . || die "Creating symlink failed"
-			# remove symlinks to drivers known to eselect
-			for x in ${gallium_drivers[@]}; do
-				if [ -f ${x} -o -L ${x} ]; then
-					rm "${x}" || die "Failed to remove ${x}"
-				fi
-			done
-			popd
-		eend $?
-	fi
-	if use opencl; then
-		ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
-		local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
-		dodir ${cl_dir}/{lib,include}
-		if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
-			mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
-			"${ED}"${cl_dir}
-		fi
-		if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
-			mv -f "${ED}"/usr/include/CL \
-			"${ED}"${cl_dir}/include
-		fi
-		eend $?
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files --all
-	einstalldocs
-
-	if use !bindist; then
-		dodoc docs/patents.txt
-	fi
-
-	# Install config file for eselect mesa
-	insinto /usr/share/mesa
-	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-pkg_postinst() {
-	# Switch to the xorg implementation.
-	echo
-	eselect opengl set --use-old ${OPENGL_DIR}
-
-	# switch to xorg-x11 and back if necessary, bug #374647 comment 11
-	OLD_IMPLEM="$(eselect opengl show)"
-	if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
-		eselect opengl set ${OPENGL_DIR}
-		eselect opengl set ${OLD_IMPLEM}
-	fi
-
-	# Select classic/gallium drivers
-	if use classic || use gallium; then
-		eselect mesa set --auto
-	fi
-
-	# Switch to mesa opencl
-	if use opencl; then
-		eselect opencl set --use-old ${PN}
-	fi
-
-	# warn about patent encumbered texture-float
-	if use !bindist; then
-		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
-		elog "enabled. Please see patents.txt for an explanation."
-	fi
-
-	local using_radeon r_flag
-	for r_flag in ${RADEON_CARDS}; do
-		if use video_cards_${r_flag}; then
-			using_radeon=1
-			break
-		fi
-	done
-
-	if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
-		elog "Note that in order to have full S3TC support, it is necessary to install"
-		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
-		elog "textures in some apps, and some others even require this to run."
-	fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			DRI_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					DRI_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}
-
-gallium_enable() {
-	case $# in
-		# for enabling unconditionally
-		1)
-			GALLIUM_DRIVERS+=",$1"
-			;;
-		*)
-			if use $1; then
-				shift
-				for i in $@; do
-					GALLIUM_DRIVERS+=",${i}"
-				done
-			fi
-			;;
-	esac
-}

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     9ef8eb41c721e98ff12fc98e04d5f4d6bda5bdf2
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Nov  7 01:33:53 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Nov  7 01:38:28 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=9ef8eb41

media-libs/mesa: Drop "xorg" USE flag.

The xorg state tracker is going away upstream.

---
 media-libs/mesa/mesa-9999.ebuild | 12 +++---------
 media-libs/mesa/metadata.xml     |  1 -
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index b188a19..f8fc19f 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -51,7 +51,7 @@ done
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl
 	openvg osmesa pax_kernel pic r600-llvm-compiler selinux vdpau
-	wayland xvmc xa xorg kernel_FreeBSD"
+	wayland xvmc xa kernel_FreeBSD"
 
 REQUIRED_USE="
 	llvm?   ( gallium )
@@ -67,7 +67,6 @@ REQUIRED_USE="
 	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) )
 	wayland? ( egl )
 	xa?  ( gallium )
-	xorg?  ( gallium )
 	video_cards_freedreno?  ( gallium )
 	video_cards_intel?  ( || ( classic gallium ) )
 	video_cards_i915?   ( || ( classic gallium ) )
@@ -106,10 +105,6 @@ RDEPEND="
 			)
 	vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] )
 	wayland? ( >=dev-libs/wayland-1.2.0[${MULTILIB_USEDEP}] )
-	xorg? (
-		x11-base/xorg-server:=
-		x11-libs/libdrm[libkms]
-	)
 	xvmc? ( >=x11-libs/libXvMC-1.0.6[${MULTILIB_USEDEP}] )
 	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
 "
@@ -280,8 +275,7 @@ multilib_src_configure() {
 	use userland_GNU || export INDENT=cat
 
 	if ! multilib_is_native_abi; then
-		myconf+="--disable-xorg
-			LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}"
+		myconf+="LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}"
 	fi
 
 	econf \
@@ -298,7 +292,7 @@ multilib_src_configure() {
 		$(use_enable osmesa) \
 		$(use_enable !pic asm) \
 		$(use_enable xa) \
-		$(use_enable xorg) \
+		--disable-xorg \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
 		--with-llvm-shared-libs \

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 1bc2962..33ad0fe 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -20,7 +20,6 @@
 	<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
 	<flag name='wayland'>Enable support for dev-libs/wayland</flag>
 	<flag name='xa'>Enable the XA (X Acceleration) API for Gallium3D.</flag>
-	<flag name='xorg'>Enable the Xorg state tracker for Gallium3D. This is not required for OpenGL acceleration in X.</flag>
 	<flag name='xvmc'>Enable the XvMC acceleration interface for the Gallium3D Video Layer.</flag>
 </use>
 </pkgmetadata>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[David Heidelberger]

commit:     268578252b535346ecfbcb2e65fae84acae8dedb
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Fri Nov  8 20:40:38 2013 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Fri Nov  8 20:40:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=26857825

media-libs/mesa: -9999 add DRI3, fix build

Package-Manager: portage-2.2.7

---
 media-libs/mesa/mesa-9999.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index f8fc19f..b337511 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -95,10 +95,11 @@ RDEPEND="
 	dev-libs/expat[${MULTILIB_USEDEP}]
 	gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
 	>=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.0[${MULTILIB_USEDEP}]
 	x11-libs/libXdamage[${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.8.1[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.9.0[${MULTILIB_USEDEP}]
 	opencl? (
 				app-admin/eselect-opencl
 				dev-libs/libclc
@@ -135,6 +136,8 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/pkgconfig
 	>=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}]
+	>=x11-proto/dri3proto-1.0[${MULTILIB_USEDEP}]
+	>=x11-proto/presentproto-1.0[${MULTILIB_USEDEP}]
 	>=x11-proto/glproto-1.4.15-r1[${MULTILIB_USEDEP}]
 	>=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
 	x11-proto/xf86driproto[${MULTILIB_USEDEP}]

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[David Heidelberger]

commit:     7df63c406594b45a089c413d05b2b79565cb3d8d
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Fri Nov  8 23:42:59 2013 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Fri Nov  8 23:42:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=7df63c40

media-libs/mesa: avoid broken gallium-egl as much is possible

---
 media-libs/mesa/mesa-9999.ebuild | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index b337511..b57c52d 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -224,16 +224,14 @@ multilib_src_configure() {
 	fi
 
 	if use egl; then
-		myconf+="
-			--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")
-			$(use_enable gallium gallium-egl)
-		"
+		myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
 	fi
 
 	if use gallium; then
 		myconf+="
 			$(use_enable llvm gallium-llvm)
 			$(use_enable openvg)
+			$(use_enable openvg gallium-egl)
 			$(use_enable r600-llvm-compiler)
 			$(use_enable vdpau)
 			$(use_enable xvmc)

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     23e7d0eedeedda740e094e7a89a3360d40779552
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Nov  9 06:28:38 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 06:28:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=23e7d0ee

media-libs/mesa: Require >=libxcb-1.9.2.

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index b57c52d..abbe8d1 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -99,7 +99,7 @@ RDEPEND="
 	x11-libs/libXdamage[${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
-	>=x11-libs/libxcb-1.9.0[${MULTILIB_USEDEP}]
+	>=x11-libs/libxcb-1.9.2[${MULTILIB_USEDEP}]
 	opencl? (
 				app-admin/eselect-opencl
 				dev-libs/libclc

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     3751a2d30e18c773d896b9e88dd80badc3dff569
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Nov  9 06:54:34 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 06:54:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3751a2d3

media-libs/mesa: the xorg state tracker is no more.

---
 media-libs/mesa/mesa-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 5e4a0be..28b40a8 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -293,7 +293,6 @@ multilib_src_configure() {
 		$(use_enable osmesa) \
 		$(use_enable !pic asm) \
 		$(use_enable xa) \
-		--disable-xorg \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
 		--with-llvm-shared-libs \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     c4fe923528f076ec0847c903bf1ede6c6479bf7b
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Nov  9 06:55:02 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 06:55:02 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=c4fe9235

media-libs/mesa: the xa state tracker is gallium-only.

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 28b40a8..85c4155 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -234,6 +234,7 @@ multilib_src_configure() {
 			$(use_enable openvg gallium-egl)
 			$(use_enable r600-llvm-compiler)
 			$(use_enable vdpau)
+			$(use_enable xa)
 			$(use_enable xvmc)
 		"
 		gallium_enable swrast
@@ -292,7 +293,6 @@ multilib_src_configure() {
 		$(use_enable nptl glx-tls) \
 		$(use_enable osmesa) \
 		$(use_enable !pic asm) \
-		$(use_enable xa) \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
 		--with-llvm-shared-libs \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     e5aaf0f335184b0613ed9c433d3db490468fc89d
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Nov  9 06:54:05 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 06:54:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=e5aaf0f3

media-libs/mesa: Fix breakage after 7df63c40659.

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index abbe8d1..5e4a0be 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -224,7 +224,7 @@ multilib_src_configure() {
 	fi
 
 	if use egl; then
-		myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")"
+		myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
 	fi
 
 	if use gallium; then

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     f22fe8aa5f427eb8d04bf49ce6001211c2f8d963
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Nov 21 03:22:29 2013 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Nov 21 03:22:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=f22fe8aa

media-libs/mesa: Enable tests.

---
 media-libs/mesa/mesa-9999.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 85c4155..dc18ff1 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -391,6 +391,10 @@ multilib_src_install_all() {
 	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
 }
 
+multilib_src_test() {
+	emake check
+}
+
 pkg_postinst() {
 	# Switch to the xorg implementation.
 	echo

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     4fb9b0b2c5ff6d1acd219019c22165feb9ee73c9
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 28 17:14:23 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Thu Nov 28 17:14:23 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4fb9b0b2

media-libs/mesa: make llvm-shared-libs optional

This allows users to work around incomplete RPATH in i915g until a proper fix is implemented.
Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=488216

---
 media-libs/mesa/mesa-9999.ebuild | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index dc18ff1..e00c65b 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -49,15 +49,16 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl
-	openvg osmesa pax_kernel pic r600-llvm-compiler selinux vdpau
-	wayland xvmc xa kernel_FreeBSD"
+	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl
+	llvm-shared-libs opencl openvg osmesa pax_kernel pic r600-llvm-compiler
+	selinux vdpau wayland xvmc xa kernel_FreeBSD"
 
 REQUIRED_USE="
 	llvm?   ( gallium )
 	openvg? ( egl gallium )
 	opencl? (
 		gallium
+		llvm-shared-libs
 		video_cards_r600? ( r600-llvm-compiler )
 		video_cards_radeon? ( r600-llvm-compiler )
 		video_cards_radeonsi? ( r600-llvm-compiler )
@@ -293,9 +294,9 @@ multilib_src_configure() {
 		$(use_enable nptl glx-tls) \
 		$(use_enable osmesa) \
 		$(use_enable !pic asm) \
+		$(use_with llvm-shared-libs) \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
-		--with-llvm-shared-libs \
 		PYTHON2="${PYTHON}" \
 		${myconf}
 }

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     28b4f30795dc991076e6372a2e73106e2d147ddf
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  4 11:48:27 2013 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Wed Dec  4 11:48:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=28b4f307

media-libs/mesa: drop llvm-shared-libs requirement for opencl.

---
 media-libs/mesa/mesa-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index e00c65b..29ce7fd 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -58,7 +58,6 @@ REQUIRED_USE="
 	openvg? ( egl gallium )
 	opencl? (
 		gallium
-		llvm-shared-libs
 		video_cards_r600? ( r600-llvm-compiler )
 		video_cards_radeon? ( r600-llvm-compiler )
 		video_cards_radeonsi? ( r600-llvm-compiler )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     7e3b36c015ac277a38cf53178553404ac1a0e805
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Jan  9 22:15:17 2014 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jan  9 22:15:17 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=7e3b36c0

media-libs/mesa: Add gbm to REQUIRED_USE for wayland.

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index c48adc1..78535b2 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -65,7 +65,7 @@ REQUIRED_USE="
 	gles1?  ( egl )
 	gles2?  ( egl )
 	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) )
-	wayland? ( egl )
+	wayland? ( egl gbm )
 	xa?  ( gallium )
 	video_cards_freedreno?  ( gallium )
 	video_cards_intel?  ( || ( classic gallium ) )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     0f9479d7cbeb09770ce9286aed123f094124fb99
Author:     James Le Cuirot <chewi <AT> aura-online <DOT> co <DOT> uk>
AuthorDate: Sun Jan 26 02:11:45 2014 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 26 02:11:45 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=0f9479d7

media-libs/mesa: Check for libxml2 dependency using --host-root.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=499234

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 78535b2..e05e132 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -146,7 +146,7 @@ DEPEND="${RDEPEND}
 "
 
 python_check_deps() {
-	has_version "dev-libs/libxml2[python,${PYTHON_USEDEP}]"
+	has_version --host-root "dev-libs/libxml2[python,${PYTHON_USEDEP}]"
 }
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     f166e0e421f46574cd6131cf1a89a63f9f3d150c
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 20 12:18:31 2014 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Thu Feb 20 12:18:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=f166e0e4

media-libs/mesa: add PYTHON_REQUIRED_USE for bug 472054 and openmax USE flag.

---
 media-libs/mesa/mesa-9999.ebuild | 10 +++++++---
 media-libs/mesa/metadata.xml     |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index e05e132..81a8ee2 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -50,8 +50,8 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl
-	llvm-shared-libs opencl openvg osmesa pax_kernel pic r600-llvm-compiler
-	selinux vdpau wayland xvmc xa kernel_FreeBSD"
+	llvm-shared-libs opencl openvg osmesa pax_kernel openmax pic
+	r600-llvm-compiler selinux vdpau wayland xvmc xa kernel_FreeBSD"
 
 REQUIRED_USE="
 	llvm?   ( gallium )
@@ -62,6 +62,7 @@ REQUIRED_USE="
 		video_cards_radeon? ( r600-llvm-compiler )
 		video_cards_radeonsi? ( r600-llvm-compiler )
 	)
+	openmax? ( gallium )
 	gles1?  ( egl )
 	gles2?  ( egl )
 	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) )
@@ -80,9 +81,10 @@ REQUIRED_USE="
 	video_cards_r600?   ( gallium )
 	video_cards_radeonsi?   ( gallium llvm )
 	video_cards_vmware? ( gallium )
+	${PYTHON_REQUIRED_USE}
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.46"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.52"
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND="
@@ -104,6 +106,7 @@ RDEPEND="
 				app-admin/eselect-opencl
 				dev-libs/libclc
 			)
+	openmax? ( media-libs/libomxil-bellagio[${MULTILIB_USEDEP}] )
 	vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] )
 	wayland? ( >=dev-libs/wayland-1.2.0[${MULTILIB_USEDEP}] )
 	xvmc? ( >=x11-libs/libXvMC-1.0.6[${MULTILIB_USEDEP}] )
@@ -232,6 +235,7 @@ multilib_src_configure() {
 			$(use_enable llvm gallium-llvm)
 			$(use_enable openvg)
 			$(use_enable openvg gallium-egl)
+			$(use_enable openmax omx)
 			$(use_enable r600-llvm-compiler)
 			$(use_enable vdpau)
 			$(use_enable xa)

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 33ad0fe..73570a9 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -12,6 +12,7 @@
 	<flag name='gles2'>Enable GLESv2 support.</flag>
 	<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
 	<flag name='opencl'>Enable the Clover Gallium OpenCL state tracker.</flag>
+	<flag name='openmax'>Enable OpenMAX video decode/encode acceleration for Gallium3D.</flag>
 	<flag name='openvg'>Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
 	<flag name='osmesa'>Build the Mesa library for off-screen rendering.</flag>
 	<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     04fc682adbe05991fc96da1d4d6fddd839f79ecc
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 20 12:33:37 2014 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Thu Feb 20 12:33:37 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=04fc682a

media-libs/mesa: fix llvm-shared-libs usage and enable by default

---
 media-libs/mesa/mesa-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 81a8ee2..d9a16aa 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -50,7 +50,7 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl
-	llvm-shared-libs opencl openvg osmesa pax_kernel openmax pic
+	+llvm-shared-libs opencl openvg osmesa pax_kernel openmax pic
 	r600-llvm-compiler selinux vdpau wayland xvmc xa kernel_FreeBSD"
 
 REQUIRED_USE="
@@ -297,7 +297,7 @@ multilib_src_configure() {
 		$(use_enable nptl glx-tls) \
 		$(use_enable osmesa) \
 		$(use_enable !pic asm) \
-		$(use_with llvm-shared-libs) \
+		$(use_enable llvm-shared-libs) \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
 		PYTHON2="${PYTHON}" \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     58e51131e24bdfc609b2f680708dd24e74cdd868
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 19:55:24 2014 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Mon Feb 24 19:55:24 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=58e51131

media-libs/mesa: sync dependencies and llvm debug warning message with portage

Bugzilla:
https://bugs.gentoo.org/show_bug.cgi?id=459306
https://bugs.gentoo.org/show_bug.cgi?id=490092
https://bugs.gentoo.org/show_bug.cgi?id=498812

---
 media-libs/mesa/mesa-9999.ebuild | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index d9a16aa..194374d 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -102,6 +102,23 @@ RDEPEND="
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
 	>=x11-libs/libxcb-1.9.2[${MULTILIB_USEDEP}]
+	llvm ? (
+		video_cards_radeonsi? ( || (
+			dev-libs/elfutils[${MULTILIB_USEDEP}]
+			dev-libs/libelf[${MULTILIB_USEDEP}]
+			) )
+		video_cards_r600? ( || (
+			dev-libs/elfutils[${MULTILIB_USEDEP}]
+			dev-libs/libelf[${MULTILIB_USEDEP}]
+			) )
+		!video_cards_r600? (
+			video_cards_radeon? ( || (
+				dev-libs/elfutils[${MULTILIB_USEDEP}]
+				dev-libs/libelf[${MULTILIB_USEDEP}]
+				) )
+		)
+		llvm-shared-libs? ( >=sys-devel/llvm-2.9[${MULTILIB_USEDEP}] )
+	)
 	opencl? (
 				app-admin/eselect-opencl
 				dev-libs/libclc
@@ -165,6 +182,12 @@ pkg_setup() {
 	# workaround toc-issue wrt #386545
 	use ppc64 && append-flags -mminimal-toc
 
+	# warning message for bug 459306
+	if use llvm && has_version sys-devel/llvm[!debug=]; then
+		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+		ewarn "detected! This can cause problems. For details, see bug 459306."
+	fi
+
 	python-any-r1_pkg_setup
 }
 

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     86ab3c60e8b585120614d4b4a89e91aee96e9234
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 20:27:36 2014 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Mon Feb 24 20:27:36 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=86ab3c60

media-libs/mesa: remove extra space from RDEPEND

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 194374d..5ade449 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -102,7 +102,7 @@ RDEPEND="
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
 	>=x11-libs/libxcb-1.9.2[${MULTILIB_USEDEP}]
-	llvm ? (
+	llvm? (
 		video_cards_radeonsi? ( || (
 			dev-libs/elfutils[${MULTILIB_USEDEP}]
 			dev-libs/libelf[${MULTILIB_USEDEP}]

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     9a3c51b8908b5b2beb48226360f5b257398c283b
Author:     Rafał Mużyło <galtgendo <AT> o2 <DOT> pl>
AuthorDate: Wed Feb 26 00:06:40 2014 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 00:06:40 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=9a3c51b8

media-libs/mesa: Fix installing drivers with insecure runpaths.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=428460

---
 media-libs/mesa/mesa-9999.ebuild | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 5ade449..895117d 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -365,13 +365,11 @@ multilib_src_install() {
 				if [ -f "$(get_libdir)/gallium/${x}" ]; then
 					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
 						|| die "Failed to move ${x}"
-					insinto "/usr/$(get_libdir)/dri/"
-					if [ -f "$(get_libdir)/${x}" ]; then
-						insopts -m0755
-						doins "$(get_libdir)/${x}"
-					fi
 				fi
 			done
+			if use classic; then
+				emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
+			fi
 			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
 				if [ -f ${x} -o -L ${x} ]; then
 					mv -f "${x}" "${x/dri/mesa}" \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     e99c33fd9fe41e2e3c9b34cd224b630924803ef9
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Mar  9 18:38:49 2014 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar  9 18:38:49 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=e99c33fd

media-libs/mesa: Update libxshmfence dependency to 1.1, bug #503932.

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 8c9f066..03f7a43 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -97,7 +97,7 @@ RDEPEND="
 	dev-libs/expat[${MULTILIB_USEDEP}]
 	gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
 	>=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}]
-	>=x11-libs/libxshmfence-1.0[${MULTILIB_USEDEP}]
+	>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
 	x11-libs/libXdamage[${MULTILIB_USEDEP}]
 	x11-libs/libXext[${MULTILIB_USEDEP}]
 	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     8bacae5526950f160bd95f0b54a7979d89af2343
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Mar 13 23:24:33 2014 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 23:24:33 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=8bacae55

media-libs/mesa: Add DRI3 USE flag, bug #504356.

---
 media-libs/mesa/mesa-9999.ebuild | 10 +++++++---
 media-libs/mesa/metadata.xml     |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 03f7a43..a5f8fc0 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -49,7 +49,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl
+	bindist +classic debug dri3 +egl +gallium gbm gles1 gles2 +llvm +nptl
 	+llvm-shared-libs opencl openvg osmesa pax_kernel openmax pic
 	r600-llvm-compiler selinux vdpau wayland xvmc xa kernel_FreeBSD"
 
@@ -96,6 +96,7 @@ RDEPEND="
 	>=app-admin/eselect-opengl-1.2.7
 	dev-libs/expat[${MULTILIB_USEDEP}]
 	gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
+	dri3? ( virtual/udev[${MULTILIB_USEDEP}] )
 	>=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}]
 	>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
 	x11-libs/libXdamage[${MULTILIB_USEDEP}]
@@ -156,8 +157,10 @@ DEPEND="${RDEPEND}
 	sys-devel/flex
 	virtual/pkgconfig
 	>=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}]
-	>=x11-proto/dri3proto-1.0[${MULTILIB_USEDEP}]
-	>=x11-proto/presentproto-1.0[${MULTILIB_USEDEP}]
+	dri3? (
+		>=x11-proto/dri3proto-1.0[${MULTILIB_USEDEP}]
+		>=x11-proto/presentproto-1.0[${MULTILIB_USEDEP}]
+	)
 	>=x11-proto/glproto-1.4.15-r1[${MULTILIB_USEDEP}]
 	>=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
 	x11-proto/xf86driproto[${MULTILIB_USEDEP}]
@@ -314,6 +317,7 @@ multilib_src_configure() {
 		--enable-shared-glapi \
 		$(use_enable !bindist texture-float) \
 		$(use_enable debug) \
+		$(use_enable dri3) \
 		$(use_enable egl) \
 		$(use_enable gbm) \
 		$(use_enable gles1) \

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 73570a9..0a42e68 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -6,6 +6,7 @@
 	<flag name='bindist'>Disable patent-encumbered ARB_texture_float, EXT_texture_shared_exponent, and EXT_packed_float extensions.</flag>
 	<flag name='classic'>Build drivers based on the classic architecture.</flag>
 	<flag name='egl'>Enable EGL support.</flag>
+	<flag name='dri3'>Enable DRI3 support.</flag>
 	<flag name='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
 	<flag name='gbm'>Enable the Graphics Buffer Manager for EGL on KMS.</flag>
 	<flag name='gles1'>Enable GLESv1 support.</flag>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     d25cf62e7b0306afba5a9020f4c14c0c7bde2951
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Mar 27 18:49:48 2014 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Mar 27 18:49:48 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d25cf62e

media-libs/mesa: Drop libxml2 dependency.

Replaced upstream in 2de70fe23 with python's built-in ElementTree.

---
 media-libs/mesa/mesa-9999.ebuild | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index a5f8fc0..d9f27a3 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -165,13 +165,8 @@ DEPEND="${RDEPEND}
 	>=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
 	x11-proto/xf86driproto[${MULTILIB_USEDEP}]
 	x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
-	$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
 "
 
-python_check_deps() {
-	has_version --host-root "dev-libs/libxml2[python,${PYTHON_USEDEP}]"
-}
-
 S="${WORKDIR}/${MY_P}"
 EGIT_CHECKOUT_DIR=${S}
 

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Michał Górny]

commit:     f22a1a83ef83e70582340e16dfc2c484c08280da
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 10 17:17:31 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 10 17:17:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=f22a1a83

media-libs/mesa: Require llvm-3.3-r3 (for new llvm-config path + bug #506180). Always use shared libs to avoid the issues related to static linking (e.g. bug #481316).

Package-Manager: portage-2.2.10

---
 media-libs/mesa/mesa-9999.ebuild | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index d9f27a3..0095919 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -50,8 +50,8 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic debug dri3 +egl +gallium gbm gles1 gles2 +llvm +nptl
-	+llvm-shared-libs opencl openvg osmesa pax_kernel openmax pic
-	r600-llvm-compiler selinux vdpau wayland xvmc xa kernel_FreeBSD"
+	opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux
+	vdpau wayland xvmc xa kernel_FreeBSD"
 
 REQUIRED_USE="
 	llvm?   ( gallium )
@@ -118,7 +118,7 @@ RDEPEND="
 				dev-libs/libelf[${MULTILIB_USEDEP}]
 				) )
 		)
-		llvm-shared-libs? ( >=sys-devel/llvm-2.9[${MULTILIB_USEDEP}] )
+		>=sys-devel/llvm-3.3-r3[${MULTILIB_USEDEP}]
 	)
 	opencl? (
 				app-admin/eselect-opencl
@@ -144,12 +144,11 @@ done
 
 DEPEND="${RDEPEND}
 	llvm? (
-		>=sys-devel/llvm-2.9[${MULTILIB_USEDEP}]
 		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
 		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
 	)
 	opencl? (
-				>=sys-devel/llvm-3.3-r1[video_cards_radeon,${MULTILIB_USEDEP}]
+				>=sys-devel/llvm-3.3-r3[video_cards_radeon,${MULTILIB_USEDEP}]
 				>=sys-devel/clang-3.3[${MULTILIB_USEDEP}]
 				>=sys-devel/gcc-4.6
 	)
@@ -302,10 +301,6 @@ multilib_src_configure() {
 	# build fails with BSD indent, bug #428112
 	use userland_GNU || export INDENT=cat
 
-	if ! multilib_is_native_abi; then
-		myconf+="LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}"
-	fi
-
 	econf \
 		--enable-dri \
 		--enable-glx \
@@ -320,7 +315,7 @@ multilib_src_configure() {
 		$(use_enable nptl glx-tls) \
 		$(use_enable osmesa) \
 		$(use_enable !pic asm) \
-		$(use_enable llvm-shared-libs) \
+		--enable-llvm-shared-libs \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
 		PYTHON2="${PYTHON}" \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     42c00333273e2062730f153528db701f69521977
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 13 19:02:15 2014 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Sun Apr 13 19:02:15 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=42c00333

media-libs/mesa-9999: raise libdrm dependency

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 0095919..b69778f 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -84,7 +84,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.52"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.53"
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND="

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Michał Górny]

commit:     f863272741009daa32847b1e47abadd3e1bd353d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 29 17:31:04 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Apr 29 17:31:04 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=f8632727

media-libs/mesa: Re-add Python dependency that was mistakenly removed along with libxml2.

Package-Manager: portage-2.2.10

---
 media-libs/mesa/mesa-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index b69778f..79f3c4e 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -143,6 +143,7 @@ for card in ${RADEON_CARDS}; do
 done
 
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
 	llvm? (
 		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
 		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Nikoli]

commit:     4a6f2dd063e438eaa9f3c2594ba9d5893f4b6980
Author:     Nikoli <nikoli <AT> gmx <DOT> us>
AuthorDate: Sat May 10 09:07:07 2014 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Sat May 10 09:07:07 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4a6f2dd0

media-libs/mesa: fix runnings tests in hardened

Package-Manager: portage-2.2.8-r1

---
 media-libs/mesa/mesa-9999.ebuild | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 79f3c4e..835d0f8 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -14,7 +14,7 @@ fi
 PYTHON_COMPAT=( python{2_6,2_7} )
 
 inherit base autotools multilib multilib-minimal flag-o-matic \
-	python-any-r1 toolchain-funcs ${GIT_ECLASS}
+	python-any-r1 toolchain-funcs pax-utils ${GIT_ECLASS}
 
 OPENGL_DIR="xorg-x11"
 
@@ -413,6 +413,13 @@ multilib_src_install_all() {
 }
 
 multilib_src_test() {
+	if use llvm; then
+		local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
+		pushd src/gallium/drivers/llvmpipe >/dev/null || die
+		emake ${llvm_tests}
+		pax-mark m ${llvm_tests}
+		popd >/dev/null || die
+	fi
 	emake check
 }
 

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Nikoli]

commit:     985c1612d39f789ae9c6c5b76947189fd8a03777
Author:     Nikoli <nikoli <AT> gmx <DOT> us>
AuthorDate: Sat May 10 09:09:49 2014 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Sat May 10 09:09:49 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=985c1612

media-libs/mesa: add missing dep

Package-Manager: portage-2.2.8-r1

---
 media-libs/mesa/mesa-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 835d0f8..a767726 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -165,6 +165,7 @@ DEPEND="${RDEPEND}
 	>=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
 	x11-proto/xf86driproto[${MULTILIB_USEDEP}]
 	x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+	sys-devel/gettext
 "
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     29791aed2dedabef85f90f69254365535c0ee503
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Wed May 14 16:04:29 2014 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Wed May 14 16:04:29 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=29791aed

media-libs/mesa: raise libdrm dependency, group gettext dependency with other sys-devel/ packages

---
 media-libs/mesa/mesa-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index a767726..2ebdb37 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -84,7 +84,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.53"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.54"
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND="
@@ -155,6 +155,7 @@ DEPEND="${RDEPEND}
 	)
 	sys-devel/bison
 	sys-devel/flex
+	sys-devel/gettext
 	virtual/pkgconfig
 	>=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}]
 	dri3? (
@@ -165,7 +166,6 @@ DEPEND="${RDEPEND}
 	>=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
 	x11-proto/xf86driproto[${MULTILIB_USEDEP}]
 	x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
-	sys-devel/gettext
 "
 
 S="${WORKDIR}/${MY_P}"

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     6eb2c35a78f5dee16bb28199dfdb4c978fa2ce64
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Tue May 27 14:51:26 2014 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Tue May 27 14:51:26 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=6eb2c35a

media-libs/mesa: perform registration of OpenMAX drivers

---
 media-libs/mesa/mesa-9999.ebuild | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 2ebdb37..195c212 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -398,6 +398,12 @@ multilib_src_install() {
 		fi
 		eend $?
 	fi
+
+	if use openmax; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
+		doenvd "${T}"/99mesaxdgomx
+		keepdir /usr/share/mesa/xdg
+	fi
 }
 
 multilib_src_install_all() {
@@ -446,6 +452,15 @@ pkg_postinst() {
 		eselect opencl set --use-old ${PN}
 	fi
 
+	# run omxregister-bellagio to make the OpenMAX drivers known system-wide
+	if use openmax; then
+		ebegin "Registering OpenMAX drivers"
+		BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+			OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+			omxregister-bellagio
+		eend $?
+	fi
+
 	# warn about patent encumbered texture-float
 	if use !bindist; then
 		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
@@ -467,6 +482,12 @@ pkg_postinst() {
 	fi
 }
 
+pkg_prerm() {
+	if use openmax; then
+		rm ${EPREFIX}/usr/share/mesa/xdg/.omxregister
+	fi
+}
+
 # $1 - VIDEO_CARDS flag
 # other args - names of DRI drivers to enable
 # TODO: avoid code duplication for a more elegant implementation

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     1acc553e0c96b2adc2465d6c1693ee4e1d6eccb8
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Tue May 27 15:08:54 2014 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Tue May 27 15:08:54 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=1acc553e

media-libs/mesa: Fix quoting to silence repoman.

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 195c212..8630de8 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -484,7 +484,7 @@ pkg_postinst() {
 
 pkg_prerm() {
 	if use openmax; then
-		rm ${EPREFIX}/usr/share/mesa/xdg/.omxregister
+		rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
 	fi
 }
 

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     115ae24399ccc564529db5b4936eb1520386298e
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Tue May 27 15:09:20 2014 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Tue May 27 15:09:20 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=115ae243

media-libs/mesa: Drop llvm radeon backend requirement for opencl.

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 8630de8..965bb55 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -149,7 +149,7 @@ DEPEND="${RDEPEND}
 		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
 	)
 	opencl? (
-				>=sys-devel/llvm-3.3-r3[video_cards_radeon,${MULTILIB_USEDEP}]
+				>=sys-devel/llvm-3.3-r3[${MULTILIB_USEDEP}]
 				>=sys-devel/clang-3.3[${MULTILIB_USEDEP}]
 				>=sys-devel/gcc-4.6
 	)

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Nikoli]

commit:     10c2c5f6080cdb4a8932add26c668e3859f4f135
Author:     Nikoli <nikoli <AT> gmx <DOT> us>
AuthorDate: Sat Jun 14 06:25:12 2014 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Sat Jun 14 06:25:12 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=10c2c5f6

media-libs/mesa: do not disable asm for amd64

bug #512208, thanks to Magnus Granberg for the patch

Package-Manager: portage-2.2.8-r1

---
 media-libs/mesa/mesa-9999.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 965bb55..70aa961 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -300,6 +300,11 @@ multilib_src_configure() {
 		"
 	fi
 
+	# on abi_x86_32 hardened we need to have asm disable  
+	if [[ ${ABI} == x86* ]] && use pic; then
+		myconf+=" --disable-asm"
+	fi
+
 	# build fails with BSD indent, bug #428112
 	use userland_GNU || export INDENT=cat
 
@@ -316,7 +321,6 @@ multilib_src_configure() {
 		$(use_enable gles2) \
 		$(use_enable nptl glx-tls) \
 		$(use_enable osmesa) \
-		$(use_enable !pic asm) \
 		--enable-llvm-shared-libs \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Nikoli]

commit:     59d46d2a5035bbf15276f913ef88896781f9be84
Author:     Nikoli <nikoli <AT> gmx <DOT> us>
AuthorDate: Sat Jun 14 06:26:30 2014 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Sat Jun 14 06:26:30 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=59d46d2a

media-libs/mesa: enable dri3 by default

Package-Manager: portage-2.2.8-r1

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 70aa961..3d1ed05 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -49,7 +49,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug dri3 +egl +gallium gbm gles1 gles2 +llvm +nptl
+	bindist +classic debug +dri3 +egl +gallium gbm gles1 gles2 +llvm +nptl
 	opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux
 	vdpau wayland xvmc xa kernel_FreeBSD"
 

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Michał Górny]

commit:     c7615e09741a6539552c2edc52e01bedd65b0df7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  3 08:06:22 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug  3 08:06:22 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=c7615e09

media-libs/mesa: Switch to virtual/libudev.

Package-Manager: portage-2.2.10

---
 media-libs/mesa/mesa-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 3d1ed05..885b938 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -95,8 +95,8 @@ RDEPEND="
 	gallium? ( app-admin/eselect-mesa )
 	>=app-admin/eselect-opengl-1.2.7
 	dev-libs/expat[${MULTILIB_USEDEP}]
-	gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
-	dri3? ( virtual/udev[${MULTILIB_USEDEP}] )
+	gbm? ( virtual/libudev[${MULTILIB_USEDEP}] )
+	dri3? ( virtual/libudev[${MULTILIB_USEDEP}] )
 	>=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}]
 	>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
 	x11-libs/libXdamage[${MULTILIB_USEDEP}]

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     5f17ed867325149856cdf18df8ed0ee4b1511be2
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Mon Aug 11 03:58:55 2014 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 03:58:55 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=5f17ed86

media-libs/mesa: Bump libdrm dependency to 2.4.56.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=519384

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 09c3192..3eeaf19 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -84,7 +84,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.54"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.56"
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND="

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Nikoli]

commit:     a6cbdcee9c4bbb52d0ad726804b2c1775e8feb50
Author:     Nikoli <nikoli <AT> gmx <DOT> us>
AuthorDate: Sun Aug 17 17:24:49 2014 +0000
Commit:     Nikoli <nikoli <AT> lavabit <DOT> com>
CommitDate: Sun Aug 17 17:24:49 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=a6cbdcee

media-libs/mesa: rebuild is required when llvm is updated

https://bugs.gentoo.org/510774 by Alexander Tsoy <alexander <AT> tsoy.me>

Package-Manager: portage-2.2.8-r1

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 3eeaf19..9ce1752 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -118,7 +118,7 @@ RDEPEND="
 				>=dev-libs/libelf-0.8.13-r2[${MULTILIB_USEDEP}]
 				) )
 		)
-		>=sys-devel/llvm-3.3-r3[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
 	)
 	opencl? (
 				app-admin/eselect-opencl

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Michał Górny]

commit:     c7615e09741a6539552c2edc52e01bedd65b0df7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  3 08:06:22 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug  3 08:06:22 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=c7615e09

media-libs/mesa: Switch to virtual/libudev.

Package-Manager: portage-2.2.10

---
 media-libs/mesa/mesa-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 3d1ed05..885b938 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -95,8 +95,8 @@ RDEPEND="
 	gallium? ( app-admin/eselect-mesa )
 	>=app-admin/eselect-opengl-1.2.7
 	dev-libs/expat[${MULTILIB_USEDEP}]
-	gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
-	dri3? ( virtual/udev[${MULTILIB_USEDEP}] )
+	gbm? ( virtual/libudev[${MULTILIB_USEDEP}] )
+	dri3? ( virtual/libudev[${MULTILIB_USEDEP}] )
 	>=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}]
 	>=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}]
 	x11-libs/libXdamage[${MULTILIB_USEDEP}]

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     5f17ed867325149856cdf18df8ed0ee4b1511be2
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Mon Aug 11 03:58:55 2014 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Aug 11 03:58:55 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=5f17ed86

media-libs/mesa: Bump libdrm dependency to 2.4.56.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=519384

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 09c3192..3eeaf19 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -84,7 +84,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.54"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.56"
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND="

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Michał Górny]

commit:     a6cbdcee9c4bbb52d0ad726804b2c1775e8feb50
Author:     Nikoli <nikoli <AT> gmx <DOT> us>
AuthorDate: Sun Aug 17 17:24:49 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 17 17:24:49 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=a6cbdcee

media-libs/mesa: rebuild is required when llvm is updated

https://bugs.gentoo.org/510774 by Alexander Tsoy <alexander <AT> tsoy.me>

Package-Manager: portage-2.2.8-r1

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 3eeaf19..9ce1752 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -118,7 +118,7 @@ RDEPEND="
 				>=dev-libs/libelf-0.8.13-r2[${MULTILIB_USEDEP}]
 				) )
 		)
-		>=sys-devel/llvm-3.3-r3[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
 	)
 	opencl? (
 				app-admin/eselect-opencl

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chi-Thanh Christopher Nguyen]

commit:     b6088041c6e1e42e14aa00c3f7325729b57549ce
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 16 17:30:48 2014 +0000
Commit:     Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de>
CommitDate: Tue Sep 16 17:30:48 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=b6088041

media-libs/mesa: sync IUSE defaults with portage.

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 3ffe004..83f9a27 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -49,7 +49,7 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +dri3 +egl +gallium gbm gles1 gles2 +llvm +nptl
+	bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl
 	opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux
 	vdpau wayland xvmc xa kernel_FreeBSD"
 

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[David Heidelberger]

commit:     8c336a81a7dfd556a2130aeee1f076dcd7a203bf
Author:     David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Wed Oct  1 23:53:43 2014 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Wed Oct  1 23:54:23 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=8c336a81

media-libs/mesa: drop r300 llvm patch, not building anymore

if you're interested, please rebase patch and readd these lines

Signed-off-by: David Heidelberger <david.heidelberger <AT> ixit.cz>

---
 media-libs/mesa/mesa-9999.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 83f9a27..5ce4546 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -205,9 +205,6 @@ src_prepare() {
 		epatch
 	fi
 
-	# relax the requirement that r300 must have llvm, bug 380303
-	epatch "${FILESDIR}"/${P}-dont-require-llvm-for-r300.patch
-
 	# fix for hardened pax_kernel, bug 240956
 	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
 

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[David Heidelberger]

commit:     92adf010eea88ffde8cc8fb7544578dc5405e47b
Author:     Mike Lothian <mike <AT> fireburn <DOT> co <DOT> uk>
AuthorDate: Wed Oct  1 23:59:35 2014 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Thu Oct  2 00:00:52 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=92adf010

media-libs/mesa: add VA-API support and fix VDPAU dep on gallium

Signed-off-by: David Heidelberger <david.heidelberger <AT> ixit.cz>

---
 media-libs/mesa/mesa-9999.ebuild | 6 +++++-
 media-libs/mesa/metadata.xml     | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 5ce4546..f56daac 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -51,7 +51,7 @@ done
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl
 	opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux
-	vdpau wayland xvmc xa kernel_FreeBSD"
+	vaapi vdpau wayland xvmc xa kernel_FreeBSD"
 
 REQUIRED_USE="
 	llvm?   ( gallium )
@@ -66,6 +66,8 @@ REQUIRED_USE="
 	gles1?  ( egl )
 	gles2?  ( egl )
 	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) )
+	vaapi? ( gallium )
+	vdpau? ( gallium )
 	wayland? ( egl gbm )
 	xa?  ( gallium )
 	video_cards_freedreno?  ( gallium )
@@ -125,6 +127,7 @@ RDEPEND="
 				dev-libs/libclc
 			)
 	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
 	vdpau? ( >=x11-libs/libvdpau-0.7:=[${MULTILIB_USEDEP}] )
 	wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
 	xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
@@ -257,6 +260,7 @@ multilib_src_configure() {
 			$(use_enable openvg gallium-egl)
 			$(use_enable openmax omx)
 			$(use_enable r600-llvm-compiler)
+			$(use_enable vaapi va)
 			$(use_enable vdpau)
 			$(use_enable xa)
 			$(use_enable xvmc)

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 0a42e68..c8634ec 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -19,6 +19,7 @@
 	<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
 	<flag name='r600-llvm-compiler'>Build the LLVM based r600 shader compiler.</flag>
+	<flag name='vaapi'>Enable the VAAPI acceleration interface for the Gallium3D Video Layer.</flag>
 	<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
 	<flag name='wayland'>Enable support for dev-libs/wayland</flag>
 	<flag name='xa'>Enable the XA (X Acceleration) API for Gallium3D.</flag>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[David Heidelberger]

commit:     56b56e170d4b19773ab07ff0d4c79ea48f355530
Author:     David Heidelberg <david <AT> ixit <DOT> cz>
AuthorDate: Sat Nov 15 17:24:51 2014 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Sat Nov 15 17:24:51 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=56b56e17

media-libs/mesa: remove gallium-egl from ebuild

Removed by commit c46c551c56f78c6bf9e63524c89478695fc4f525

Fixes QA warning.

Signed-off-by: David Heidelberg <david <AT> ixit.cz>

---
 media-libs/mesa/mesa-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index f56daac..ddc957c 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -257,7 +257,6 @@ multilib_src_configure() {
 		myconf+="
 			$(use_enable llvm gallium-llvm)
 			$(use_enable openvg)
-			$(use_enable openvg gallium-egl)
 			$(use_enable openmax omx)
 			$(use_enable r600-llvm-compiler)
 			$(use_enable vaapi va)

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[David Heidelberger]

commit:     112a49ddd3db092446c8243ea7f43c8669d735b6
Author:     David Heidelberg <david <AT> ixit <DOT> cz>
AuthorDate: Tue Nov 18 12:21:16 2014 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Tue Nov 18 12:21:16 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=112a49dd

media-libs/mesa: allow building Direct 3D9 API

For more informations check https://wiki.ixit.cz/d3d9 .

Signed-off-by: David Heidelberg <david <AT> ixit.cz>

---
 media-libs/mesa/mesa-9999.ebuild | 7 +++++--
 media-libs/mesa/metadata.xml     | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ddc957c..e9f0800 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -49,11 +49,12 @@ for card in ${VIDEO_CARDS}; do
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
-	bindist +classic debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm +nptl
-	opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux
+	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
+	+nptl opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux
 	vaapi vdpau wayland xvmc xa kernel_FreeBSD"
 
 REQUIRED_USE="
+	d3d9? ( gallium dri3 )
 	llvm?   ( gallium )
 	openvg? ( egl gallium )
 	opencl? (
@@ -255,6 +256,7 @@ multilib_src_configure() {
 
 	if use gallium; then
 		myconf+="
+			$(use_enable d3d9 nine)
 			$(use_enable llvm gallium-llvm)
 			$(use_enable openvg)
 			$(use_enable openmax omx)
@@ -313,6 +315,7 @@ multilib_src_configure() {
 		--enable-glx \
 		--enable-shared-glapi \
 		$(use_enable !bindist texture-float) \
+		$(use_enable d3d9 nine) \
 		$(use_enable debug) \
 		$(use_enable dri3) \
 		$(use_enable egl) \

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index c8634ec..69cb2f1 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -6,6 +6,7 @@
 	<flag name='bindist'>Disable patent-encumbered ARB_texture_float, EXT_texture_shared_exponent, and EXT_packed_float extensions.</flag>
 	<flag name='classic'>Build drivers based on the classic architecture.</flag>
 	<flag name='egl'>Enable EGL support.</flag>
+	<flag name='d3d9'>Enable Direct 3D9 API through Nine state tracker. Can be used together with patched wine.</flag>
 	<flag name='dri3'>Enable DRI3 support.</flag>
 	<flag name='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
 	<flag name='gbm'>Enable the Graphics Buffer Manager for EGL on KMS.</flag>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[David Heidelberger]

commit:     99dc82f53e80b660f4d8afdb506b3b970e45a72d
Author:     David Heidelberg <david <AT> ixit <DOT> cz>
AuthorDate: Fri Nov 21 13:55:24 2014 +0000
Commit:     David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Fri Nov 21 13:55:24 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=99dc82f5

media-libs/mesa: drop openvg support

configure: error: Cannot enable OpenVG, because egl_gallium has been removed and
                  OpenVG hasn't been integrated into standard libEGL yet

Signed-off-by: David Heidelberg <david <AT> ixit.cz>

---
 media-libs/mesa/mesa-9999.ebuild | 4 +---
 media-libs/mesa/metadata.xml     | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index e9f0800..4120974 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -50,13 +50,12 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
-	+nptl opencl openvg osmesa pax_kernel openmax pic r600-llvm-compiler selinux
+	+nptl opencl osmesa pax_kernel openmax pic r600-llvm-compiler selinux
 	vaapi vdpau wayland xvmc xa kernel_FreeBSD"
 
 REQUIRED_USE="
 	d3d9? ( gallium dri3 )
 	llvm?   ( gallium )
-	openvg? ( egl gallium )
 	opencl? (
 		gallium
 		video_cards_r600? ( r600-llvm-compiler )
@@ -258,7 +257,6 @@ multilib_src_configure() {
 		myconf+="
 			$(use_enable d3d9 nine)
 			$(use_enable llvm gallium-llvm)
-			$(use_enable openvg)
 			$(use_enable openmax omx)
 			$(use_enable r600-llvm-compiler)
 			$(use_enable vaapi va)

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 69cb2f1..625b06b 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -15,7 +15,6 @@
 	<flag name='llvm'>Enable LLVM backend for Gallium3D.</flag>
 	<flag name='opencl'>Enable the Clover Gallium OpenCL state tracker.</flag>
 	<flag name='openmax'>Enable OpenMAX video decode/encode acceleration for Gallium3D.</flag>
-	<flag name='openvg'>Enable the OpenVG 2D acceleration API for Gallium3D.</flag>
 	<flag name='osmesa'>Build the Mesa library for off-screen rendering.</flag>
 	<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     8600f437b69d409827666d21a246b10e3e944796
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Mon Jan 12 18:34:18 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Jan 12 18:34:18 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=8600f437

media-libs/mesa: Sync with main tree.

---
 media-libs/mesa/mesa-9999.ebuild | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index dffd922..3d88dd8 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -51,13 +51,14 @@ done
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
 	+nptl opencl osmesa pax_kernel openmax pic r600-llvm-compiler selinux
-	vaapi vdpau wayland xvmc xa kernel_FreeBSD"
+	+udev vaapi vdpau wayland xvmc xa kernel_FreeBSD"
 
 REQUIRED_USE="
 	d3d9? ( gallium dri3 )
 	llvm?   ( gallium )
 	opencl? (
 		gallium
+		llvm
 		video_cards_r600? ( r600-llvm-compiler )
 		video_cards_radeon? ( r600-llvm-compiler )
 		video_cards_radeonsi? ( r600-llvm-compiler )
@@ -96,6 +97,7 @@ RDEPEND="
 	classic? ( app-admin/eselect-mesa )
 	gallium? ( app-admin/eselect-mesa )
 	>=app-admin/eselect-opengl-1.3.0
+	udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
 	>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
 	gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
 	dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
@@ -120,7 +122,7 @@ RDEPEND="
 				>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
 				) )
 		)
-		>=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
+		>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
 	)
 	opencl? (
 				app-admin/eselect-opencl
@@ -152,8 +154,8 @@ DEPEND="${RDEPEND}
 		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
 	)
 	opencl? (
-				>=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
-				>=sys-devel/clang-3.3:=[${MULTILIB_USEDEP}]
+				>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
+				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
 				>=sys-devel/gcc-4.6
 	)
 	sys-devel/bison
@@ -322,6 +324,7 @@ multilib_src_configure() {
 		$(use_enable gles2) \
 		$(use_enable nptl glx-tls) \
 		$(use_enable osmesa) \
+		$(use_enable !udev sysfs) \
 		--enable-llvm-shared-libs \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     d1cc1d06f404f9fef6844a61843d5004ca4d9e47
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Jan 13 22:37:46 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jan 13 22:37:46 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d1cc1d06

media-libs/mesa: Drop usage of --with-opencl-libdir.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=536458

---
 media-libs/mesa/mesa-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 3d88dd8..2938ef6 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -289,7 +289,6 @@ multilib_src_configure() {
 		if use opencl; then
 			myconf+="
 				$(use_enable opencl)
-				--with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
 				--with-clang-libdir="${EPREFIX}/usr/lib"
 				"
 		fi

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     d9655833cfe566b7a3cd53841942e86ac3a80048
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Jan 13 22:40:45 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jan 13 22:40:45 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d9655833

media-libs/mesa: Require libelf for USE=opencl.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=536456

---
 media-libs/mesa/mesa-9999.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 2938ef6..fa55174 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -127,6 +127,10 @@ RDEPEND="
 	opencl? (
 				app-admin/eselect-opencl
 				dev-libs/libclc
+				|| (
+					>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
+					>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
+				)
 			)
 	openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
 	vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     526f7f7592485e75d56d604b22934df1c48367ad
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Jan 13 22:44:44 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Jan 13 22:44:44 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=526f7f75

media-libs/mesa: Add DEPEND on >=dev-python/mako-0.7.3.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=536486

---
 media-libs/mesa/mesa-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index fa55174..8dfaa3e 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -164,6 +164,7 @@ DEPEND="${RDEPEND}
 	)
 	sys-devel/bison
 	sys-devel/flex
+	>=dev-python/mako-0.7.3
 	sys-devel/gettext
 	virtual/pkgconfig
 	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     899630c4acc2264e1a24d089a2ed37fd65d12c73
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Feb  3 21:48:42 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Feb  3 21:48:42 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=899630c4

media-libs/mesa: Add video_cards_r300? ( llvm ) to REQUIRED_USE.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=538086

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 2656e3e..3005cbf 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -80,7 +80,7 @@ REQUIRED_USE="
 	video_cards_radeon? ( || ( classic gallium ) )
 	video_cards_r100?   ( classic )
 	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium )
+	video_cards_r300?   ( gallium llvm )
 	video_cards_r600?   ( gallium )
 	video_cards_radeonsi?   ( gallium llvm )
 	video_cards_vmware? ( gallium )

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Chí-Thanh Christopher Nguyễn]

commit:     74a19077a22147ae336134ddd5c7c026d3154938
Author:     Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  8 19:14:37 2015 +0000
Commit:     Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
CommitDate: Sun Feb  8 19:14:37 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=74a19077

media-libs/mesa: squash some inconsequential differences between overlay and g-x86

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 media-libs/mesa/metadata.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 2656e3e..46aac69 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -54,7 +54,7 @@ IUSE="${IUSE_VIDEO_CARDS}
 	+udev vaapi vdpau wayland xvmc xa kernel_FreeBSD"
 
 REQUIRED_USE="
-	d3d9? ( gallium dri3 )
+	d3d9?   ( dri3 gallium )
 	llvm?   ( gallium )
 	opencl? (
 		gallium

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 625b06b..e127975 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -5,9 +5,9 @@
 <use>
 	<flag name='bindist'>Disable patent-encumbered ARB_texture_float, EXT_texture_shared_exponent, and EXT_packed_float extensions.</flag>
 	<flag name='classic'>Build drivers based on the classic architecture.</flag>
-	<flag name='egl'>Enable EGL support.</flag>
 	<flag name='d3d9'>Enable Direct 3D9 API through Nine state tracker. Can be used together with patched wine.</flag>
 	<flag name='dri3'>Enable DRI3 support.</flag>
+	<flag name='egl'>Enable EGL support.</flag>
 	<flag name='gallium'>Build drivers based on Gallium3D, the new architecture for 3D graphics drivers.</flag>
 	<flag name='gbm'>Enable the Graphics Buffer Manager for EGL on KMS.</flag>
 	<flag name='gles1'>Enable GLESv1 support.</flag>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     77edff05035b8ba783a86772ed0b8e8742050840
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Mon Feb  9 03:06:15 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Feb  9 03:06:15 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=77edff05

media-libs/mesa: Explicitly disable shader-cache.

It doesn't actually do anything yet.

---
 media-libs/mesa/mesa-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 46aac69..c2a3007 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -318,6 +318,7 @@ multilib_src_configure() {
 		--enable-dri \
 		--enable-glx \
 		--enable-shared-glapi \
+		--disable-shader-cache \
 		$(use_enable !bindist texture-float) \
 		$(use_enable d3d9 nine) \
 		$(use_enable debug) \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     39a856b98d242d88136bf3b784188d73db3ad5b5
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Feb 17 22:18:45 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 17 22:18:45 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=39a856b9

media-libs/mesa: Remove unnecessary copy_sources.

---
 media-libs/mesa/mesa-9999.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 32d1b48..9596cb8 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -221,7 +221,6 @@ src_prepare() {
 	base_src_prepare
 
 	eautoreconf
-	multilib_copy_sources
 }
 
 multilib_src_configure() {
@@ -309,7 +308,7 @@ multilib_src_configure() {
 	# build fails with BSD indent, bug #428112
 	use userland_GNU || export INDENT=cat
 
-	econf \
+	ECONF_SOURCE="${S}" econf \
 		--enable-dri \
 		--enable-glx \
 		--enable-shared-glapi \

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     3d8574a4ba9bb74a92308d2b831d2a92926be53f
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Tue Feb 17 22:13:02 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 17 22:13:02 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3d8574a4

media-libs/mesa: Remove Solaris hack.

Doesn't seem to be needed.

---
 media-libs/mesa/mesa-9999.ebuild | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index c2a3007..32d1b48 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -218,11 +218,6 @@ src_prepare() {
 	# fix for hardened pax_kernel, bug 240956
 	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
 
-	# Solaris needs some recent POSIX stuff in our case
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
-	fi
-
 	base_src_prepare
 
 	eautoreconf

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     df37a577ac602be5c5d8b5783b3d8d66b9b2b91e
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Feb 21 07:31:17 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 21 07:37:56 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=df37a577

media-libs/mesa: Update for 10.5.

---
 media-libs/mesa/mesa-9999.ebuild | 61 +++++++++-------------------------------
 1 file changed, 13 insertions(+), 48 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 9596cb8..e9bea9d 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -13,31 +13,23 @@ fi
 
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit base autotools multilib multilib-minimal flag-o-matic \
-	python-any-r1 toolchain-funcs pax-utils ${GIT_ECLASS}
+inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
 
 OPENGL_DIR="xorg-x11"
 
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV/_/-}"
-MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
-
+MY_P="${P/_/-}"
 FOLDER="${PV/_rc*/}"
 
 DESCRIPTION="OpenGL-like graphic library for Linux"
 HOMEPAGE="http://mesa3d.sourceforge.net/"
 
-#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
-if [[ $PV = 9999* ]]; then
-	SRC_URI="${SRC_PATCHES}"
+if [[ $PV == 9999* ]]; then
+	SRC_URI=""
 else
-	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
-		${SRC_PATCHES}"
+	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
 fi
 
-# The code is MIT/X11.
-# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
-LICENSE="MIT SGI-B-2.0"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
@@ -72,7 +64,7 @@ REQUIRED_USE="
 	wayland? ( egl gbm )
 	xa?  ( gallium )
 	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( || ( classic gallium ) )
+	video_cards_intel?  ( || ( classic ) )
 	video_cards_i915?   ( || ( classic gallium ) )
 	video_cards_i965?   ( classic )
 	video_cards_ilo?    ( gallium )
@@ -87,7 +79,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.56"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.57"
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND="
@@ -186,12 +178,7 @@ EGIT_CHECKOUT_DIR=${S}
 QA_EXECSTACK="usr/lib*/libGL.so*"
 QA_WX_LOAD="usr/lib*/libGL.so*"
 
-# Think about: ggi, fbcon, no-X configs
-
 pkg_setup() {
-	# workaround toc-issue wrt #386545
-	use ppc64 && append-flags -mminimal-toc
-
 	# warning message for bug 459306
 	if use llvm && has_version sys-devel/llvm[!debug=]; then
 		ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
@@ -201,25 +188,10 @@ pkg_setup() {
 	python-any-r1_pkg_setup
 }
 
-src_unpack() {
-	default
-	[[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
 src_prepare() {
-	# apply patches
-	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
-		EPATCH_FORCE="yes" \
-		EPATCH_SOURCE="${WORKDIR}/patches" \
-		EPATCH_SUFFIX="patch" \
-		epatch
-	fi
-
 	# fix for hardened pax_kernel, bug 240956
 	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
 
-	base_src_prepare
-
 	eautoreconf
 }
 
@@ -227,10 +199,10 @@ multilib_src_configure() {
 	local myconf
 
 	if use classic; then
-	# Configurable DRI drivers
+		# Configurable DRI drivers
 		driver_enable swrast
 
-	# Intel code
+		# Intel code
 		driver_enable video_cards_i915 i915
 		driver_enable video_cards_i965 i965
 		if ! use video_cards_i915 && \
@@ -308,7 +280,8 @@ multilib_src_configure() {
 	# build fails with BSD indent, bug #428112
 	use userland_GNU || export INDENT=cat
 
-	ECONF_SOURCE="${S}" econf \
+	ECONF_SOURCE="${S}" \
+	econf \
 		--enable-dri \
 		--enable-glx \
 		--enable-shared-glapi \
@@ -441,15 +414,7 @@ pkg_postinst() {
 		elog "enabled. Please see patents.txt for an explanation."
 	fi
 
-	local using_radeon r_flag
-	for r_flag in ${RADEON_CARDS}; do
-		if use video_cards_${r_flag}; then
-			using_radeon=1
-			break
-		fi
-	done
-
-	if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
+	if ! has_version media-libs/libtxc_dxtn; then
 		elog "Note that in order to have full S3TC support, it is necessary to install"
 		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
 		elog "textures in some apps, and some others even require this to run."

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     847d2e8178a035718b0391af3c40500bfccb0767
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Feb 22 18:34:07 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Feb 22 18:34:07 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=847d2e81

media-libs/mesa: Add missing PYTHON_USEDEP to mako dependency.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=540968

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 1e59d81..5b960db 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -156,7 +156,7 @@ DEPEND="${RDEPEND}
 	)
 	sys-devel/bison
 	sys-devel/flex
-	>=dev-python/mako-0.7.3[${PYTHON_USEDEP}]
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
 	sys-devel/gettext
 	virtual/pkgconfig
 	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     1179da283260a39de306e5b7ee98f3d1d6e8c179
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Feb 22 06:45:32 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Feb 22 06:45:32 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=1179da28

media-libs/mesa: Fix mako[${PYTHON_USEDEP}] dependency.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=540968

---
 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index e9bea9d..1e59d81 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -156,7 +156,7 @@ DEPEND="${RDEPEND}
 	)
 	sys-devel/bison
 	sys-devel/flex
-	>=dev-python/mako-0.7.3
+	>=dev-python/mako-0.7.3[${PYTHON_USEDEP}]
 	sys-devel/gettext
 	virtual/pkgconfig
 	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     3c7d03cf0f534fe7c828114172b2efc626163b81
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Feb 28 22:21:17 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 28 22:21:51 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=3c7d03cf

media-libs/mesa: Add bindist restriction.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=541494

---
 media-libs/mesa/mesa-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 5b960db..2001177 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -32,6 +32,7 @@ fi
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+RESTRICT="!bindist? ( bindist )"
 
 INTEL_CARDS="i915 i965 ilo intel"
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     4305e9d51bb7c848f127e2d7d5f3bdb585a13877
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Mar  1 19:23:48 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar  1 19:23:48 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4305e9d5

media-libs/llvm: Drop r600-llvm-compiler USE flag.

The flag enabled the R600 LLVM compiler backend for graphics shaders
(the LLVM backend is used for OpenCL regardless), but it's disabled by
default at build-time and even after you enable it you have to enable it
at runtime as well. See

http://cgit.freedesktop.org/mesa/mesa/commit/?id=7286739b9beea4683a29fe91850688a07ce23e1a

for details.

---
 media-libs/mesa/mesa-9999.ebuild | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 2001177..1add486 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -43,29 +43,22 @@ done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
-	+nptl opencl osmesa pax_kernel openmax pic r600-llvm-compiler selinux
-	+udev vaapi vdpau wayland xvmc xa kernel_FreeBSD"
+	+nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
+	wayland xvmc xa kernel_FreeBSD"
 
 REQUIRED_USE="
 	d3d9?   ( dri3 gallium )
 	llvm?   ( gallium )
-	opencl? (
-		gallium
-		llvm
-		video_cards_r600? ( r600-llvm-compiler )
-		video_cards_radeon? ( r600-llvm-compiler )
-		video_cards_radeonsi? ( r600-llvm-compiler )
-	)
+	opencl? ( gallium llvm )
 	openmax? ( gallium )
 	gles1?  ( egl )
 	gles2?  ( egl )
-	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) )
 	vaapi? ( gallium )
 	vdpau? ( gallium )
 	wayland? ( egl gbm )
 	xa?  ( gallium )
 	video_cards_freedreno?  ( gallium )
-	video_cards_intel?  ( || ( classic ) )
+	video_cards_intel?  ( classic )
 	video_cards_i915?   ( || ( classic gallium ) )
 	video_cards_i965?   ( classic )
 	video_cards_ilo?    ( gallium )
@@ -147,7 +140,6 @@ done
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	llvm? (
-		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
 		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
 	)
 	opencl? (
@@ -232,7 +224,6 @@ multilib_src_configure() {
 			$(use_enable d3d9 nine)
 			$(use_enable llvm gallium-llvm)
 			$(use_enable openmax omx)
-			$(use_enable r600-llvm-compiler)
 			$(use_enable vaapi va)
 			$(use_enable vdpau)
 			$(use_enable xa)

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     d1921d17d1567713d350edf42998c5d92395b67c
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sun Mar  1 20:24:56 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar  1 20:24:56 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d1921d17

media-libs/mesa: Drop r600-llvm-compiler description from metadata.xml.

---
 media-libs/mesa/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index e127975..ec5c3b6 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -18,7 +18,6 @@
 	<flag name='osmesa'>Build the Mesa library for off-screen rendering.</flag>
 	<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
 	<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
-	<flag name='r600-llvm-compiler'>Build the LLVM based r600 shader compiler.</flag>
 	<flag name='vaapi'>Enable the VAAPI acceleration interface for the Gallium3D Video Layer.</flag>
 	<flag name='vdpau'>Enable the VDPAU acceleration interface for the Gallium3D Video Layer.</flag>
 	<flag name='wayland'>Enable support for dev-libs/wayland</flag>

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     11f0202d9ca79352223a56aa08a44df0533393a6
Author:     Nikoli <nikoli <AT> gmx <DOT> us>
AuthorDate: Sat Mar 28 19:33:04 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 19:33:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/x11.git/commit/?id=11f0202d

media-libs/mesa: Don't depend on libelf for r600.

It's only needed for the LLVM backend (opencl or radeonsi).

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=542808

 media-libs/mesa/mesa-9999.ebuild | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 1add486..ffec51d 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -98,10 +98,6 @@ RDEPEND="
 			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
 			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
 			) )
-		video_cards_r600? ( || (
-			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-			>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
-			) )
 		!video_cards_r600? (
 			video_cards_radeon? ( || (
 				>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     0a46fb739637ec6f43d8c21bcca506d69c92848e
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 28 19:41:38 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 19:41:38 2015 +0000
URL:        https://gitweb.gentoo.org/proj/x11.git/commit/?id=0a46fb73

media-libs/mesa: Don't depend on codegen tools if PV != 9999.

 media-libs/mesa/mesa-9999.ebuild | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 1b23826..82d9bc9 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -135,7 +135,6 @@ for card in ${RADEON_CARDS}; do
 done
 
 DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
 	llvm? (
 		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
 	)
@@ -144,9 +143,6 @@ DEPEND="${RDEPEND}
 				>=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
 				>=sys-devel/gcc-4.6
 	)
-	sys-devel/bison
-	sys-devel/flex
-	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
 	sys-devel/gettext
 	virtual/pkgconfig
 	>=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
@@ -159,6 +155,12 @@ DEPEND="${RDEPEND}
 	>=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
 	>=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
 "
+[[ ${PV} == "9999" ]] && DEPEND+="
+	sys-devel/bison
+	sys-devel/flex
+	${PYTHON_DEPS}
+	$(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
 
 S="${WORKDIR}/${MY_P}"
 EGIT_CHECKOUT_DIR=${S}

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     7c4685110a8b18a8f52bcfacf7a9057051a7d751
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 28 19:44:04 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 19:44:04 2015 +0000
URL:        https://gitweb.gentoo.org/proj/x11.git/commit/?id=7c468511

media-libs/mesa: Add ~arm64 keyword from main tree.

 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 82d9bc9..6d6b5e9 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -31,7 +31,7 @@ fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 RESTRICT="!bindist? ( bindist )"
 
 INTEL_CARDS="i915 i965 ilo intel"

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     fd404d0d17cff9f1428ba1e7dd556276168c67ad
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 28 19:36:35 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 19:36:35 2015 +0000
URL:        https://gitweb.gentoo.org/proj/x11.git/commit/?id=fd404d0d

media-libs/mesa: Depend on libXfixes.

Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=542812

 media-libs/mesa/mesa-9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ffec51d..1b23826 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -93,6 +93,7 @@ RDEPEND="
 	>=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
 	>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
 	llvm? (
 		video_cards_radeonsi? ( || (
 			>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     3c37f4a3c389387524f494e398ff73098dbf35ca
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Sat Mar 28 19:44:23 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 19:44:23 2015 +0000
URL:        https://gitweb.gentoo.org/proj/x11.git/commit/?id=3c37f4a3

media-libs/mesa: Raise libdrm requirement to 2.4.60.

 media-libs/mesa/mesa-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 6d6b5e9..c15dbd1 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -73,7 +73,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 "
 
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.57"
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.60"
 # keep correct libdrm and dri2proto dep
 # keep blocks in rdepend for binpkg
 RDEPEND="

[gentoo-commits] proj/x11:master commit in: media-libs/mesa/

[Matt Turner]

commit:     a8ba559451c48a8bd5cca0ec3e30f5659fa9fa95
Author:     Matt Turner <mattst88 <AT> gmail <DOT> com>
AuthorDate: Thu Jul  2 00:55:10 2015 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Jul  2 00:55:10 2015 +0000
URL:        https://gitweb.gentoo.org/proj/x11.git/commit/?id=a8ba5594

media-libs/mesa: Sync from main tree.

The r300 hunk is fixing a mistake made in commit 97a8d669.

 media-libs/mesa/mesa-9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index bc3aa0c..6f349fd 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999* ]]; then
 	EXPERIMENTAL="true"
 fi
 
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
 
 inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
 
@@ -66,7 +66,7 @@ REQUIRED_USE="
 	video_cards_radeon? ( || ( classic gallium ) )
 	video_cards_r100?   ( classic )
 	video_cards_r200?   ( classic )
-	video_cards_r300?   ( gallium )
+	video_cards_r300?   ( gallium llvm )
 	video_cards_r600?   ( gallium )
 	video_cards_radeonsi?   ( gallium llvm )
 	video_cards_vmware? ( gallium )
@@ -263,7 +263,7 @@ multilib_src_configure() {
 		"
 	fi
 
-	# on abi_x86_32 hardened we need to have asm disable  
+	# on abi_x86_32 hardened we need to have asm disable
 	if [[ ${ABI} == x86* ]] && use pic; then
 		myconf+=" --disable-asm"
 	fi