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

[Patrick Matthäi]

Author: pmatthaei
Date: 2015-09-27 08:48:53 +0000 (Sun, 27 Sep 2015)
New Revision: 1516

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


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2015-09-27 08:48:13 UTC (rev 1515)
+++ fglrx-driver/trunk/debian/changelog	2015-09-27 08:48:53 UTC (rev 1516)
@@ -8,6 +8,7 @@
 
   [ Patrick Matthäi ]
   * Refresh patch 04-3.17rc6-no_hotplug.
+  * Rewrite patch 05-4.0.0-build.
 
  -- Andreas Beckmann <anbe at debian.org>  Sat, 19 Sep 2015 16:55:28 +0200
 

Modified: fglrx-driver/trunk/debian/patches/05-4.0.0-build.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/05-4.0.0-build.patch	2015-09-27 08:48:13 UTC (rev 1515)
+++ fglrx-driver/trunk/debian/patches/05-4.0.0-build.patch	2015-09-27 08:48:53 UTC (rev 1516)
@@ -2,72 +2,32 @@
 # Thanks to Michael Rasmussen <mir at datanom.net>.
 # Closes: #785150
 
-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-07-09 19:43:15.649416114 +0200
-+++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-07-09 19:42:53.181892574 +0200
-@@ -4501,8 +4501,13 @@
+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:44:41.292458241 +0200
++++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-27 10:43:51.189345210 +0200
+@@ -285,6 +285,11 @@
  
-     if (cpu_has_pge)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
-         cr4 = read_cr4();
-         write_cr4(cr4 & ~X86_CR4_PGE);
-+#else
-+        cr4 = __read_cr4();
-+        __write_cr4(cr4 & ~X86_CR4_PGE);
-+#endif
-     }
-      __flush_tlb();
+ MODULE_INFO(supported, "external");
  
-@@ -4515,7 +4520,11 @@
-     write_cr0(cr0 & 0xbfffffff);
-     if (cpu_has_pge)
-     {
--        write_cr4(cr4);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
-+        write_cr4(cr4 & ~X86_CR4_PGE);
-+#else
-+        __write_cr4(cr4 & ~X86_CR4_PGE);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
++#define read_cr4()       __read_cr4()
++#define write_cr4(cr4)   __write_cr4(cr4)
 +#endif
-     }
-     local_irq_restore(flags);
++
+ /* globals constants */
+ const char*         KCL_SYSINFO_OsVersionString = UTS_RELEASE;
+ const unsigned int  KCL_SYSINFO_PageSize        = PAGE_SIZE;
+diff -Naur fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/kcl_str.c fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/kcl_str.c
+--- fglrx-driver-15.9.orig/common/lib/modules/fglrx/build_mod/kcl_str.c	2015-09-09 00:57:14.000000000 +0200
++++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/kcl_str.c	2015-09-27 10:43:51.189345210 +0200
+@@ -42,6 +42,10 @@
+ #include "kcl_type.h"
+ #include "kcl_str.h"
  
-@@ -4542,8 +4551,13 @@
- 
-     if (cpu_has_pge)
-     {
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
-         cr4 = read_cr4();
-         write_cr4(cr4 & ~X86_CR4_PGE);
-+#else
-+        cr4 = __read_cr4();
-+        __write_cr4(cr4 & ~X86_CR4_PGE);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
++#define strnicmp strncasecmp
 +#endif
-     }
-      __flush_tlb();
-   
-@@ -4555,7 +4569,11 @@
-     write_cr0(cr0 & 0xbfffffff);
-     if (cpu_has_pge)
-     {
--        write_cr4(cr4);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 20, 0)
-+        write_cr4(cr4 & ~X86_CR4_PGE);
-+#else
-+        __write_cr4(cr4 & ~X86_CR4_PGE);
-+#endif
-     }
-     local_irq_restore(flags);
- 
-diff -Naur fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/kcl_str.c fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/kcl_str.c
---- fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/kcl_str.c	2015-07-04 16:31:23.000000000 +0200
-+++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/kcl_str.c	2015-07-09 19:42:53.181892574 +0200
-@@ -169,7 +169,7 @@
-                                   const char* s2,
-                                   KCL_TYPE_SizeSigned count)
- {
--    return strnicmp(s1, s2, count);
-+    return strncasecmp(s1, s2, count);
- }
- 
- /** \brief Locate character in string
++
+ /** \brief Fill memory with a constant byte
+  *  \param s Pointer to memory
+  *  \param c Initializing value