[Lunar-commits] r18293 - moonbase/trunk/zbeta/x11/xorg-server

[Moritz Heiber]

Author: moe
Date: 2006-01-24 14:39:02 +0000 (Tue, 24 Jan 2006)
New Revision: 18293

Added:
   moonbase/trunk/zbeta/x11/xorg-server/BUILD
   moonbase/trunk/zbeta/x11/xorg-server/PRE_BUILD
Removed:
   moonbase/trunk/zbeta/x11/xorg-server/CONFLICTS
Modified:
   moonbase/trunk/zbeta/x11/xorg-server/DETAILS
Log:
Adding Mesa3D support to xorg-server. This might even fix
Samuel's issues. I also deleted the CONFLICTS file .. we can
add it back afterwards.



Added: moonbase/trunk/zbeta/x11/xorg-server/BUILD
===================================================================
--- moonbase/trunk/zbeta/x11/xorg-server/BUILD	2006-01-24 10:52:11 UTC (rev 18292)
+++ moonbase/trunk/zbeta/x11/xorg-server/BUILD	2006-01-24 14:39:02 UTC (rev 18293)
@@ -0,0 +1,6 @@
+(
+  OPTS="$OPTS -with-mesa-source=${BUILD_DIRECTORY}/Mesa-${MESA_VERSION}" &&
+
+  default_build
+
+) > $C_FIFO 2>&1

Deleted: moonbase/trunk/zbeta/x11/xorg-server/CONFLICTS

Modified: moonbase/trunk/zbeta/x11/xorg-server/DETAILS
===================================================================
--- moonbase/trunk/zbeta/x11/xorg-server/DETAILS	2006-01-24 10:52:11 UTC (rev 18292)
+++ moonbase/trunk/zbeta/x11/xorg-server/DETAILS	2006-01-24 14:39:02 UTC (rev 18293)
@@ -1,12 +1,16 @@
           MODULE=xorg-server
          VERSION=X11R7.0-1.0.1
+    MESA_VERSION=6.4.1
           SOURCE=$MODULE-$VERSION.tar.bz2
+	 SOURCE2=MesaLib-${MESA_VERSION}.tar.bz2
       SOURCE_URL=ftp://ftp.x.org/pub/X11R7.0/src/everything/
+     SOURCE2_URL=$SFORGE_URL/mesa3d/
       SOURCE_VFY=sha1:7aa97457d83cd350831821900a432c4c0204d9ac
+     SOURCE2_VFY=sha1:efb70276ccd9cd13dbd7d5e581213a5ca3e4ef25
    MODULE_PREFIX=${X11R7_PREFIX:-/usr/X11R7}
         WEB_SITE=http://www.x.org/
          ENTERED=20060120
-         UPDATED=20060120
+         UPDATED=20060124
            SHORT="The X.org portable makefile generator"
 cat << EOF
 EOF

Added: moonbase/trunk/zbeta/x11/xorg-server/PRE_BUILD
===================================================================
--- moonbase/trunk/zbeta/x11/xorg-server/PRE_BUILD	2006-01-24 10:52:11 UTC (rev 18292)
+++ moonbase/trunk/zbeta/x11/xorg-server/PRE_BUILD	2006-01-24 14:39:02 UTC (rev 18293)
@@ -0,0 +1,2 @@
+default_pre_build &&
+unpack $SOURCE2