wok-stable rev 8099

Up: catalyst to 10.12.
author Christopher Rogers <slaxemulator@gmail.com>
date Sat Jan 22 16:06:23 2011 +0000 (2011-01-22)
parents 3aed8aae4b77
children c063ba959397
files catalyst/receipt catalyst/stuff/catalyst-2.6.36.patch catalyst/stuff/catalyst-2.6.37.patch catalyst/stuff/sema_init.patch
line diff
     1.1 --- a/catalyst/receipt	Sat Jan 22 14:34:37 2011 +0000
     1.2 +++ b/catalyst/receipt	Sat Jan 22 16:06:23 2011 +0000
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="catalyst"
     1.7 -VERSION="10.10"
     1.8 +VERSION="10.12"
     1.9  CATEGORY="x-window"
    1.10  MAINTAINER="jozee@slitaz.org"
    1.11  SHORT_DESC="AMD/ATI beta drivers (non-free) for Radeon brand cards "
     2.1 --- a/catalyst/stuff/catalyst-2.6.36.patch	Sat Jan 22 14:34:37 2011 +0000
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,26 +0,0 @@
     2.4 ---- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-08-20 21:51:48.000000000 +0200
     2.5 -+++ work/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-08-20 23:46:37.000000000 +0200
     2.6 -@@ -320,7 +320,11 @@
     2.7 -     return firegl_release((KCL_IO_FILE_Handle)filp);
     2.8 - }
     2.9 -
    2.10 -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
    2.11 -+int ip_firegl_ioctl(struct file* filp, unsigned int cmd, unsigned long arg)
    2.12 -+#else
    2.13 - int ip_firegl_ioctl(struct inode* inode, struct file* filp, unsigned int cmd, unsigned long arg)
    2.14 -+#endif
    2.15 - {
    2.16 -     return firegl_ioctl((KCL_IO_FILE_Handle)filp, cmd, arg);
    2.17 - }
    2.18 -@@ -407,7 +411,11 @@
    2.19 - #endif
    2.20 -     open:    ip_firegl_open,
    2.21 -     release: ip_firegl_release,
    2.22 -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
    2.23 -+    unlocked_ioctl:   ip_firegl_ioctl,
    2.24 -+#else
    2.25 -     ioctl:   ip_firegl_ioctl,
    2.26 -+#endif
    2.27 -     mmap:    ip_firegl_mmap,
    2.28 -
    2.29 -     write:   ip_firegl_write,
    2.30 \ No newline at end of file
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/catalyst/stuff/catalyst-2.6.37.patch	Sat Jan 22 16:06:23 2011 +0000
     3.3 @@ -0,0 +1,26 @@
     3.4 +--- work.orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-08-20 21:51:48.000000000 +0200
     3.5 ++++ work/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-08-20 23:46:37.000000000 +0200
     3.6 +@@ -320,7 +320,11 @@
     3.7 +     return firegl_release((KCL_IO_FILE_Handle)filp);
     3.8 + }
     3.9 +
    3.10 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
    3.11 ++int ip_firegl_ioctl(struct file* filp, unsigned int cmd, unsigned long arg)
    3.12 ++#else
    3.13 + int ip_firegl_ioctl(struct inode* inode, struct file* filp, unsigned int cmd, unsigned long arg)
    3.14 ++#endif
    3.15 + {
    3.16 +     return firegl_ioctl((KCL_IO_FILE_Handle)filp, cmd, arg);
    3.17 + }
    3.18 +@@ -407,7 +411,11 @@
    3.19 + #endif
    3.20 +     open:    ip_firegl_open,
    3.21 +     release: ip_firegl_release,
    3.22 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
    3.23 ++    unlocked_ioctl:   ip_firegl_ioctl,
    3.24 ++#else
    3.25 +     ioctl:   ip_firegl_ioctl,
    3.26 ++#endif
    3.27 +     mmap:    ip_firegl_mmap,
    3.28 +
    3.29 +     write:   ip_firegl_write,
    3.30 \ No newline at end of file
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/catalyst/stuff/sema_init.patch	Sat Jan 22 16:06:23 2011 +0000
     4.3 @@ -0,0 +1,12 @@
     4.4 +diff -Naur orig/common/lib/modules/fglrx/build_mod/firegl_public.c final/common/lib/modules/fglrx/build_mod/firegl_public.c
     4.5 +--- orig/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-09-22 03:15:33.000000000 -0400
     4.6 ++++ final/common/lib/modules/fglrx/build_mod/firegl_public.c	2010-11-01 23:00:32.672955001 -0400
     4.7 +@@ -5094,7 +5094,7 @@
     4.8 + unsigned int ATI_API_CALL KAS_Mutex_Initialize(void* hMutex)
     4.9 + {
    4.10 +     kasMutex_t* mutex_obj = (kasMutex_t*)hMutex;
    4.11 +-    init_MUTEX(&(mutex_obj->mutex));
    4.12 ++    sema_init(&(mutex_obj->mutex),1);
    4.13 +     return 1;
    4.14 + }
    4.15 +