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 E86F61381F3 for ; Sat, 7 Sep 2013 06:37:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73EEEE0B4A; Sat, 7 Sep 2013 06:36:50 +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 EF5B7E0B4A for ; Sat, 7 Sep 2013 06:36:44 +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 D87E533EBE3 for ; Sat, 7 Sep 2013 06:36:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8310FE468F for ; Sat, 7 Sep 2013 06:36:42 +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: <1378535560.df81dae9dd0362cdccb0e5afc95e0a3c03b3c351.emil_karlson@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: x11-drivers/ati-drivers/, x11-drivers/ati-drivers/files/ X-VCS-Repository: proj/x11 X-VCS-Files: x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild x11-drivers/ati-drivers/files/fgl_glxgears-do-not-include-glATI.patch X-VCS-Directories: x11-drivers/ati-drivers/ x11-drivers/ati-drivers/files/ X-VCS-Committer: emil_karlson X-VCS-Committer-Name: Emil Karlson X-VCS-Revision: df81dae9dd0362cdccb0e5afc95e0a3c03b3c351 X-VCS-Branch: master Date: Sat, 7 Sep 2013 06:36:42 +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: bc24a31f-19b4-4d63-9394-78711b70f9d5 X-Archives-Hash: 9a3cce355cc28958ded47778bf38037a commit: df81dae9dd0362cdccb0e5afc95e0a3c03b3c351 Author: Emil Karlson gmail com> AuthorDate: Sat Sep 7 06:32:40 2013 +0000 Commit: Emil Karlson gmail com> CommitDate: Sat Sep 7 06:32:40 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=df81dae9 x11-drivers/ati-drivers: Do not include glATI.h in fgl_glxgears Fixes #483400 Fix pointed out by Matthew Dawson --- x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild | 12 +++++++----- .../files/fgl_glxgears-do-not-include-glATI.patch | 11 +++++++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild b/x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild index bc8437c..ffb2cbe 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild @@ -252,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() { @@ -303,6 +307,9 @@ src_prepare() { epatch "${FILESDIR}/check-for-iommu-only-if-iommu-is-supported.patch" epatch "${FILESDIR}/ati-drivers-13.8-proc-permissions.diff" + # 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" @@ -321,11 +328,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 } src_compile() { diff --git a/x11-drivers/ati-drivers/files/fgl_glxgears-do-not-include-glATI.patch b/x11-drivers/ati-drivers/files/fgl_glxgears-do-not-include-glATI.patch new file mode 100644 index 0000000..d46e027 --- /dev/null +++ b/x11-drivers/ati-drivers/files/fgl_glxgears-do-not-include-glATI.patch @@ -0,0 +1,11 @@ +diff -Nur extra/fgl_glxgears/fgl_glxgears.c extra-r1/fgl_glxgears/fgl_glxgears.c +--- extra/fgl_glxgears/fgl_glxgears.c 2012-08-29 09:59:03.000000000 +0300 ++++ extra-r1/fgl_glxgears/fgl_glxgears.c 2013-09-07 09:26:11.034723135 +0300 +@@ -78,7 +78,6 @@ + #endif // _WIN32 + + #define INT_PTR ptrdiff_t +-#include + + #ifdef _WIN32 + #include