diff -u fglrx-installer-updates-8.960/debian/changelog fglrx-installer-updates-8.960/debian/changelog --- fglrx-installer-updates-8.960/debian/changelog +++ fglrx-installer-updates-8.960/debian/changelog @@ -1,3 +1,11 @@ +fglrx-installer-updates (2:8.960-0ubuntu3) quantal; urgency=low + + * fix-build-issue-on-i386-where-TS_USEDFPU-is-no-longe.patch: + - Update patch so as to make sure to include + asm/fpu-internal.h (LP: #1017822). + + -- Alberto Milone Sat, 30 Jun 2012 11:37:33 +0200 + fglrx-installer-updates (2:8.960-0ubuntu2) quantal; urgency=low * replace-do_mmap-and-do_munmap-with-vm_mmap-and-vm_mu.patch, diff -u fglrx-installer-updates-8.960/debian/dkms/patches/fix-build-issue-on-i386-where-TS_USEDFPU-is-no-longe.patch fglrx-installer-updates-8.960/debian/dkms/patches/fix-build-issue-on-i386-where-TS_USEDFPU-is-no-longe.patch --- fglrx-installer-updates-8.960/debian/dkms/patches/fix-build-issue-on-i386-where-TS_USEDFPU-is-no-longe.patch +++ fglrx-installer-updates-8.960/debian/dkms/patches/fix-build-issue-on-i386-where-TS_USEDFPU-is-no-longe.patch @@ -1,20 +1,30 @@ -From 6bc31befbd0defde8e62bc51c9e844abda339601 Mon Sep 17 00:00:00 2001 +From a679eb9e1e691eb04b4e266caab20f19be704de7 Mon Sep 17 00:00:00 2001 From: Alberto Milone -Date: Thu, 22 Mar 2012 10:35:05 +0100 +Date: Fri, 29 Jun 2012 18:46:12 +0200 Subject: [PATCH 1/1] Fix build issue on i386 where TS_USEDFPU is no longer available Signed-off-by: Alberto Milone --- - firegl_public.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + firegl_public.c | 9 +++++++++ + 1 file changed, 9 insertions(+) diff --git a/firegl_public.c b/firegl_public.c -index 1612722..1d02a00 100755 +index 1612722..5a446be 100755 --- a/firegl_public.c +++ b/firegl_public.c -@@ -5834,10 +5834,16 @@ void ATI_API_CALL KCL_fpu_begin(void) +@@ -187,6 +187,9 @@ + #include + #include + #include "asm/i387.h" ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) ++#include ++#endif + + #include "firegl_public.h" + #include "kcl_osconfig.h" +@@ -5834,10 +5837,16 @@ void ATI_API_CALL KCL_fpu_begin(void) #ifdef CONFIG_X86_64 kernel_fpu_begin(); #else @@ -34,3 +44,3 @@ -- -1.7.5.4 +1.7.9.5