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

[Patrick Matthäi]

Author: pmatthaei
Date: 2015-09-27 08:49:49 +0000 (Sun, 27 Sep 2015)
New Revision: 1517

Removed:
   fglrx-driver/trunk/debian/patches/06-4.0.0-build-2.patch
Modified:
   fglrx-driver/trunk/debian/changelog
Log:
* Drop merged patch 06-4.0.0-build-2.


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

Deleted: fglrx-driver/trunk/debian/patches/06-4.0.0-build-2.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/06-4.0.0-build-2.patch	2015-09-27 08:48:53 UTC (rev 1516)
+++ fglrx-driver/trunk/debian/patches/06-4.0.0-build-2.patch	2015-09-27 08:49:49 UTC (rev 1517)
@@ -1,34 +0,0 @@
-From 9029e189f8431a39146ac3477c7e4491e06c6f4b Mon Sep 17 00:00:00 2001
-From: Alberto Milone <alberto.milone at canonical.com>
-Date: Thu, 4 Jun 2015 18:03:39 +0200
-Subject: [PATCH 1/1] Add support for Linux 4.0
-
-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 09:46:47.000000000 +0200
-+++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-01 09:53:53.749349870 +0200
-@@ -277,6 +277,11 @@
- 
- MODULE_INFO(supported, "external");
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
-+#define read_cr4()       __read_cr4()
-+#define write_cr4(cr4)   __write_cr4(cr4)
-+#endif
-+
- /* globals constants */
- const char*         KCL_SYSINFO_OsVersionString = UTS_RELEASE;
- const unsigned int  KCL_SYSINFO_PageSize        = PAGE_SIZE;
-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-09-01 09:46:47.000000000 +0200
-+++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/kcl_str.c	2015-09-01 09:53:53.749349870 +0200
-@@ -42,6 +42,10 @@
- #include "kcl_type.h"
- #include "kcl_str.h"
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0)
-+#define strnicmp strncasecmp
-+#endif
-+
- /** \brief Fill memory with a constant byte
-  *  \param s Pointer to memory
-  *  \param c Initializing value