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

[Moritz Heiber]

Author: moe
Date: 2006-12-11 13:36:51 +0100 (Mon, 11 Dec 2006)
New Revision: 22538

Modified:
   moonbase/trunk/xorg7/mesa-glu/BUILD
   moonbase/trunk/xorg7/mesa-glu/DETAILS
Log:
Fixed this module with the changes sofar made to mesa-lib.
Also updated it to 6.5.2.



Modified: moonbase/trunk/xorg7/mesa-glu/BUILD
===================================================================
--- moonbase/trunk/xorg7/mesa-glu/BUILD	2006-12-11 02:34:03 UTC (rev 22537)
+++ moonbase/trunk/xorg7/mesa-glu/BUILD	2006-12-11 12:36:51 UTC (rev 22538)
@@ -1,23 +1,28 @@
 (
 
-  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 &&
 
-  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  &&
-   
-  make linux-dri DRM_SOURCE_PATH="${SOURCE_DIRECTORY}/drm" &&
+  case `arch` in
+    x86_64) CONF=linux-dri-x86-64 ;;
+    i?86)   CONF=linux-dri-x86 ;;
+    *)      exit 1 ;;
+  esac &&
 
+  make $CONF && 
+  make -C progs/xdemos PROGS='glxinfo glxgears' &&
+
   prepare_install &&
 
-  cp -a lib/libGLU.so* ${MESA_PREFIX}/lib/ &&
-  cp -a include/GL/glu*.h ${MESA_PREFIX}/include/GL/ &&
+  cp -a lib/libGLU.so* /usr/lib/ &&
+  cp -a include/GL/glu*.h /usr/include/GL/ &&
 
   install -m644 include/GLView.h \
   	  $MESA_PREFIX/include &&
 
-  cd progs/xdemos &&
-  make PROGS='glxinfo glxgears' &&
-  install -v -m755 glxinfo glxgears /usr/bin
+  install -m755 progs/xdemos/glxinfo progs/xdemos/glxgears /usr/bin
 
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/xorg7/mesa-glu/DETAILS
===================================================================
--- moonbase/trunk/xorg7/mesa-glu/DETAILS	2006-12-11 02:34:03 UTC (rev 22537)
+++ moonbase/trunk/xorg7/mesa-glu/DETAILS	2006-12-11 12:36:51 UTC (rev 22538)
@@ -1,5 +1,5 @@
           MODULE=mesa-glu
-         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=20061210
+         UPDATED=20061211
            SHORT="Mesa 3D library"
 cat << EOF
 Mesa is a 3-D graphics library with an API which is