[gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/

["Emil Karlson" <jekarlson@gmail.com>]

commit:     410b03b55fb4c7bc2f8c8fc59012d3374a9f1d37
Author:     Emil Karlson <jekarlson <AT> gmail <DOT> com>
AuthorDate: Wed Feb 11 20:30:25 2015 +0000
Commit:     Emil Karlson <jekarlson <AT> gmail <DOT> com>
CommitDate: Wed Feb 11 20:30:25 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=410b03b5

Revert "x11-drivers/ati-drivers: make bundled libva driver installation optional"

This reverts commit de91c1301eedb830d7dd9d0781ebe23b3e3df4fc.

---
 x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild | 6 +++---
 x11-drivers/ati-drivers/metadata.xml                | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
index f2d4694..2b31c43 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild
@@ -17,7 +17,7 @@ DRIVERS_URI="mirror://gentoo/amd-catalyst-omega-14.12-linux-run-installers.zip"
 XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"
 SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}"
 FOLDER_PREFIX="common/"
-IUSE="debug +modules qt4 static-libs pax_kernel +internal-va-driver"
+IUSE="debug +modules qt4 static-libs pax_kernel"
 
 LICENSE="AMD GPL-2 QPL-1.0"
 KEYWORDS="-* ~amd64 ~x86"
@@ -36,7 +36,7 @@ RDEPEND="
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	virtual/glu
-	internal-va-driver? ( !x11-libs/xvba-video )
+	!x11-libs/xvba-video
 	abi_x86_32? (
 			|| (
 				virtual/glu[abi_x86_32]
@@ -559,7 +559,7 @@ src_install-libs() {
 	doheader xvba_sdk/include/amdxvba.h
 
 	# VA-API internal wrapper
-	use internal-va-driver && dosym /usr/$(get_libdir)/libXvBAW.so.1.0 /usr/$(get_libdir)/va/drivers/fglrx_drv_video.so
+	dosym /usr/$(get_libdir)/libXvBAW.so.1.0 /usr/$(get_libdir)/va/drivers/fglrx_drv_video.so
 
 	if use pax_kernel; then
 		pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed"

diff --git a/x11-drivers/ati-drivers/metadata.xml b/x11-drivers/ati-drivers/metadata.xml
index 6574c13..dc12ac1 100644
--- a/x11-drivers/ati-drivers/metadata.xml
+++ b/x11-drivers/ati-drivers/metadata.xml
@@ -13,6 +13,5 @@
 		<flag name='modules'>Build the kernel modules</flag>
 		<flag name='disable-watermark'>Do a potentially dangerous binary search and replace to disable watermark</flag>
 		<flag name='pax_kernel'>Enable pax kernel specific patches</flag>
-		<flag name='internal-va-driver'>Install bundled libva driver to replace x11-libs/xvba-video</flag>
 	</use>
 </pkgmetadata>