From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E528D138A1A for ; Wed, 11 Feb 2015 20:31:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BAFCE0920; Wed, 11 Feb 2015 20:31:12 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E5853E0920 for ; Wed, 11 Feb 2015 20:31:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7721034066C for ; Wed, 11 Feb 2015 20:31:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43822118C9 for ; Wed, 11 Feb 2015 20:31:06 +0000 (UTC) From: "Emil Karlson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Emil Karlson" Message-ID: <1423686625.410b03b55fb4c7bc2f8c8fc59012d3374a9f1d37.emil_karlson@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-drivers/ati-drivers/ati-drivers-14.12-r3.ebuild x11-drivers/ati-drivers/metadata.xml X-VCS-Directories: x11-drivers/ati-drivers/ X-VCS-Committer: emil_karlson X-VCS-Committer-Name: Emil Karlson X-VCS-Revision: 410b03b55fb4c7bc2f8c8fc59012d3374a9f1d37 X-VCS-Branch: master Date: Wed, 11 Feb 2015 20:31:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4ce4cb76-ed0e-4bc2-b218-11e1790ff5b0 X-Archives-Hash: 174bc152dd270661867ce29bf25784b6 commit: 410b03b55fb4c7bc2f8c8fc59012d3374a9f1d37 Author: Emil Karlson gmail com> AuthorDate: Wed Feb 11 20:30:25 2015 +0000 Commit: Emil Karlson gmail 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 @@ Build the kernel modules Do a potentially dangerous binary search and replace to disable watermark Enable pax kernel specific patches - Install bundled libva driver to replace x11-libs/xvba-video