[Frugalware-git] ryuotesting5: catalyst-12.6-4-x86_64 * rebuild with kernel 3.5-1

[James Buren]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting5.git;a=commitdiff;h=8d1b84d4a34bda8790af120c5ec0f18dcd61eaae

commit 8d1b84d4a34bda8790af120c5ec0f18dcd61eaae
Author: James Buren <ryuo at frugalware.org>
Date:   Sun Jul 29 06:41:19 2012 -0500

catalyst-12.6-4-x86_64
* rebuild with kernel 3.5-1

diff --git a/source/x11-extra/catalyst/3.5.patch b/source/x11-extra/catalyst/3.5.patch
new file mode 100644
index 0000000..04248eb
--- /dev/null
+++ b/source/x11-extra/catalyst/3.5.patch
@@ -0,0 +1,50 @@
+--- a/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-15 18:30:13.483762070 +0200
++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c	2012-06-17 17:47:36.543041869 +0200
+@@ -2106,6 +2106,12 @@
+     }
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)
++# define NO_DO_MMAP
++# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f)
++# define do_munmap(a,b,c) vm_munmap(b, c)
++#endif
++
+ unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval(
+                                         KCL_IO_FILE_Handle file,
+                                         unsigned long addr,
+@@ -2117,10 +2123,13 @@
+
+     flags = MAP_SHARED;
+     prot  = PROT_READ|PROT_WRITE;
+-
++#ifdef NO_DO_MMAP
++    vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff);
++#else
+     down_write(&current->mm->mmap_sem);
+     vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff);
+     up_write(&current->mm->mmap_sem);
++#endif
+     if (IS_ERR(vaddr))
+        return 0;
+     else
+@@ -2131,7 +2140,9 @@
+ {
+     int retcode = 0;
+
++#ifndef NO_DO_MMAP
+     down_write(&current->mm->mmap_sem);
++#endif
+ #ifdef FGL_LINUX_RHEL_MUNMAP_API
+     retcode = do_munmap(current->mm,
+                         addr,
+@@ -2142,7 +2153,9 @@
+                         addr,
+                         len);
+ #endif
++#ifndef NO_DO_MMAP
+     up_write(&current->mm->mmap_sem);
++#endif
+     return retcode;
+ }
+
diff --git a/source/x11-extra/catalyst/FrugalBuild b/source/x11-extra/catalyst/FrugalBuild
index 3961a24..b019082 100644
--- a/source/x11-extra/catalyst/FrugalBuild
+++ b/source/x11-extra/catalyst/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=catalyst
pkgver=12.6
_ver="8.98"
-pkgrel=3
+pkgrel=4
pkgdesc="The proprietary driver for ATI graphics drivers."
url="http://www.amd.com"
rodepends=('xorg-server' 'libqtgui')
@@ -13,7 +13,7 @@ archs=('i686' 'x86_64' '!arm')
options=('nodocs')
# Disable up2date for now, as there's no reliable way to check this.
up2date="$pkgver"
-source=(http://www2.ati.com/drivers/hotfix/catalyst_${pkgver}_hotfixes/amd-driver-installer-${_ver}-x86.x86_64.zip $pkgname.install $pkgname.conf 3.4.patch)
+source=(http://www2.ati.com/drivers/hotfix/catalyst_${pkgver}_hotfixes/amd-driver-installer-${_ver}-x86.x86_64.zip $pkgname.install $pkgname.conf 3.4.patch 3.5.patch)
conflicts=('libgl' 'libglx' 'xf86-video-ati' 'xf86-video-mach64' 'xf86-video-r128')
provides=('libgl' 'libglx')
_F_kernelmod_scriptlet="$pkgname.install"
@@ -21,7 +21,8 @@ Finclude kernel-module
sha1sums=('c29f47c9c77d3c44e30ee7cf7e6c339e5c56d61e' \
'136fa6c693337189f7280ead54aec4d0ad02ebff' \
'2ca17ca649b4389786d0611c6fef4e41f5dfbd43' \
-          '3471dafbd92ee34d21821e9d2f7d2dd298c8239a')
+          '3471dafbd92ee34d21821e9d2f7d2dd298c8239a' \
+          'ea72791e5a9d79bc1ef7cc586ea479b6c9442acc')

build()
{