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

[Patrick Matthäi]

Author: pmatthaei
Date: 2011-01-07 17:15:40 +0000 (Fri, 07 Jan 2011)
New Revision: 532

Added:
   fglrx-driver/trunk/debian/patches/05-2.6.37-support.diff
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/patches/series
Log:
* Add patch 05-2.6.37-support.diff to add Linux 2.6.37 support.
  Closes: #609206


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-01-02 12:32:14 UTC (rev 531)
+++ fglrx-driver/trunk/debian/changelog	2011-01-07 17:15:40 UTC (rev 532)
@@ -1,8 +1,10 @@
 fglrx-driver (1:10-12-2) UNRELEASED; urgency=low
 
   * Add again the XS-Autobuild control flag, and I thought it is deprecated..
+  * Add patch 05-2.6.37-support.diff to add Linux 2.6.37 support.
+    Closes: #609206
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Thu, 16 Dec 2010 19:20:56 +0100
+ -- Patrick Matthäi <pmatthaei at debian.org>  Fri, 07 Jan 2011 18:14:59 +0100
 
 fglrx-driver (1:10-12-1) experimental; urgency=low
 

Added: fglrx-driver/trunk/debian/patches/05-2.6.37-support.diff
===================================================================
--- fglrx-driver/trunk/debian/patches/05-2.6.37-support.diff	                        (rev 0)
+++ fglrx-driver/trunk/debian/patches/05-2.6.37-support.diff	2011-01-07 17:15:40 UTC (rev 532)
@@ -0,0 +1,19 @@
+# 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-02 12:32:14 UTC (rev 531)
+++ fglrx-driver/trunk/debian/patches/series	2011-01-07 17:15:40 UTC (rev 532)
@@ -2,3 +2,4 @@
 02-dkms-arch_compat.diff
 03-authatieventsd.sh.diff
 04-2.6.36-support.diff
+05-2.6.37-support.diff