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

[Thomas Baechler]

    Date: Monday, July 9, 2007 @ 16:33:02
  Author: thomas
    Path: /home/cvs-extra/extra/modules/fglrx

   Added: 2.6.22.patch (1.1)
Modified: PKGBUILD (1.4 -> 1.5) fglrx.install (1.2 -> 1.3)

upgpkg: fglrx 8.38.6-2


---------------+
 2.6.22.patch  |   17 +++++++++++++++++
 PKGBUILD      |   16 ++++++++--------
 fglrx.install |    6 +++---
 3 files changed, 28 insertions(+), 11 deletions(-)


Index: extra/modules/fglrx/2.6.22.patch
diff -u /dev/null extra/modules/fglrx/2.6.22.patch:1.1
--- /dev/null	Mon Jul  9 16:33:02 2007
+++ extra/modules/fglrx/2.6.22.patch	Mon Jul  9 16:33:02 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/PKGBUILD
diff -u extra/modules/fglrx/PKGBUILD:1.4 extra/modules/fglrx/PKGBUILD:1.5
--- extra/modules/fglrx/PKGBUILD:1.4	Sun Jul  8 10:23:34 2007
+++ extra/modules/fglrx/PKGBUILD	Mon Jul  9 16:33:02 2007
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD,v 1.4 2007/07/08 14:23:34 travis Exp $
+# $Id: PKGBUILD,v 1.5 2007/07/09 20:33:02 thomas Exp $
 # Maintainer: Travis Willard <travisw at wmpub.ca>
 # Contributor: amdviaman
 
 pkgname=fglrx
 pkgver=8.38.6
-_kernel_version=2.6.21
-pkgrel=1
+_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')
@@ -15,9 +15,9 @@
 makedepends=()
 replaces=('ati-fglrx')
 install=$pkgname.install
-source=(http://www2.ati.com/drivers/linux/ati-driver-installer-$pkgver-x86.x86_64.run)
-md5sums=('750eb0b5fa996d40b3ca52542c78154b')
-sha1sums=('a4320c6d3c6716740971c18bbd5e62b0b452cc67')
+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}-ARCH
 
@@ -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
 
 }
-
Index: extra/modules/fglrx/fglrx.install
diff -u extra/modules/fglrx/fglrx.install:1.2 extra/modules/fglrx/fglrx.install:1.3
--- extra/modules/fglrx/fglrx.install:1.2	Sat Apr 28 09:15:48 2007
+++ extra/modules/fglrx/fglrx.install	Mon Jul  9 16:33:02 2007
@@ -13,20 +13,20 @@
   echo "You can use the tool 'aticonfig' to generate an xorg.conf file."
   echo "Remember to add fglrx to the MODULES list in /etc/rc.conf."
   echo "--------------------------------------------------------------"
-  KERNEL_VERSION=2.6.21-ARCH
+  KERNEL_VERSION=2.6.22-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-  KERNEL_VERSION=2.6.21-ARCH
+  KERNEL_VERSION=2.6.22-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }
 
 # arg 1:  the old package version
 post_remove() {
-  KERNEL_VERSION=2.6.21-ARCH
+  KERNEL_VERSION=2.6.22-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
 }