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

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

commit:     8a4c46052377efe2a6df5e555ebe86baea9dfea5
Author:     Emil Karlson <jekarlson <AT> gmail <DOT> com>
AuthorDate: Thu Oct  3 07:40:14 2013 +0000
Commit:     Emil Karlson <jekarlson <AT> gmail <DOT> com>
CommitDate: Thu Oct  3 07:40:14 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=8a4c4605

x11-drivers/ati-drivers: version bump

---
 ..._beta2.ebuild => ati-drivers-13.10_beta.ebuild} | 43 +++++++---------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/x11-drivers/ati-drivers/ati-drivers-13.6_beta2.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.10_beta.ebuild
similarity index 93%
rename from x11-drivers/ati-drivers/ati-drivers-13.6_beta2.ebuild
rename to x11-drivers/ati-drivers/ati-drivers-13.10_beta.ebuild
index 9b3cdac..e197a6d 100644
--- a/x11-drivers/ati-drivers/ati-drivers-13.6_beta2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-13.10_beta.ebuild
@@ -8,23 +8,13 @@ inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-uti
 
 DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets"
 HOMEPAGE="http://www.amd.com"
-MY_V=( $(get_version_components) )
-RUN="${WORKDIR}/amd-catalyst-13.15.100.1-x86.x86_64.run"
+#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run"
 SLOT="1"
-if [[ "${MY_V[2]}" =~  beta.* ]]; then
-	BETADIR="beta/"
-else
-	BETADIR="linux/"
-fi
-if [[ legacy != ${SLOT} ]]; then
-	DRIVERS_URI="http://www2.ati.com/drivers/beta/amd-catalyst-13.15.100.1-linux-x86.x86_64.zip"
-else
-	DRIVERS_URI="http://www2.ati.com/drivers/legacy/amd-driver-installer-catalyst-$(get_version_component_range 1-2)-$(get_version_component_range 3)-legacy-linux-x86.x86_64.zip"
-fi
+DRIVERS_URI="http://www2.ati.com/drivers/beta/amd-catalyst-13.10-beta2-linux-x86.x86_64.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 multilib qt4 static-libs disable-watermark pax_kernel"
+IUSE="debug +modules multilib qt4 static-libs pax_kernel"
 
 LICENSE="AMD GPL-2 QPL-1.0"
 KEYWORDS="-* ~amd64 ~x86"
@@ -262,6 +252,10 @@ src_unpack() {
 	mkdir xvba_sdk
 	cd xvba_sdk
 	unpack ${XVBA_SDK_DISTFILE}
+
+	mkdir -p "${WORKDIR}/extra" || die "mkdir extra failed"
+	cd "${WORKDIR}/extra"
+	tar -xf "../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz"
 }
 
 src_prepare() {
@@ -308,7 +302,12 @@ src_prepare() {
 	# Compile fix for kernel typesafe uid types #469160
 	epatch "${FILESDIR}/typesafe-kuid.diff"
 
-	epatch "${FILESDIR}/ati-drivers-13.6-linux-3.10-proc.diff"
+	epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch"
+
+	epatch "${FILESDIR}/check-for-iommu-only-if-iommu-is-supported.patch"
+
+	# Fix #483400
+	epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch"
 
 	# Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
 	use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
@@ -328,22 +327,6 @@ src_prepare() {
 	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
 	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
 		|| die "MODVERSIONS sed failed"
-	cd "${S}"
-
-	mkdir extra || die "mkdir extra failed"
-	cd extra
-	unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz
-
-	# Get rid of watermark. Oldest known reference:
-	# http://phoronix.com/forums/showthread.php?19875-Unsupported-Hardware-watermark
-	if use disable-watermark; then
-		ebegin "Disabling watermark"
-		driver="${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
-		for x in $(objdump -d ${driver}|awk '/call/&&/EnableLogo/{print "\\x"$2"\\x"$3"\\x"$4"\\x"$5"\\x"$6}'); do
-		sed -i "s/${x/x5b/\x5b}/\x90\x90\x90\x90\x90/g" ${driver} || break 1
-		done
-		eend $? || die "Disabling watermark failed"
-	fi
 }
 
 src_compile() {