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 CC1AA1381F3 for ; Thu, 3 Oct 2013 07:40:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8A9FBE0AE6; Thu, 3 Oct 2013 07:40:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 14A15E0AE6 for ; Thu, 3 Oct 2013 07:40:48 +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 9BD2433EF16 for ; Thu, 3 Oct 2013 07:40:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3F338E5308 for ; Thu, 3 Oct 2013 07:40:46 +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: <1380786014.8a4c46052377efe2a6df5e555ebe86baea9dfea5.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-13.10_beta.ebuild x11-drivers/ati-drivers/ati-drivers-13.6_beta2.ebuild X-VCS-Directories: x11-drivers/ati-drivers/ X-VCS-Committer: emil_karlson X-VCS-Committer-Name: Emil Karlson X-VCS-Revision: 8a4c46052377efe2a6df5e555ebe86baea9dfea5 X-VCS-Branch: master Date: Thu, 3 Oct 2013 07:40:46 +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: bd87d7d9-8669-4fa9-b70f-8e8ecfc6ac9b X-Archives-Hash: ce55a50bb78019e6e8f9dba0f17c4486 commit: 8a4c46052377efe2a6df5e555ebe86baea9dfea5 Author: Emil Karlson gmail com> AuthorDate: Thu Oct 3 07:40:14 2013 +0000 Commit: Emil Karlson gmail 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() {