[Lunar-commits] CVS: moonbase/x11/fglrx DETAILS, 1.14, 1.15 PRE_BUILD, 1.5, 1.6

[Moritz Heiber]

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

Modified Files:
	DETAILS PRE_BUILD 
Log Message:
Fixing the ati drivers.

Thank you ati for supplying the linux community
with broken drivers since 1998.


Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/fglrx/DETAILS,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- DETAILS	18 Feb 2005 17:24:31 -0000	1.14
+++ DETAILS	14 Mar 2005 16:31:07 -0000	1.15
@@ -1,12 +1,15 @@
           MODULE=fglrx
          VERSION=8.10.19
           SOURCE=${MODULE}_6_8_0-$VERSION-1.i386.rpm
-	 #SOURCE2=8.08-kernel-2.6.10.patch
+      	 SOURCE2=lunar-$MODULE-8.10.19-warnings.patch
+	 SOURCE3=lunar-$MODULE-8.10.19-drm.patch
       SOURCE_URL=http://www2.ati.com/drivers/linux/
       SOURCE_VFY=sha1:e47da5649c62553e06d0a7d145ade51507efa58d
-     #SOURCE2_URL=http://zinx.xmms.org/ati/$SOURCE2
-     #SOURCE2_VFY=sha1:98465c50d08b1e469e28e1edc5a02322450432a4
-        WEB_SITE=http://www.ati.com/
+     SOURCE2_URL=$PATCH_URL/
+     SOURCE2_VFY=sha1:85a706239b0fc06ad815213fc5f694fca3fc9a88
+     SOURCE3_URL=$PATCH_URL/
+     SOURCE3_VFY=sha1:e7e1afeb1baaa15e1998448cce6975c07475b3f3
+	WEB_SITE=http://www.ati.com/
          ENTERED=20040220
          UPDATED=20050218
            SHORT="Proprietary X.org driver for the ati 9x00."

Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/fglrx/PRE_BUILD,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- PRE_BUILD	22 Feb 2005 00:13:20 -0000	1.5
+++ PRE_BUILD	14 Mar 2005 16:31:07 -0000	1.6
@@ -2,17 +2,10 @@
 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:')
-
-#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
-
-
+cpio -i --no-absolute-filenames --make-directories < $(echo $SOURCE | sed 's:i386.rpm$:cpio:') &&
 
+if [ `uname -r | cut -d. -f1,2` = "2.6" ]; then
+    cd $SOURCE_DIRECTORY/lib/modules/fglrx/build_mod &&
+    patch_it $SOURCE_CACHE/$SOURCE2 0
+    patch_it $SOURCE_CACHE/$SOURCE3 0
+fi