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

[Patrick Matthäi]

Author: pmatthaei
Date: 2015-07-06 18:05:10 +0000 (Mon, 06 Jul 2015)
New Revision: 1476

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/import/signature
   fglrx-driver/trunk/debian/patches/05-4.0.0-build.patch
   fglrx-driver/trunk/debian/rules.defs
Log:
* Adjust patch 05-4.0.0-build so it works again.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2015-07-06 18:01:26 UTC (rev 1475)
+++ fglrx-driver/trunk/debian/changelog	2015-07-06 18:05:10 UTC (rev 1476)
@@ -5,6 +5,7 @@
     - Adjust some lintian overrides.
   * Updated dutch translation from Frans Spiesschaert.
     Closes: #776756
+  * Adjust patch 05-4.0.0-build so it works again.
 
  -- Patrick Matthäi <pmatthaei at debian.org>  Mon, 06 Jul 2015 19:27:51 +0200
 

Modified: fglrx-driver/trunk/debian/import/signature
===================================================================
--- fglrx-driver/trunk/debian/import/signature	2015-07-06 18:01:26 UTC (rev 1475)
+++ fglrx-driver/trunk/debian/import/signature	2015-07-06 18:05:10 UTC (rev 1476)
@@ -1 +1 @@
-f113a62a7c1dff13f004aed92aa0662d:c027881b4c33ce23c03283e81e90521cc6728b1b4b2cce23c1478ee81a925e1bc525:9223941d4425ce71c4679dea49c5541e92239518442e9a2bc16197e91f92574e92259118447fce71c4669cba49c5541e9222921d44789a2bc16597eb1fc5574f9226941f
\ No newline at end of file
+e4b67bebf42e1ddbb867ada058a10355:d58255dec41f33ea88579e8d69953264d6861ac6c51925eb8855ee8069913a6cd68f43:808343d9c11b79bedb539cc66b926634dc8e4edccd4b25bf8e5e94956b933561808043ddc54f7eeddb529c996a946637dc8e4ede914b25eb8e5e94916bc035368080438dc01d
\ No newline at end of file

Modified: fglrx-driver/trunk/debian/patches/05-4.0.0-build.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/05-4.0.0-build.patch	2015-07-06 18:01:26 UTC (rev 1475)
+++ fglrx-driver/trunk/debian/patches/05-4.0.0-build.patch	2015-07-06 18:05:10 UTC (rev 1476)
@@ -1,10 +1,6 @@
-# Patch to fix FTBFS with Linux 4.0.0.
-# Thanks to Michael Rasmussen <mir at datanom.net>.
-# Closes: #785150
-
-diff -Naur fglrx-driver-14.12.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-14.12.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-05-21 19:37:07.871877002 +0200
-+++ fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-05-21 19:38:52.438059267 +0200
+diff -Naur fglrx-driver-15.5.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-15.5/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- fglrx-driver-15.5.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-07-06 19:55:22.758016328 +0200
++++ fglrx-driver-15.5/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-07-06 19:55:42.101651502 +0200
 @@ -4471,8 +4471,13 @@
  
      if (cpu_has_pge)
@@ -85,21 +81,9 @@
  }
  
  /** \brief Type definition for kas_spin_lock() parameter */
-diff -Naur fglrx-driver-14.12.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/kcl_acpi.c
---- fglrx-driver-14.12.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-05-21 19:37:07.871877002 +0200
-+++ fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-05-21 19:38:52.438059267 +0200
-@@ -831,7 +831,7 @@
- 
- static acpi_status KCL_ACPI_Slot_No_Hotplug(KCL_ACPI_DevHandle handle, u32 lvl, void *data, void **rv)
- {
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,7)
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,7) && LINUX_VERSION_CODE < KERNEL_VERSION(3,20,0)
-    struct acpi_device *tdev = NULL;
-    struct pci_dev *pdev = (struct pci_dev *)data;
-    int device = 0;
-diff -Naur fglrx-driver-14.12.orig/common/lib/modules/fglrx/build_mod/kcl_str.c fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/kcl_str.c
---- fglrx-driver-14.12.orig/common/lib/modules/fglrx/build_mod/kcl_str.c	2014-11-28 21:02:10.000000000 +0100
-+++ fglrx-driver-14.12/common/lib/modules/fglrx/build_mod/kcl_str.c	2015-05-21 19:38:52.442059201 +0200
+diff -Naur fglrx-driver-15.5.orig/common/lib/modules/fglrx/build_mod/kcl_str.c fglrx-driver-15.5/common/lib/modules/fglrx/build_mod/kcl_str.c
+--- fglrx-driver-15.5.orig/common/lib/modules/fglrx/build_mod/kcl_str.c	2015-06-02 18:47:29.000000000 +0200
++++ fglrx-driver-15.5/common/lib/modules/fglrx/build_mod/kcl_str.c	2015-07-06 19:55:42.105651426 +0200
 @@ -169,7 +169,7 @@
                                    const char* s2,
                                    KCL_TYPE_SizeSigned count)

Modified: fglrx-driver/trunk/debian/rules.defs
===================================================================
--- fglrx-driver/trunk/debian/rules.defs	2015-07-06 18:01:26 UTC (rev 1475)
+++ fglrx-driver/trunk/debian/rules.defs	2015-07-06 18:05:10 UTC (rev 1476)
@@ -1,5 +1,5 @@
 MULTIARCH		 = yes
-SIGNATURE_VERSION	 = 14.6~betav1.0-2014.07.11
+SIGNATURE_VERSION	 = 15.5
 XORG_ABI_LIST		 = 18 15 14 13 12 11 10 8 6.0
 
 #INSTALLER_PREFIX	 = amd-driver-installer-catalyst