[Lunar-commits] r22528 - moonbase/trunk/xorg7/mesa-glu

[Florin Braescu]

Author: florin
Date: 2006-12-10 11:46:26 +0100 (Sun, 10 Dec 2006)
New Revision: 22528

Modified:
   moonbase/trunk/xorg7/mesa-glu/BUILD
   moonbase/trunk/xorg7/mesa-glu/CONFLICTS
   moonbase/trunk/xorg7/mesa-glu/DEPENDS
   moonbase/trunk/xorg7/mesa-glu/DETAILS
   moonbase/trunk/xorg7/mesa-glu/PRE_BUILD
Log:
use libdrm. fix the compilation for mach64.

Modified: moonbase/trunk/xorg7/mesa-glu/BUILD
===================================================================
--- moonbase/trunk/xorg7/mesa-glu/BUILD	2006-12-10 09:30:25 UTC (rev 22527)
+++ moonbase/trunk/xorg7/mesa-glu/BUILD	2006-12-10 10:46:26 UTC (rev 22528)
@@ -2,11 +2,10 @@
 
   MESA_PREFIX="/usr"
 
-  find . -type f -exec sed -i 's@/usr/X11R6@/usr/X11 at g' {} \; &&
-  sed -i 's at lib/modules at lib/X11/modules@' src/glx/x11/dri_glx.c	&&
+  find . -type f -exec sed -i 's@/usr/X11R6@/usr/X11 at g' {} \;    &&
+  sed -i 's at lib/modules at lib/X11/modules@' src/glx/x11/dri_glx.c	 &&
+  sedit  "s:   blit.idx:// blit.idx:"     src/mesa/drivers/dri/mach64/mach64_ioctl.c  &&
    
-  unpack $SOURCE2 &&
-
   make linux-dri DRM_SOURCE_PATH="${SOURCE_DIRECTORY}/drm" &&
 
   prepare_install &&

Modified: moonbase/trunk/xorg7/mesa-glu/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/mesa-glu/CONFLICTS	2006-12-10 09:30:25 UTC (rev 22527)
+++ moonbase/trunk/xorg7/mesa-glu/CONFLICTS	2006-12-10 10:46:26 UTC (rev 22528)
@@ -1,3 +1,3 @@
-conflicts XOrg &&
-conflicts XOrg-test &&
+conflicts XOrg       &&
+conflicts XOrg-test  &&
 conflicts mesa-lib

Modified: moonbase/trunk/xorg7/mesa-glu/DEPENDS
===================================================================
--- moonbase/trunk/xorg7/mesa-glu/DEPENDS	2006-12-10 09:30:25 UTC (rev 22527)
+++ moonbase/trunk/xorg7/mesa-glu/DEPENDS	2006-12-10 10:46:26 UTC (rev 22528)
@@ -1,5 +1,6 @@
-depends glproto &&
-depends libX11  &&
-depends makedepend &&
-depends libXi   &&
+depends glproto      &&
+depends libX11       &&
+depends makedepend   &&
+depends libdrm       &&
+depends libXi        &&
 depends libXext

Modified: moonbase/trunk/xorg7/mesa-glu/DETAILS
===================================================================
--- moonbase/trunk/xorg7/mesa-glu/DETAILS	2006-12-10 09:30:25 UTC (rev 22527)
+++ moonbase/trunk/xorg7/mesa-glu/DETAILS	2006-12-10 10:46:26 UTC (rev 22528)
@@ -1,20 +1,18 @@
           MODULE=mesa-glu
          VERSION=6.5
           SOURCE=MesaLib-$VERSION.tar.bz2
-         SOURCE2=libdrm-cvs-beta.tar.bz2
-         SOURCE3=MesaDemos-$VERSION.tar.bz2
-         SOURCE4=MesaGLUT-$VERSION.tar.bz2
+         SOURCE2=MesaDemos-$VERSION.tar.bz2
+         SOURCE3=MesaGLUT-$VERSION.tar.bz2
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/Mesa-$VERSION
       SOURCE_URL=$SFORGE_URL/mesa3d/
-     SOURCE2_URL=cvs://:pserver:anonymous@anoncvs.freedesktop.org:/cvs/dri:drm
+     SOURCE2_URL=$SFORGE_URL/mesa3d/
      SOURCE3_URL=$SFORGE_URL/mesa3d/
-     SOURCE4_URL=$SFORGE_URL/mesa3d/
       SOURCE_VFY=sha1:a77368901b0731b662d0858aef2c405a7ddf6014
-     SOURCE3_VFY=sha1:9673c09df947a892955a850e9d86abc58dbf00c4 
-     SOURCE4_VFY=sha1:0c28b6634f0109116d57001c55dc66091ae272ed 
+     SOURCE2_VFY=sha1:9673c09df947a892955a850e9d86abc58dbf00c4 
+     SOURCE3_VFY=sha1:0c28b6634f0109116d57001c55dc66091ae272ed 
          WEBSITE=http://www.mesa3d.org
          ENTERED=20060215
-         UPDATED=20060901
+         UPDATED=20061210
            SHORT="Mesa 3D library"
 cat << EOF
 Mesa is a 3-D graphics library with an API which is 

Modified: moonbase/trunk/xorg7/mesa-glu/PRE_BUILD
===================================================================
--- moonbase/trunk/xorg7/mesa-glu/PRE_BUILD	2006-12-10 09:30:25 UTC (rev 22527)
+++ moonbase/trunk/xorg7/mesa-glu/PRE_BUILD	2006-12-10 10:46:26 UTC (rev 22528)
@@ -1,5 +1,5 @@
-default_pre_build	&&
-cd $BUILD_DIRECTORY	&&
-unpack $SOURCE3		&&
-unpack $SOURCE4		&&
+default_pre_build    &&
+cd $BUILD_DIRECTORY  &&
+unpack $SOURCE2      &&
+unpack $SOURCE3	     &&
 cd $SOURCE_DIRECTORY