[arch-commits] CVS update of extra/modules/fglrx-ck (2.6.22.patch PKGBUILD)

[Tom Killian]

    Date: Tuesday, July 24, 2007 @ 05:23:38
  Author: tom
    Path: /home/cvs-extra/extra/modules/fglrx-ck

   Added: 2.6.22.patch (1.1)
Modified: PKGBUILD (1.5 -> 1.6)

upgpkg: fglrx-ck 8.38.6-2
update for 2.6.22-ck


--------------+
 2.6.22.patch |   17 +++++++++++++++++
 PKGBUILD     |   24 ++++++++++++------------
 2 files changed, 29 insertions(+), 12 deletions(-)


Index: extra/modules/fglrx-ck/2.6.22.patch
diff -u /dev/null extra/modules/fglrx-ck/2.6.22.patch:1.1
--- /dev/null	Tue Jul 24 05:23:38 2007
+++ extra/modules/fglrx-ck/2.6.22.patch	Tue Jul 24 05:23:38 2007
@@ -0,0 +1,17 @@
+--- firegl_public.c-orig 2007-05-16 14:52:12.000000000 -0500
++++ firegl_public.c 2007-05-16 14:52:48.000000000 -0500
+@@ -144,12 +144,14 @@
+ #define EXPORT_NO_SYMBOLS
+ #endif
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
+ #ifdef __x86_64__
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,12)
+ #include "linux/ioctl32.h"
+ #else
+ #include "asm/ioctl32.h"
+ #endif
++#endif
+ 
+ #ifdef __x86_64__
+ #include "asm/compat.h"
Index: extra/modules/fglrx-ck/PKGBUILD
diff -u extra/modules/fglrx-ck/PKGBUILD:1.5 extra/modules/fglrx-ck/PKGBUILD:1.6
--- extra/modules/fglrx-ck/PKGBUILD:1.5	Sun Jul  8 10:23:44 2007
+++ extra/modules/fglrx-ck/PKGBUILD	Tue Jul 24 05:23:38 2007
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD,v 1.5 2007/07/08 14:23:44 travis Exp $
+# $Id: PKGBUILD,v 1.6 2007/07/24 09:23:38 tom Exp $
 # Maintainer: Travis Willard <travisw at wmpub.ca>
 # Contributor: amdviaman
 
 pkgname=fglrx-ck
 pkgver=8.38.6
-_kernel_version=2.6.21
-pkgrel=1
-pkgdesc="Proprietary -ck kernel drivers/modules for the AMD/ATI RADEON (9500 and later), \
+_kernel_version=2.6.22
+pkgrel=2
+pkgdesc="Proprietary -ARCH kernel drivers/modules for the AMD/ATI RADEON (9500 and later), \
          MOBILITY RADEON (M10 and later), RADEON XPRESS IGP and FireGL (Z1 and later) video cards."
 arch=('i686' 'x86_64')
 url="http://www.ati.com"
 license=('custom:"ATI"') #license provided by ati-fglrx-utils package
-depends=("fglrx-utils>=${pkgver}" "kernel26ck>=${_kernel_version}.ck0")
+depends=("fglrx-utils>=${pkgver}" "kernel26ck>=${_kernel_version}")
 makedepends=()
-replaces=('ati-fglrx-ck')
-install=$pkgname.install
-source=(http://www2.ati.com/drivers/linux/ati-driver-installer-$pkgver-x86.x86_64.run)
-md5sums=('750eb0b5fa996d40b3ca52542c78154b')
-sha1sums=('a4320c6d3c6716740971c18bbd5e62b0b452cc67')
+replaces=('ati-fglrx')
+install=fglrx.install
+source=(http://www2.ati.com/drivers/linux/ati-driver-installer-$pkgver-x86.x86_64.run 2.6.22.patch)
+md5sums=('750eb0b5fa996d40b3ca52542c78154b' '4806f1d58a09e5b9aecb7437609a49ea')
+sha1sums=('a4320c6d3c6716740971c18bbd5e62b0b452cc67' 'e96447f62b1343eeee8b95e64d4c1dfc6ee540c9')
 
 _kernver=${_kernel_version}-ck
 
@@ -43,7 +43,8 @@
     cd $startdir/src/lib/modules/fglrx/build_mod/
 
     # Build the kernel module
-    # patch -Np0 -i $startdir/src/firegl_public.patch || return 1
+    patch -Np0 -i $startdir/src/2.6.22.patch || return 1
+
     cp 2.6.x/Makefile .
     make -C /lib/modules/${_kernver}/build SUBDIRS="`pwd`" modules || return 1
 
@@ -54,4 +55,3 @@
     sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" $startdir/$install
 
 }
-