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

[Enrico Tagliavini]

commit:     ccfa356656150ffb38f7aa970977c4e0e6a85ffa
Author:     Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
AuthorDate: Mon Jul  9 14:16:16 2012 +0000
Commit:     Enrico Tagliavini <enrico.tagliavini <AT> gmail <DOT> com>
CommitDate: Mon Jul  9 14:16:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=ccfa3566

x11-drivers/ati-drivers: bump legacy driver

version bump to the lastest beta of the legacy branch
watermark is disabled sedding the xorg DDX. This fixes
bug #425198.
the pax_kernel USE is dropped, it should not be needed
anymore as reported in bug #420689 comment #4

---
 x11-drivers/ati-drivers/ati-drivers-12.4.ebuild    |   10 ++--
 ....ebuild => ati-drivers-12.6_beta_pre897.ebuild} |   60 ++++++++++----------
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild
index fd3d1e1..dee9be0 100644
--- a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild
@@ -162,7 +162,7 @@ _check_kernel_config() {
 		eerror "    CONFIG_ACPI=y"
 		eerror "in /usr/src/linux/.config or"
 		eerror "    Power management and ACPI options --->"
-		eerror "	[*] Power Management support"
+		eerror "        [*] Power Management support"
 		eerror "in the 'menuconfig'"
 		error+=" CONFIG_ACPI disabled;"
 		failed=1
@@ -174,7 +174,7 @@ _check_kernel_config() {
 		eerror "    CONFIG_PCI_MSI=y"
 		eerror "in /usr/src/linux/.config or"
 		eerror "    Bus options (PCI etc.)  --->"
-		eerror "	[*] Message Signaled Interrupts (MSI and MSI-X)"
+		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
 		eerror "in the kernel config."
 		error+=" CONFIG_PCI_MSI disabled;"
 		failed=1
@@ -187,9 +187,9 @@ _check_kernel_config() {
 		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
 		eerror "Please make sure the following options have been unset:"
 		eerror "    Kernel hacking  --->"
-		eerror "	[ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "	[ ] Lock debugging: prove locking correctness"
-		eerror "	[ ] Lock usage statistics"
+		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
+		eerror "        [ ] Lock debugging: prove locking correctness"
+		eerror "        [ ] Lock usage statistics"
 		eerror "in 'menuconfig'"
 		error+=" LOCKDEP enabled;"
 		failed=1

diff --git a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
similarity index 92%
copy from x11-drivers/ati-drivers/ati-drivers-12.4.ebuild
copy to x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
index fd3d1e1..1ec2e81 100644
--- a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild
@@ -8,23 +8,24 @@ inherit eutils multilib linux-info linux-mod toolchain-funcs versionator
 
 DESCRIPTION="Ati precompiled drivers for radeon r600 (HD Series) and newer chipsets"
 HOMEPAGE="http://www.amd.com"
-# 8.ble will be used for beta releases.
-if [[ $(get_major_version) -gt 8 ]]; then
+MY_V=( $(get_version_components) )
+if [[ ${MY_V[2]} != beta ]]; then
 	ATI_URL="http://www2.ati.com/drivers/linux/"
 	SRC_URI="${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run"
 	FOLDER_PREFIX="common/"
 else
-	SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
-	FOLDER_PREFIX=""
+	#SRC_URI="https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz"
+	SRC_URI="http://www2.ati.com/drivers/legacy/amd-driver-installer-12.6-legacy-x86.x86_64.zip"
+	FOLDER_PREFIX="common/"
 fi
-IUSE="debug +modules multilib pax_kernel qt4 static-libs"
+IUSE="debug +modules multilib qt4 static-libs"
 
 LICENSE="AMD GPL-2 QPL-1.0 as-is"
 KEYWORDS="~amd64 ~x86"
 SLOT="1"
 
 RDEPEND="
-	<=x11-base/xorg-server-1.11.49[-minimal]
+	<=x11-base/xorg-server-1.12.49[-minimal]
 	>=app-admin/eselect-opengl-1.0.7
 	app-admin/eselect-opencl
 	sys-power/acpid
@@ -162,7 +163,7 @@ _check_kernel_config() {
 		eerror "    CONFIG_ACPI=y"
 		eerror "in /usr/src/linux/.config or"
 		eerror "    Power management and ACPI options --->"
-		eerror "	[*] Power Management support"
+		eerror "        [*] Power Management support"
 		eerror "in the 'menuconfig'"
 		error+=" CONFIG_ACPI disabled;"
 		failed=1
@@ -174,7 +175,7 @@ _check_kernel_config() {
 		eerror "    CONFIG_PCI_MSI=y"
 		eerror "in /usr/src/linux/.config or"
 		eerror "    Bus options (PCI etc.)  --->"
-		eerror "	[*] Message Signaled Interrupts (MSI and MSI-X)"
+		eerror "        [*] Message Signaled Interrupts (MSI and MSI-X)"
 		eerror "in the kernel config."
 		error+=" CONFIG_PCI_MSI disabled;"
 		failed=1
@@ -187,9 +188,9 @@ _check_kernel_config() {
 		eerror "FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'"
 		eerror "Please make sure the following options have been unset:"
 		eerror "    Kernel hacking  --->"
-		eerror "	[ ] Lock debugging: detect incorrect freeing of live locks"
-		eerror "	[ ] Lock debugging: prove locking correctness"
-		eerror "	[ ] Lock usage statistics"
+		eerror "        [ ] Lock debugging: detect incorrect freeing of live locks"
+		eerror "        [ ] Lock debugging: prove locking correctness"
+		eerror "        [ ] Lock usage statistics"
 		eerror "in 'menuconfig'"
 		error+=" LOCKDEP enabled;"
 		failed=1
@@ -274,14 +275,14 @@ pkg_setup() {
 }
 
 src_unpack() {
-	if [[ $(get_major_version) -gt 8 ]]; then
-		# Switching to a standard way to extract the files since otherwise no signature file
-		# would be created
-		local src="${DISTDIR}/${A}"
-		sh "${src}" --extract "${S}"  2&>1 /dev/null
-	else
+	if [[ ${MY_V[2]} == beta ]]; then
 		unpack ${A}
+		RUN=${A/%.zip/.run}
+	else
+		RUN=${A}
 	fi
+	sh "${S}"/${RUN} --extract "${S}"  2>&1 > /dev/null || die \
+	'unpack failed'
 }
 
 src_prepare() {
@@ -320,20 +321,8 @@ src_prepare() {
 	# add function to detect default state.
 	epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch
 
-	# fix needed for at least hardened-sources, see bug #392753
-	use pax_kernel && epatch "${FILESDIR}"/ati-drivers-12.2-redefine-WARN.patch
-
-	# fixed fgrlx compilation error on 32-bit x86 arch with kernel 3.3-rc4 due to commit:
-	# https://github.com/torvalds/linux/commit/f94edacf998516ac9d849f7bc6949a703977a7f3
-	# later modified (in 3.3-rc5) by commit:
-	# https://github.com/torvalds/linux/commit/7e16838d94b566a17b65231073d179bc04d590c8#diff-1
-	# and finally backported to kernel 3.2.8.
-	epatch "${FILESDIR}"/amd-drivers-3.2.7.1.patch
-
-	# see http://ati.cchtml.com/show_bug.cgi?id=495
-	epatch "${FILESDIR}"/ati-drivers-old_rsp.patch
-	#fixes bug #420751
-	epatch "${FILESDIR}"/ati-drivers-do_mmap.patch
+#	# fix needed for at least hardened-sources, see bug #392753
+#	use pax_kernel && epatch "${FILESDIR}"/ati-drivers-12.2-redefine-WARN.patch
 
 	cd "${MODULE_DIR}"
 
@@ -355,6 +344,15 @@ src_prepare() {
 	mkdir extra || die "mkdir 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
+	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}/\x90\x90\x90\x90\x90/g" ${driver} || break 1
+	done
+	eend $? || die "Disabling watermark failed"
 }
 
 src_compile() {