[Lunar-commits] r19426 - moonbase/trunk/zbeta/mesa-lib

[Moritz Heiber]

Author: moe
Date: 2006-03-24 22:05:19 +0000 (Fri, 24 Mar 2006)
New Revision: 19426

Added:
   moonbase/trunk/zbeta/mesa-lib/PRE_BUILD
Modified:
   moonbase/trunk/zbeta/mesa-lib/BUILD
   moonbase/trunk/zbeta/mesa-lib/DETAILS
Log:
This thing is now fully DRI capable .. and it builds DRI enabled
drivers ..
BUT
they don't work for some reason I have yet to figure out.
There are some warnings during the compilation process .. and I
have no idea how to get rid of them. Anyhow, much better than the
old module.

Now ships glx{info,gears} too.



Modified: moonbase/trunk/zbeta/mesa-lib/BUILD
===================================================================
--- moonbase/trunk/zbeta/mesa-lib/BUILD	2006-03-24 16:18:43 UTC (rev 19425)
+++ moonbase/trunk/zbeta/mesa-lib/BUILD	2006-03-24 22:05:19 UTC (rev 19426)
@@ -2,27 +2,26 @@
 
   MESA_PREFIX="/usr"
 
-  sedit 's/\/usr\/X11R6\/include/\/usr\/X11\/include/' configs/linux &&
-  sedit 's/\/usr\/X11R6\/lib/\/usr\/X11\/lib/' configs/linux &&
-  sedit 's/\/usr\/local/\/usr/' configs/default &&
-  sedit 's/PROGRAM_DIRS/#PROGRAM_DIRS/' configs/default &&
+  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	&&
+  
+  unpack $SOURCE2 &&
 
-  make linux && # This needs better detection (x86_64 in particular)
+  make linux-dri CFLAGS="${CFLAGS}" \
+		 CXXFLAGS="${CXXFLAGS}" \
+		 DRM_SOURCE_PATH="${SOURCE_DIRECTORY}/drm" &&
 
-  prepare_install				&&
+  prepare_install &&
 
+  bin/installmesa ${MESA_PREFIX}			&&
+  mkdir -v -p /usr/lib/X11/modules/dri			&&
+  install -v -m755 lib/*dri* /usr/lib/X11/modules/dri	&&
+
   install -m644 include/GLView.h \
-	  $MESA_PREFIX/include 			&&
+  	  $MESA_PREFIX/include &&
 
-  # We need to clean up before we install stuff as the old X11R6
-  # might still be lying around
+  cd progs/xdemos &&
+  make PROGS='glxinfo glxgears' &&
+  install -v -m755 glxinfo glxgears /usr/bin
 
-  rm -rf $MESA_PREFIX/include/GL 		&&
-  cp -r include/GL $MESA_PREFIX/include/ 	&&
-
-  for i in lib/*; do
-    rm -rf $MESA_PREFIX/$i
-    cp -a $i $MESA_PREFIX/lib/
-  done
- 
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/zbeta/mesa-lib/DETAILS
===================================================================
--- moonbase/trunk/zbeta/mesa-lib/DETAILS	2006-03-24 16:18:43 UTC (rev 19425)
+++ moonbase/trunk/zbeta/mesa-lib/DETAILS	2006-03-24 22:05:19 UTC (rev 19426)
@@ -1,12 +1,20 @@
 	  MODULE=mesa-lib
 	 VERSION=6.4.2
 	  SOURCE=MesaLib-$VERSION.tar.bz2
+	 SOURCE2=libdrm-beta.tar.bz2
+         SOURCE3=MesaDemos-$VERSION.tar.bz2
+	 SOURCE4=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
+     SOURCE3_URL=$SFORGE_URL/mesa3d/
+     SOURCE4_URL=$SFORGE_URL/mesa3d/
       SOURCE_VFY=sha1:4f042bdf38c9eb62e04660bd18566e7ca50d8640
+     SOURCE3_VFY=sha1:35b1ff78fc1bd1c303be754ad2ff4252ad6c0258
+     SOURCE4_VFY=sha1:f136387c3076cfb24a40a7e41cacc43359493771
 	 WEBSITE=http://www.mesa3d.org
 	 ENTERED=20060215
-	 UPDATED=20060215
+	 UPDATED=20060324
 	   SHORT="Mesa 3D library"
 cat << EOF
 Mesa is a 3-D graphics library with an API which is 

Added: moonbase/trunk/zbeta/mesa-lib/PRE_BUILD
===================================================================
--- moonbase/trunk/zbeta/mesa-lib/PRE_BUILD	                        (rev 0)
+++ moonbase/trunk/zbeta/mesa-lib/PRE_BUILD	2006-03-24 22:05:19 UTC (rev 19426)
@@ -0,0 +1,5 @@
+default_pre_build	&&
+cd $BUILD_DIRECTORY	&&
+unpack $SOURCE3		&&
+unpack $SOURCE4		&&
+cd $SOURCE_DIRECTORY