# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1295712383 0
# Node ID 0e0263019e741700f013507a74fad391fb904b96
# Parent  3aed8aae4b774944232292e272240f1b3250f9f6
Up: catalyst to 10.12.

diff -r 3aed8aae4b77 -r 0e0263019e74 catalyst/receipt
--- a/catalyst/receipt	Sat Jan 22 14:34:37 2011 +0000
+++ b/catalyst/receipt	Sat Jan 22 16:06:23 2011 +0000
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="catalyst"
-VERSION="10.10"
+VERSION="10.12"
 CATEGORY="x-window"
 MAINTAINER="jozee@slitaz.org"
 SHORT_DESC="AMD/ATI beta drivers (non-free) for Radeon brand cards "
diff -r 3aed8aae4b77 -r 0e0263019e74 catalyst/stuff/catalyst-2.6.36.patch
--- a/catalyst/stuff/catalyst-2.6.36.patch	Sat Jan 22 14:34:37 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
---- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-08-20 21:51:48.000000000 +0200
-+++ work/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-08-20 23:46:37.000000000 +0200
-@@ -320,7 +320,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);
- }
-@@ -407,7 +411,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,
\ No newline at end of file
diff -r 3aed8aae4b77 -r 0e0263019e74 catalyst/stuff/catalyst-2.6.37.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/catalyst/stuff/catalyst-2.6.37.patch	Sat Jan 22 16:06:23 2011 +0000
@@ -0,0 +1,26 @@
+--- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-08-20 21:51:48.000000000 +0200
++++ work/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-08-20 23:46:37.000000000 +0200
+@@ -320,7 +320,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);
+ }
+@@ -407,7 +411,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,
\ No newline at end of file
diff -r 3aed8aae4b77 -r 0e0263019e74 catalyst/stuff/sema_init.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/catalyst/stuff/sema_init.patch	Sat Jan 22 16:06:23 2011 +0000
@@ -0,0 +1,12 @@
+diff -Naur orig/common/lib/modules/fglrx/build_mod/firegl_public.c final/common/lib/modules/fglrx/build_mod/firegl_public.c
+--- orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-09-22 03:15:33.000000000 -0400
++++ final/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-11-01 23:00:32.672955001 -0400
+@@ -5094,7 +5094,7 @@
+ unsigned int ATI_API_CALL KAS_Mutex_Initialize(void* hMutex)
+ {
+     kasMutex_t* mutex_obj = (kasMutex_t*)hMutex;
+-    init_MUTEX(&(mutex_obj->mutex));
++    sema_init(&(mutex_obj->mutex),1);
+     return 1;
+ }
+