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

[Patrick Matthäi]

Author: pmatthaei
Date: 2015-09-27 09:15:55 +0000 (Sun, 27 Sep 2015)
New Revision: 1523

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/11-4.1.0-gpl-only.patch
Log:
* Rewrite patch 11-4.1.0-gpl-only.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2015-09-27 09:01:49 UTC (rev 1522)
+++ fglrx-driver/trunk/debian/changelog	2015-09-27 09:15:55 UTC (rev 1523)
@@ -14,6 +14,7 @@
   * Rewrite patch 08-4.2.0-build.
   * Rewrite patch 09-4.2.0-build.fpregs_active.
   * Rewrite patch 10-4.2.0-build.copy_xregs_to_kernel.
+  * Rewrite patch 11-4.1.0-gpl-only.
 
  -- Andreas Beckmann <anbe at debian.org>  Sat, 19 Sep 2015 16:55:28 +0200
 

Modified: fglrx-driver/trunk/debian/patches/11-4.1.0-gpl-only.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/11-4.1.0-gpl-only.patch	2015-09-27 09:01:49 UTC (rev 1522)
+++ fglrx-driver/trunk/debian/patches/11-4.1.0-gpl-only.patch	2015-09-27 09:15:55 UTC (rev 1523)
@@ -1,9 +1,9 @@
 # Do not use pci_ignore_hotplug which is GPL only.
 
-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 19:01:13.000000000 +0200
-+++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-01 19:02:19.017611171 +0200
-@@ -1117,7 +1117,12 @@
+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 11:05:14.583194764 +0200
++++ fglrx-driver-15.9/common/lib/modules/fglrx/build_mod/firegl_public.c	2015-09-27 11:03:27.257085053 +0200
+@@ -1125,7 +1125,12 @@
      // directly here to allow suspend/resume without X server start. 
          firegl_pci_save_state((KCL_PCI_DevHandle)pdev, privdev);
          pci_disable_device(pdev);
@@ -17,15 +17,3 @@
  	pci_ignore_hotplug(pdev);
  #endif
          PMSG_EVENT(pdev->dev.power.power_state) = state;
-diff -Naur fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/kcl_acpi.c
---- fglrx-driver-15.7.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-09-01 19:01:13.000000000 +0200
-+++ fglrx-driver-15.7/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2015-09-01 19:02:19.017611171 +0200
-@@ -863,7 +863,7 @@
- #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)
-     if(pdev)
-     {
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0)
-        pci_ignore_hotplug(pdev);
- #else
-        pdev->ignore_hotplug = 1;