[Lunar-commits] r22492 - moonbase/trunk/xorg7/mesa-lib

[Auke Kok]

Author: sofar
Date: 2006-12-07 07:01:46 +0100 (Thu, 07 Dec 2006)
New Revision: 22492

Removed:
   moonbase/trunk/xorg7/mesa-lib/BUILD.x86_64
Modified:
   moonbase/trunk/xorg7/mesa-lib/BUILD
   moonbase/trunk/xorg7/mesa-lib/DETAILS
Log:
Bump version to 6.5.2, make it arch independent by using only 1 BUILD, and revamp the install code and sedits to consolidate.

r300 and mach drivers now also compile :)


Modified: moonbase/trunk/xorg7/mesa-lib/BUILD
===================================================================
--- moonbase/trunk/xorg7/mesa-lib/BUILD	2006-12-07 04:57:08 UTC (rev 22491)
+++ moonbase/trunk/xorg7/mesa-lib/BUILD	2006-12-07 06:01:46 UTC (rev 22492)
@@ -1,27 +1,24 @@
 (
 
-  MESA_PREFIX="/usr"
+  sedit 's,/usr/X11R6/lib/modules,/usr/lib/X11/modules,' configs/default &&
+  sedit 's,/usr/X11R6,/usr/X11,g' configs/linux* configs/default &&
+  sedit 's,lib64,lib,g' configs/linux* configs/default &&
+  sedit 's,usr/local,usr,g' configs/linux* configs/default &&
+  sedit 's,lib/modules,lib/X11/modules,g' src/glx/x11/dri_glx.c &&
 
-  # Disabled these for now as they do not compile
-  sedit 's/mach64\ //g' configs/linux-dri &&
-  sedit 's/r300\ //g' configs/linux-dri &&
+  case `arch` in
+    x86_64) CONF=linux-dri-x86-64 ;;
+    i?86)   CONF=linux-dri-x86 ;;
+    *)      exit 1 ;;
+  esac &&
 
-  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	&&
+  make $CONF && 
+  make -C progs/xdemos PROGS='glxinfo glxgears' &&
 
-  make linux-dri-x86 && 
-
   prepare_install &&
 
-  bin/installmesa ${MESA_PREFIX}			&&
-  mkdir -v -p /usr/lib/X11/modules/dri			&&
-  install -v -m755 lib/*dri* /usr/lib/X11/modules/dri	&&
+  make install						&&
+  install -v -m644 include/GLView.h /usr/include/	&&
+  install -v -m755 progs/xdemos/glxinfo progs/xdemos/glxgears /usr/bin
 
-  install -m644 include/GLView.h \
-  	  $MESA_PREFIX/include &&
-
-  cd progs/xdemos &&
-  make PROGS='glxinfo glxgears' &&
-  install -v -m755 glxinfo glxgears /usr/bin
-
 ) > $C_FIFO 2>&1

Deleted: moonbase/trunk/xorg7/mesa-lib/BUILD.x86_64

Modified: moonbase/trunk/xorg7/mesa-lib/DETAILS
===================================================================
--- moonbase/trunk/xorg7/mesa-lib/DETAILS	2006-12-07 04:57:08 UTC (rev 22491)
+++ moonbase/trunk/xorg7/mesa-lib/DETAILS	2006-12-07 06:01:46 UTC (rev 22492)
@@ -1,5 +1,5 @@
            MODULE=mesa-lib
-          VERSION=6.5
+          VERSION=6.5.2
            SOURCE=MesaLib-$VERSION.tar.bz2
           SOURCE2=MesaDemos-$VERSION.tar.bz2
           SOURCE3=MesaGLUT-$VERSION.tar.bz2
@@ -7,12 +7,12 @@
        SOURCE_URL=$SFORGE_URL/mesa3d/
       SOURCE2_URL=$SFORGE_URL/mesa3d/
       SOURCE3_URL=$SFORGE_URL/mesa3d/
-       SOURCE_VFY=sha1:a77368901b0731b662d0858aef2c405a7ddf6014
-      SOURCE2_VFY=sha1:9673c09df947a892955a850e9d86abc58dbf00c4
-      SOURCE3_VFY=sha1:0c28b6634f0109116d57001c55dc66091ae272ed 
+       SOURCE_VFY=sha1:ba860bb6ee57c02202342dfd5927464a068ea18f
+      SOURCE2_VFY=sha1:beac8b2fa9c6e25efd44b911d2d7952b2f87534c
+      SOURCE3_VFY=sha1:a02fc735cff65cee9ee4ff56568c46c0a3a19dfa
           WEBSITE=http://www.mesa3d.org
           ENTERED=20060215
-          UPDATED=20060901
+          UPDATED=20061206
             PSAFE="no"
             SHORT="Mesa 3D library"