From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SoElW-000178-PF for garchives@archives.gentoo.org; Mon, 09 Jul 2012 14:16:43 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3502DE0478; Mon, 9 Jul 2012 14:16:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E3932E0478 for ; Mon, 9 Jul 2012 14:16:29 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD9DC1B40DD for ; Mon, 9 Jul 2012 14:16:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7B9ECE5433 for ; Mon, 9 Jul 2012 14:16:27 +0000 (UTC) From: "Enrico Tagliavini" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Enrico Tagliavini" Message-ID: <1341843376.ccfa356656150ffb38f7aa970977c4e0e6a85ffa.Enrico@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-12.4.ebuild x11-drivers/ati-drivers/ati-drivers-12.6_beta_pre897.ebuild X-VCS-Directories: x11-drivers/ati-drivers/ X-VCS-Committer: Enrico X-VCS-Committer-Name: Enrico Tagliavini X-VCS-Revision: ccfa356656150ffb38f7aa970977c4e0e6a85ffa X-VCS-Branch: master Date: Mon, 9 Jul 2012 14:16:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 94f49f9a-2178-48e9-8fd3-ca503c24e300 X-Archives-Hash: b4413e40d1a33719d3e012ef44dd2439 commit: ccfa356656150ffb38f7aa970977c4e0e6a85ffa Author: Enrico Tagliavini gmail com> AuthorDate: Mon Jul 9 14:16:16 2012 +0000 Commit: Enrico Tagliavini gmail com> CommitDate: Mon Jul 9 14:16:16 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/x11.git;a=3Dc= ommit;h=3Dccfa3566 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 =3D> 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-driver= s/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=3Dy" 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+=3D" CONFIG_ACPI disabled;" failed=3D1 @@ -174,7 +174,7 @@ _check_kernel_config() { eerror " CONFIG_PCI_MSI=3Dy" 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+=3D" CONFIG_PCI_MSI disabled;" failed=3D1 @@ -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 l= ocks" + eerror " [ ] Lock debugging: prove locking correctness" + eerror " [ ] Lock usage statistics" eerror "in 'menuconfig'" error+=3D" LOCKDEP enabled;" failed=3D1 diff --git a/x11-drivers/ati-drivers/ati-drivers-12.4.ebuild b/x11-driver= s/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 =20 DESCRIPTION=3D"Ati precompiled drivers for radeon r600 (HD Series) and n= ewer chipsets" HOMEPAGE=3D"http://www.amd.com" -# 8.ble will be used for beta releases. -if [[ $(get_major_version) -gt 8 ]]; then +MY_V=3D( $(get_version_components) ) +if [[ ${MY_V[2]} !=3D beta ]]; then ATI_URL=3D"http://www2.ati.com/drivers/linux/" SRC_URI=3D"${ATI_URL}/amd-driver-installer-${PV/./-}-x86.x86_64.run" FOLDER_PREFIX=3D"common/" else - SRC_URI=3D"https://launchpad.net/ubuntu/natty/+source/fglrx-installer/2= :${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz" - FOLDER_PREFIX=3D"" + #SRC_URI=3D"https://launchpad.net/ubuntu/natty/+source/fglrx-installer/= 2:${PV}-0ubuntu1/+files/fglrx-installer_${PV}.orig.tar.gz" + SRC_URI=3D"http://www2.ati.com/drivers/legacy/amd-driver-installer-12.6= -legacy-x86.x86_64.zip" + FOLDER_PREFIX=3D"common/" fi -IUSE=3D"debug +modules multilib pax_kernel qt4 static-libs" +IUSE=3D"debug +modules multilib qt4 static-libs" =20 LICENSE=3D"AMD GPL-2 QPL-1.0 as-is" KEYWORDS=3D"~amd64 ~x86" SLOT=3D"1" =20 RDEPEND=3D" - <=3Dx11-base/xorg-server-1.11.49[-minimal] + <=3Dx11-base/xorg-server-1.12.49[-minimal] >=3Dapp-admin/eselect-opengl-1.0.7 app-admin/eselect-opencl sys-power/acpid @@ -162,7 +163,7 @@ _check_kernel_config() { eerror " CONFIG_ACPI=3Dy" 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+=3D" CONFIG_ACPI disabled;" failed=3D1 @@ -174,7 +175,7 @@ _check_kernel_config() { eerror " CONFIG_PCI_MSI=3Dy" 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+=3D" CONFIG_PCI_MSI disabled;" failed=3D1 @@ -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 l= ocks" + eerror " [ ] Lock debugging: prove locking correctness" + eerror " [ ] Lock usage statistics" eerror "in 'menuconfig'" error+=3D" LOCKDEP enabled;" failed=3D1 @@ -274,14 +275,14 @@ pkg_setup() { } =20 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=3D"${DISTDIR}/${A}" - sh "${src}" --extract "${S}" 2&>1 /dev/null - else + if [[ ${MY_V[2]} =3D=3D beta ]]; then unpack ${A} + RUN=3D${A/%.zip/.run} + else + RUN=3D${A} fi + sh "${S}"/${RUN} --extract "${S}" 2>&1 > /dev/null || die \ + 'unpack failed' } =20 src_prepare() { @@ -320,20 +321,8 @@ src_prepare() { # add function to detect default state. epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch =20 - # fix needed for at least hardened-sources, see bug #392753 - use pax_kernel && epatch "${FILESDIR}"/ati-drivers-12.2-redefine-WARN.p= atch - - # fixed fgrlx compilation error on 32-bit x86 arch with kernel 3.3-rc4 = due to commit: - # https://github.com/torvalds/linux/commit/f94edacf998516ac9d849f7bc694= 9a703977a7f3 - # later modified (in 3.3-rc5) by commit: - # https://github.com/torvalds/linux/commit/7e16838d94b566a17b65231073d1= 79bc04d590c8#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=3D495 - 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 =20 cd "${MODULE_DIR}" =20 @@ -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=3D"${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" } =20 src_compile() {