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

[Andreas Beckmann]

Author: anbe
Date: 2014-02-13 13:23:39 +0000 (Thu, 13 Feb 2014)
New Revision: 1348

Removed:
   fglrx-driver/trunk/debian/patches/07-linux3.9.patch
   fglrx-driver/trunk/debian/patches/08-linux3.12.patch
   fglrx-driver/trunk/debian/patches/09-linux3.13.patch
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
drop obsolete patches

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2014-02-13 12:50:57 UTC (rev 1347)
+++ fglrx-driver/trunk/debian/changelog	2014-02-13 13:23:39 UTC (rev 1348)
@@ -3,6 +3,7 @@
   * New upstream beta release 14.1-beta v1.3 (2014-02-01) (13.35.1005).
     (Closes: #738622)
   * amd-libopencl1: Now supports OpenCL 2.0, too.
+  * linux3.9.patch, linux3.12.patch, linux3.13.patch: Drop, fixed upstream.
 
  -- Andreas Beckmann <anbe at debian.org>  Thu, 13 Feb 2014 11:29:54 +0100
 

Deleted: fglrx-driver/trunk/debian/patches/07-linux3.9.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/07-linux3.9.patch	2014-02-13 12:50:57 UTC (rev 1347)
+++ fglrx-driver/trunk/debian/patches/07-linux3.9.patch	2014-02-13 13:23:39 UTC (rev 1348)
@@ -1,20 +0,0 @@
-description: support linux >= 3.9
-origin: arch linux fglrx package
-
---- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-12-31 03:39:02.430533231 +0000
-+++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-12-31 03:39:06.000000000 +0000
-@@ -995,7 +995,11 @@
- #endif
-     {
-         return KCL_ACPI_ERROR;
--    }    
-+    }
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,1)
-+    ((acpi_tbl_table_handler)handler)(hdr);
-+#else
-     ((acpi_table_handler)handler)(hdr);
-+#endif
-     return KCL_ACPI_OK;
--}
-+}
-\ No newline at end of file

Deleted: fglrx-driver/trunk/debian/patches/08-linux3.12.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/08-linux3.12.patch	2014-02-13 12:50:57 UTC (rev 1347)
+++ fglrx-driver/trunk/debian/patches/08-linux3.12.patch	2014-02-13 13:23:39 UTC (rev 1348)
@@ -1,21 +0,0 @@
-description: support linux >= 3.12
-origin: http://ati.cchtml.com/show_bug.cgi?id=944
-
---- fglrx-driver-13.12.orig/common/lib/modules/fglrx/build_mod/firegl_public.c
-+++ fglrx-driver-13.12/common/lib/modules/fglrx/build_mod/firegl_public.c
-@@ -1754,11 +1754,15 @@ KCL_TYPE_Pid ATI_API_CALL KCL_GetTgid(vo
-  */
- KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void)
- {
-+#ifdef CONFIG_UIDGID_STRICT_TYPE_CHECKS
-+    return __kuid_val(current_euid());
-+#else
- #ifdef current_euid
-     return current_euid();
- #else
-     return current->euid;
- #endif
-+#endif
- }
- 
- /** /brief Delay execution for the specified number of microseconds

Deleted: fglrx-driver/trunk/debian/patches/09-linux3.13.patch
===================================================================
--- fglrx-driver/trunk/debian/patches/09-linux3.13.patch	2014-02-13 12:50:57 UTC (rev 1347)
+++ fglrx-driver/trunk/debian/patches/09-linux3.13.patch	2014-02-13 13:23:39 UTC (rev 1348)
@@ -1,16 +0,0 @@
-description: support linux >= 3.13
-origin: arch linux fglrx package
-
---- trunk.orig/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-12-31 03:06:46.733651137 +0000
-+++ trunk/common/lib/modules/fglrx/build_mod/kcl_acpi.c	2013-12-31 03:06:46.729651137 +0000
-@@ -792,7 +792,9 @@
- unsigned int ATI_API_CALL KCL_ACPI_GetHandles(kcl_match_info_t *pInfo)
- {
- #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
--    #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
-+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,13,0)
-+        pInfo->video_handle = pInfo->pcidev->dev.acpi_node.companion;
-+    #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
-         pInfo->video_handle = pInfo->pcidev->dev.acpi_node.handle;
-     #elif LINUX_VERSION_CODE > KERNEL_VERSION(2,6,19)
-         pInfo->video_handle = pInfo->pcidev->dev.archdata.acpi_handle;

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2014-02-13 12:50:57 UTC (rev 1347)
+++ fglrx-driver/trunk/debian/patches/series	2014-02-13 13:23:39 UTC (rev 1348)
@@ -1,7 +1,4 @@
 02-dkms-arch_compat.patch
 03-authatieventsd.sh.patch
 06-stub-for-agpless-kernel.patch
-07-linux3.9.patch
-08-linux3.12.patch
-09-linux3.13.patch
 10-iommu.patch