[Lunar-commits] CVS: moonbase/x11/fglrx DETAILS, 1.11, 1.12 PRE_BUILD, 1.3, 1.4

[Aaron Watry]

Update of /var/cvs/lunar/moonbase/x11/fglrx
In directory espresso.foo-projects.org:/tmp/cvs-serv11007

Modified Files:
	DETAILS PRE_BUILD 
Log Message:
Adding patch for new fglrx version that is required to get fglrx module 
loaded in kernels >= 2.6.10


Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/fglrx/DETAILS,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- DETAILS	18 Jan 2005 01:02:27 -0000	1.11
+++ DETAILS	24 Jan 2005 16:54:09 -0000	1.12
@@ -1,14 +1,17 @@
           MODULE=fglrx
          VERSION=8.8.25
-          SOURCE=${MODULE}_6_8_0-${VERSION}-1.i386.rpm
+          SOURCE=${MODULE}_6_8_0-$VERSION-1.i386.rpm
+	 SOURCE2=8.08-kernel-2.6.10.patch
       SOURCE_URL=http://www2.ati.com/drivers/linux/
       SOURCE_VFY=sha1:3796d34190b4ad41e94bcd8f4578c4c1183a347e
+     SOURCE2_URL=http://zinx.xmms.org/ati/$SOURCE2
+     SOURCE2_VFY=sha1:98465c50d08b1e469e28e1edc5a02322450432a4
         WEB_SITE=http://www.ati.com/
          ENTERED=20040220
          UPDATED=20050118
-           SHORT="Proprietary xfree86 driver for the ati 9x00."
+           SHORT="Proprietary X.org driver for the ati 9x00."
 cat << EOF
-Proprietary xfree86 driver for the ATI 8500 and 9x00 series. Contains
+Proprietary X.Org driver for the ATI 8500 and 9x00 series. Contains
 binary kernel module (fglrx.o) and ATI's X11 tools, includes and GLX
 header files.
 EOF

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/fglrx/PRE_BUILD,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PRE_BUILD	5 Aug 2004 21:48:31 -0000	1.3
+++ PRE_BUILD	24 Jan 2005 16:54:09 -0000	1.4
@@ -2,6 +2,17 @@
 cd $SOURCE_DIRECTORY &&
 rpmunpack $SOURCE_CACHE/$SOURCE &&
 gunzip $(echo $SOURCE | sed 's:i386.rpm$:cpio.gz:') &&
-cpio -i --no-absolute-filenames --make-directories < $(echo $SOURCE | sed 's:i386.rpm$:cpio:')
-cd $SOURCE_DIRECTORY/lib/modules/fglrx/build_mod
-#patch_it $SOURCE_CACHE/$SOURCE2 1
+cpio -i --no-absolute-filenames --make-directories < $(echo $SOURCE | sed 's:i386.rpm$:cpio:') &&
+
+#The patch is only valid for 2.6.10 or higher, so skip it on others
+#Also, we can only compile against running kernels, so it is legal
+#to use uname to grab kernel version number.
+if [ `uname -r | cut -d. -f1,2` = "2.6" ]; then
+  if [ `uname -r | cut -d. -f3` -ge "10" ]; then
+    cd $SOURCE_DIRECTORY/lib/modules/fglrx/build_mod &&
+    patch_it $SOURCE_CACHE/$SOURCE2 0
+  fi
+fi
+
+
+