[Lunar-commits] r15504 - moonbase/trunk/x11/fglrx

[Aaron Watry]

Author: watryac04
Date: 2005-06-28 00:28:11 +0000 (Tue, 28 Jun 2005)
New Revision: 15504

Modified:
   moonbase/trunk/x11/fglrx/DETAILS
   moonbase/trunk/x11/fglrx/PRE_BUILD
Log:
Added patches that allow both compilation and acceleration under X.Org 
and kernel 2.6.12


Modified: moonbase/trunk/x11/fglrx/DETAILS
===================================================================
--- moonbase/trunk/x11/fglrx/DETAILS	2005-06-27 17:16:19 UTC (rev 15503)
+++ moonbase/trunk/x11/fglrx/DETAILS	2005-06-28 00:28:11 UTC (rev 15504)
@@ -1,14 +1,17 @@
           MODULE=fglrx
          VERSION=8.14.13
           SOURCE=${MODULE}_6_8_0-$VERSION-1.i386.rpm
-     	 #SOURCE2=lunar-$MODULE-8.10.19-warnings.patch
-	 #SOURCE3=lunar-$MODULE-8.10.19-drm.patch
+     	 SOURCE2=fglrx-8.14.13-2.6.12-alt-agp.patch.bz2
+	 SOURCE3=fglrx-8.14.13-2.6.12-agpgart.patch.bz2
+	 SOURCE4=fglrx-8.14.13-2.6.12-inter_module_get.patch.bz2
       SOURCE_URL=http://www2.ati.com/drivers/linux/
       SOURCE_VFY=sha1:4d9cc78bfbc4e1381c4ece25a97bb0137f7e8d6b
-     #SOURCE2_URL=$PATCH_URL/
-     #SOURCE2_VFY=sha1:85a706239b0fc06ad815213fc5f694fca3fc9a88
-     #SOURCE3_URL=$PATCH_URL/
-     #SOURCE3_VFY=sha1:e7e1afeb1baaa15e1998448cce6975c07475b3f3
+     SOURCE2_URL=$PATCH_URL/
+     SOURCE2_VFY=sha1:6d704ac215f326e9aa640bf7fb4a71a0dcf347d1
+     SOURCE3_URL=$PATCH_URL/
+     SOURCE3_VFY=sha1:a66f99e91cd8b113857cb7a764e3f03d96569c9c
+     SOURCE4_URL=$PATCH_URL/
+     SOURCE4_VFY=sha1:cc78ff8725ae1a361143e48e6362d46944057a0b
 	WEB_SITE=http://www.ati.com/
          ENTERED=20040220
          UPDATED=20050413

Modified: moonbase/trunk/x11/fglrx/PRE_BUILD
===================================================================
--- moonbase/trunk/x11/fglrx/PRE_BUILD	2005-06-27 17:16:19 UTC (rev 15503)
+++ moonbase/trunk/x11/fglrx/PRE_BUILD	2005-06-28 00:28:11 UTC (rev 15504)
@@ -2,10 +2,13 @@
 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:')
+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
+if [ `uname -r | cut -d. -f1,2` = "2.6" ]; then
+ if [ `uname -r | cut -d. -f,3` -ge 12 ]; then
+    cd $SOURCE_DIRECTORY/lib/modules/fglrx/build_mod &&
+    patch_it $SOURCE_CACHE/$SOURCE2 1 &&
+    patch_it $SOURCE_CACHE/$SOURCE3 0 &&
+    patch_it $SOURCE_CACHE/$SOURCE4 0
+ fi
+fi