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

[Emil Karlson]

commit:     9589ab069aa08fe9787e02107860128a40940d48
Author:     Emil Karlson <jekarlson <AT> gmail <DOT> com>
AuthorDate: Mon Nov 10 20:06:33 2014 +0000
Commit:     Emil Karlson <jekarlson <AT> gmail <DOT> com>
CommitDate: Mon Nov 10 20:06:33 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=9589ab06

x11-drivers/ati-drivers: fix x86-32 build failure on linux-3.17

fixes #526602

---
 x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild       |  3 +++
 x11-drivers/ati-drivers/ati-drivers-14.9.ebuild          |  3 +++
 x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch | 12 ++++++++++++
 3 files changed, 18 insertions(+)

diff --git a/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild 
b/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild
index 2ebb926..267b375 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.9-r1.ebuild
@@ -318,6 +318,9 @@ src_prepare() {
        # Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
        use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
 
+       # Compile fix, #526602
+       epatch "${FILESDIR}/use-kernel_fpu_begin.patch"
+
        cd "${MODULE_DIR}"
 
        # bugged fglrx build system, this file should be copied by hand

diff --git a/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild 
b/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild
index fae8fb3..378153e 100644
--- a/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-14.9.ebuild
@@ -318,6 +318,9 @@ src_prepare() {
        # Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870
        use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch"
 
+       # Compile fix, #526602
+       epatch "${FILESDIR}/use-kernel_fpu_begin.patch"
+
        cd "${MODULE_DIR}"
 
        # bugged fglrx build system, this file should be copied by hand

diff --git a/x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch 
b/x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch
new file mode 100644
index 0000000..f0ba278
--- /dev/null
+++ b/x11-drivers/ati-drivers/files/use-kernel_fpu_begin.patch
@@ -0,0 +1,12 @@
+diff -Naur a/common/lib/modules/fglrx/build_mod/firegl_public.c 
b/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c       2014-10-27 
23:30:58.630304842 +0200
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c       2014-10-27 
23:32:57.300306011 +0200
+@@ -6389,7 +6389,7 @@
+  */
+ void ATI_API_CALL KCL_fpu_begin(void)
+ {
+-#ifdef CONFIG_X86_64
++#if defined(CONFIG_X86_64) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
+     kernel_fpu_begin();
+ #else
+ #ifdef TS_USEDFPU