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

[Patrick Matthäi]

Author: pmatthaei
Date: 2011-01-26 18:23:29 +0000 (Wed, 26 Jan 2011)
New Revision: 538

Removed:
   fglrx-driver/trunk/debian/patches/04-2.6.36-support.diff
   fglrx-driver/trunk/debian/patches/05-2.6.37-support.diff
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
* New upstream release.
  - Remove merged patches 04-2.6.36-support.diff and 05-2.6.37-support.diff.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-01-26 18:18:54 UTC (rev 537)
+++ fglrx-driver/trunk/debian/changelog	2011-01-26 18:23:29 UTC (rev 538)
@@ -1,9 +1,11 @@
-fglrx-driver (1:10-12-3) UNRELEASED; urgency=low
+fglrx-driver (1:11-1-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+    - Remove merged patches 04-2.6.36-support.diff and 05-2.6.37-support.diff.
   * Remove deprecated fglrx-source.README.Debian and fglrx-driver.README.Debian.
     Closes: #611083
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Tue, 25 Jan 2011 18:32:38 +0100
+ -- Patrick Matthäi <pmatthaei at debian.org>  Wed, 26 Jan 2011 18:57:07 +0100
 
 fglrx-driver (1:10-12-2) experimental; urgency=low
 

Deleted: fglrx-driver/trunk/debian/patches/04-2.6.36-support.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/04-2.6.36-support.diff	2011-01-26 18:18:54 UTC (rev 537)
+++ fglrx-driver/trunk/debian/patches/04-2.6.36-support.diff	2011-01-26 18:23:29 UTC (rev 538)
@@ -1,30 +0,0 @@
-# This patch from Balázs Hámorszky adds Linux 2.6.36 support.
-# Closes: #598654
-
-diff -Naur fglrx-driver-10-10.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-10-10/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-10-10.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-10-31 10:29:03.000000000 +0100
-+++ fglrx-driver-10-10/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-10-31 10:29:27.000000000 +0100
-@@ -322,7 +322,11 @@
-     return firegl_release((KCL_IO_FILE_Handle)filp);
- }
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
-+int ip_firegl_ioctl(struct file* filp, unsigned int cmd, unsigned long arg)
-+#else
- int ip_firegl_ioctl(struct inode* inode, struct file* filp, unsigned int cmd, unsigned long arg)
-+#endif
- {
-     return firegl_ioctl((KCL_IO_FILE_Handle)filp, cmd, arg);
- }
-@@ -409,7 +413,11 @@
- #endif
-     open:    ip_firegl_open,
-     release: ip_firegl_release,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
-+    unlocked_ioctl:   ip_firegl_ioctl,
-+#else
-     ioctl:   ip_firegl_ioctl,
-+#endif
-     mmap:    ip_firegl_mmap,
- 
-     write:   ip_firegl_write,

Deleted: fglrx-driver/trunk/debian/patches/05-2.6.37-support.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/05-2.6.37-support.diff	2011-01-26 18:18:54 UTC (rev 537)
+++ fglrx-driver/trunk/debian/patches/05-2.6.37-support.diff	2011-01-26 18:23:29 UTC (rev 538)
@@ -1,19 +0,0 @@
-# This patch from Алексей Сорокин <sor.alexei at gmail.com> adds
-# Linux 2.6.37 support.
-# Closes: #609206
-
-diff -Naur fglrx-driver-10-12.orig/common/lib/modules/fglrx/build_mod/firegl_public.c fglrx-driver-10-12/common/lib/modules/fglrx/build_mod/firegl_public.c
---- fglrx-driver-10-12.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-01-07 18:10:43.000000000 +0100
-+++ fglrx-driver-10-12/common/lib/modules/fglrx/build_mod/firegl_public.c	2011-01-07 18:12:10.000000000 +0100
-@@ -5117,7 +5117,11 @@
- unsigned int ATI_API_CALL KAS_Mutex_Initialize(void* hMutex)
- {
-     kasMutex_t* mutex_obj = (kasMutex_t*)hMutex;
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)
-+	sema_init(&(mutex_obj->mutex),1);
-+#else
-     init_MUTEX(&(mutex_obj->mutex));
-+#endif
-     return 1;
- }
- 

Modified: fglrx-driver/trunk/debian/patches/series
===================================================================
--- fglrx-driver/trunk/debian/patches/series	2011-01-26 18:18:54 UTC (rev 537)
+++ fglrx-driver/trunk/debian/patches/series	2011-01-26 18:23:29 UTC (rev 538)
@@ -1,5 +1,3 @@
 01-CONFIG_X86_XEN.diff
 02-dkms-arch_compat.diff
 03-authatieventsd.sh.diff
-04-2.6.36-support.diff
-05-2.6.37-support.diff