Remove non-existant openmax (available in next Mesa release) and correct llvm-shared-libs flag, bug #503888.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 974CA72A)

3 files changed, 9 insertions, 8 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 26fb2ef34da9..31d3476a9a9a 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.541 2014/03/08 02:52:46 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.542 2014/03/08 19:29:01 mattst88 Exp $
+
+  08 Mar 2014; Matt Turner <mattst88@gentoo.org> mesa-10.1.0.ebuild,
+  metadata.xml:
+  Remove non-existant openmax (available in next Mesa release) and correct llvm-
+  shared-libs flag, bug #503888.
 
   08 Mar 2014; Matt Turner <mattst88@gentoo.org> -mesa-9.2.5.ebuild,
   -mesa-10.0.2-r1.ebuild, -files/mesa-10.0.2-update-glxext.h.patch:
diff --git a/media-libs/mesa/mesa-10.1.0.ebuild b/media-libs/mesa/mesa-10.1.0.ebuild
index 9420477f034b..992202cac913 100644
--- a/media-libs/mesa/mesa-10.1.0.ebuild
+++ b/media-libs/mesa/mesa-10.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.1.0.ebuild,v 1.1 2014/03/08 02:47:48 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-10.1.0.ebuild,v 1.2 2014/03/08 19:29:01 mattst88 Exp $
 
 EAPI=5
 
@@ -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 pic
 	r600-llvm-compiler selinux vdpau wayland xvmc xa kernel_FreeBSD"
 
 REQUIRED_USE="
@@ -62,7 +62,6 @@ 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 ) )
@@ -123,7 +122,6 @@ 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}] )
@@ -259,7 +257,6 @@ 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)
@@ -321,7 +318,7 @@ multilib_src_configure() {
 		$(use_enable nptl glx-tls) \
 		$(use_enable osmesa) \
 		$(use_enable !pic asm) \
-		$(use_enable llvm-shared-libs) \
+		$(use_with llvm-shared-libs) \
 		--with-dri-drivers=${DRI_DRIVERS} \
 		--with-gallium-drivers=${GALLIUM_DRIVERS} \
 		PYTHON2="${PYTHON}" \
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index cb069570c4e6..d68ad0295f6f 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='llvm-shared-libs'>Dynamically link Gallium3D drivers against LLVM.</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>