Fix bug #483400, import of Emil Karlson's ebuild from the x11 overlay.

(Portage version: 2.2.1/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 24 insertions, 7 deletions

diff --git a/x11-drivers/ati-drivers/ChangeLog b/x11-drivers/ati-drivers/ChangeLog
index 4fc3e6298767..f8081fe45d20 100644
--- a/x11-drivers/ati-drivers/ChangeLog
+++ b/x11-drivers/ati-drivers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.338 2013/08/24 08:06:32 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.339 2013/09/12 16:15:36 chithanh Exp $
+
+  12 Sep 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/fgl_glxgears-do-not-include-glATI.patch, ati-drivers-13.8_beta2.ebuild:
+  Fix bug #483400, import of Emil Karlson's ebuild from the x11 overlay.
 
   24 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   +files/ati-drivers-13.8-beta-include-seq_file.patch,
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 ecbd50b7290a..50bbfa3f2662 100644
--- a/x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild,v 1.1 2013/08/23 18:15:21 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-13.8_beta2.ebuild,v 1.2 2013/09/12 16:15:36 chithanh Exp $
 
 EAPI=5
 
@@ -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 000000000000..d46e027c5670
--- /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 <GL/glATI.h>
+ 
+ #ifdef _WIN32
+ #include <GL/wglATI.h>