[Pkg-fglrx-devel] r1520 - in fglrx-driver/trunk/debian: . patches

[Patrick Matthäi]

Author: pmatthaei
Date: 2015-09-27 09:00:45 +0000 (Sun, 27 Sep 2015)
New Revision: 1520

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/08-4.2.0-build.patch
Log:
* Rewrite patch 08-4.2.0-build.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2015-09-27 08:53:23 UTC (rev 1519)
+++ fglrx-driver/trunk/debian/changelog	2015-09-27 09:00:45 UTC (rev 1520)
@@ -11,6 +11,7 @@
   * Rewrite patch 05-4.0.0-build.
   * Drop merged patch 06-4.0.0-build-2.
   * Rewrite patch 07-4.1.0-build.
+  * Rewrite patch 08-4.2.0-build.
 
  -- Andreas Beckmann <anbe at debian.org>  Sat, 19 Sep 2015 16:55:28 +0200
 

Modified: fglrx-driver/trunk/debian/patches/08-4.2.0-build.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/08-4.2.0-build.patch	2015-09-27 08:53:23 UTC (rev 1519)
+++ fglrx-driver/trunk/debian/patches/08-4.2.0-build.patch	2015-09-27 09:00:45 UTC (rev 1520)
@@ -3,11 +3,9 @@
 Date: Tue, 14 Jul 2015 12:56:37 +0200
 Subject: [PATCH 1/1] Add support for Linux 4.2
 
-Deal with the FPU code renaming
-
-diff -Naur fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-01 10:03:54.963550372 +0200
-+++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-01 10:04:59.455356368 +0200
+diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-27 10:54:11.858303746 +0200
++++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-27 10:57:09.055500917 +0200
 @@ -191,9 +191,17 @@
  #include <linux/string.h>
  #include <linux/gfp.h>
@@ -26,7 +24,7 @@
  #endif
  
  #include "firegl_public.h"
-@@ -1706,6 +1714,9 @@
+@@ -1714,6 +1722,9 @@
  
  #if defined(__i386__) 
  #ifndef __HAVE_ARCH_CMPXCHG
@@ -36,7 +34,7 @@
  static inline 
  unsigned long __fgl_cmpxchg(volatile void *ptr, unsigned long old,            
                          unsigned long new, int size)                      
-@@ -1742,7 +1753,11 @@
+@@ -1750,7 +1761,11 @@
           unsigned long new, int size)
  {
  #ifndef __HAVE_ARCH_CMPXCHG
@@ -48,7 +46,7 @@
  #else
      /* On kernel version 2.6.34 passing a variable or unsupported size
       * argument to the __cmpxchg macro causes the default-clause of a
-@@ -6456,21 +6471,36 @@
+@@ -6446,21 +6461,36 @@
     struct fpu *fpu = &tsk->thread.fpu;
  
     if(static_cpu_has(X86_FEATURE_XSAVE)) {
@@ -85,7 +83,7 @@
     return 1;
  }
  #endif
-@@ -6482,8 +6512,12 @@
+@@ -6472,8 +6502,12 @@
  void ATI_API_CALL KCL_fpu_begin(void)
  {
  #ifdef CONFIG_X86_64
@@ -98,7 +96,7 @@
  #ifdef TS_USEDFPU
      struct thread_info *cur_thread = current_thread_info();
      struct task_struct *cur_task = get_current();
-@@ -6528,7 +6562,11 @@
+@@ -6518,7 +6552,11 @@
   */
  void ATI_API_CALL KCL_fpu_end(void)
  {