[Lunar-commits] r20433 - in moonbase/branches/crater: . xgl xgl/compiz-cvs xgl/glitz-cvs xgl/mesa-cvs xgl/xgl-cvs xorg-7.0/xorg-server xorg-7.1/xorg-server

Samuel Verstraete elangelo at lunar-linux.org
Sat Jun 17 17:52:17 UTC 2006


Author: elangelo
Date: 2006-06-17 17:52:17 +0000 (Sat, 17 Jun 2006)
New Revision: 20433

Added:
   moonbase/branches/crater/xgl/
   moonbase/branches/crater/xgl/compiz-cvs/
   moonbase/branches/crater/xgl/compiz-cvs/BUILD
   moonbase/branches/crater/xgl/compiz-cvs/CONFLICTS
   moonbase/branches/crater/xgl/compiz-cvs/DEPENDS
   moonbase/branches/crater/xgl/compiz-cvs/DETAILS
   moonbase/branches/crater/xgl/glitz-cvs/
   moonbase/branches/crater/xgl/glitz-cvs/BUILD
   moonbase/branches/crater/xgl/glitz-cvs/CONFLICTS
   moonbase/branches/crater/xgl/glitz-cvs/DEPENDS
   moonbase/branches/crater/xgl/glitz-cvs/DETAILS
   moonbase/branches/crater/xgl/mesa-cvs/
   moonbase/branches/crater/xgl/mesa-cvs/BUILD
   moonbase/branches/crater/xgl/mesa-cvs/CONFLICTS
   moonbase/branches/crater/xgl/mesa-cvs/DEPENDS
   moonbase/branches/crater/xgl/mesa-cvs/DETAILS
   moonbase/branches/crater/xgl/xgl-cvs/
   moonbase/branches/crater/xgl/xgl-cvs/BUILD
   moonbase/branches/crater/xgl/xgl-cvs/CONFLICTS
   moonbase/branches/crater/xgl/xgl-cvs/DEPENDS
   moonbase/branches/crater/xgl/xgl-cvs/DETAILS
   moonbase/branches/crater/xgl/xgl-cvs/PRE_BUILD
   moonbase/branches/crater/xgl/xgl-cvs/xgl-xinerama.patch
   moonbase/branches/crater/xorg-7.0/xorg-server/CONFIGURE
   moonbase/branches/crater/xorg-7.1/xorg-server/CONFIGURE
Modified:
   moonbase/branches/crater/xorg-7.0/xorg-server/BUILD
   moonbase/branches/crater/xorg-7.1/xorg-server/BUILD
Log:
xgl in da HOUSE...
and a nice fix for xorg-server on the glx libs :)
gr,S.


Added: moonbase/branches/crater/xgl/compiz-cvs/BUILD
===================================================================
--- moonbase/branches/crater/xgl/compiz-cvs/BUILD	                        (rev 0)
+++ moonbase/branches/crater/xgl/compiz-cvs/BUILD	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,10 @@
+(
+  . /etc/profile.d/x11r7.rc &&
+
+   ./autogen.sh --build=$BUILD					\
+                --prefix=${X11R7_PREFIX:-/usr}	\
+		--with-gl-libs="/usr/src/tmp_mesa-cvs/lib/libGL.a -pthread -ldrm"
+                $OPTS                                           &&
+  default_make
+
+) > $C_FIFO 2>&1

Added: moonbase/branches/crater/xgl/compiz-cvs/CONFLICTS
===================================================================
--- moonbase/branches/crater/xgl/compiz-cvs/CONFLICTS	                        (rev 0)
+++ moonbase/branches/crater/xgl/compiz-cvs/CONFLICTS	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,6 @@
+conflicts XOrg  &&
+conflicts XOrg-test &&
+conflicts XOrg-fonts-base &&
+conflicts XOrg-fonts-extra &&
+conflicts XOrg-drm &&
+conflicts XOrg-drm-cvs

Added: moonbase/branches/crater/xgl/compiz-cvs/DEPENDS
===================================================================
--- moonbase/branches/crater/xgl/compiz-cvs/DEPENDS	                        (rev 0)
+++ moonbase/branches/crater/xgl/compiz-cvs/DEPENDS	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,4 @@
+depends control-center2	&&
+depends XOrg7	&&
+depends glitz-cvs	&&
+depends	mesa-cvs

Added: moonbase/branches/crater/xgl/compiz-cvs/DETAILS
===================================================================
--- moonbase/branches/crater/xgl/compiz-cvs/DETAILS	                        (rev 0)
+++ moonbase/branches/crater/xgl/compiz-cvs/DETAILS	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,14 @@
+          MODULE=compiz-cvs
+             MOD=compiz
+         VERSION=cvs
+          SOURCE=$MOD.tar.bz2
+      SOURCE_URL=cvs://:pserver:anonymous@anoncvs.freedesktop.org:/cvs/xorg:app/$MOD
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD
+        WEB_SITE=http://www.freedesktop.org/wiki/Software/Xgl
+         ENTERED=20060531
+         UPDATED=`date -u +%Y%m%d`
+           SHORT="Compiz-cvs"
+
+cat << EOF
+Compiz-cvs
+EOF

Added: moonbase/branches/crater/xgl/glitz-cvs/BUILD
===================================================================
--- moonbase/branches/crater/xgl/glitz-cvs/BUILD	                        (rev 0)
+++ moonbase/branches/crater/xgl/glitz-cvs/BUILD	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,9 @@
+(
+  . /etc/profile.d/x11r7.rc &&
+
+   ./autogen.sh --build=$BUILD					\
+                --prefix=${X11R7_PREFIX:-/usr}	\
+                $OPTS                                           &&
+  default_make
+
+) > $C_FIFO 2>&1

Added: moonbase/branches/crater/xgl/glitz-cvs/CONFLICTS
===================================================================
--- moonbase/branches/crater/xgl/glitz-cvs/CONFLICTS	                        (rev 0)
+++ moonbase/branches/crater/xgl/glitz-cvs/CONFLICTS	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,6 @@
+conflicts XOrg  &&
+conflicts XOrg-test &&
+conflicts XOrg-fonts-base &&
+conflicts XOrg-fonts-extra &&
+conflicts XOrg-drm &&
+conflicts XOrg-drm-cvs

Added: moonbase/branches/crater/xgl/glitz-cvs/DEPENDS
===================================================================
--- moonbase/branches/crater/xgl/glitz-cvs/DEPENDS	                        (rev 0)
+++ moonbase/branches/crater/xgl/glitz-cvs/DEPENDS	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1 @@
+depends XOrg7

Added: moonbase/branches/crater/xgl/glitz-cvs/DETAILS
===================================================================
--- moonbase/branches/crater/xgl/glitz-cvs/DETAILS	                        (rev 0)
+++ moonbase/branches/crater/xgl/glitz-cvs/DETAILS	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,14 @@
+          MODULE=glitz-cvs
+             MOD=glitz
+         VERSION=cvs
+          SOURCE=$MOD.tar.bz2
+      SOURCE_URL=cvs://:pserver:anonymous@anoncvs.freedesktop.org:/cvs/cairo/:$MOD
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD
+        WEB_SITE=http://www.freedesktop.org/wiki/Software/Xgl
+         ENTERED=20060531
+         UPDATED=`date -u +%Y%m%d`
+           SHORT="Glitz-cvs"
+
+cat << EOF
+Glitz-cvs
+EOF

Added: moonbase/branches/crater/xgl/mesa-cvs/BUILD
===================================================================
--- moonbase/branches/crater/xgl/mesa-cvs/BUILD	                        (rev 0)
+++ moonbase/branches/crater/xgl/mesa-cvs/BUILD	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,9 @@
+(
+	mkdir -p /usr/src/tmp_mesa-cvs	&&
+	cp -rf * /usr/src/tmp_mesa-cvs/ &&
+	cd /usr/src/tmp_mesa-cvs/	&&
+	echo "MKLIB_OPTIONS = -static" >> configs/linux-indirect	&&
+	prepare_install
+	make linux-indirect
+	rm -fr /usr/src/Mesa
+) > $C_FIFO 2>&1

Added: moonbase/branches/crater/xgl/mesa-cvs/CONFLICTS
===================================================================
--- moonbase/branches/crater/xgl/mesa-cvs/CONFLICTS	                        (rev 0)
+++ moonbase/branches/crater/xgl/mesa-cvs/CONFLICTS	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,6 @@
+conflicts XOrg  &&
+conflicts XOrg-test &&
+conflicts XOrg-fonts-base &&
+conflicts XOrg-fonts-extra &&
+conflicts XOrg-drm &&
+conflicts XOrg-drm-cvs

Added: moonbase/branches/crater/xgl/mesa-cvs/DEPENDS
===================================================================
--- moonbase/branches/crater/xgl/mesa-cvs/DEPENDS	                        (rev 0)
+++ moonbase/branches/crater/xgl/mesa-cvs/DEPENDS	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,4 @@
+depends glproto &&
+depends libX11  &&
+depends makedepend &&
+depends libXext

Added: moonbase/branches/crater/xgl/mesa-cvs/DETAILS
===================================================================
--- moonbase/branches/crater/xgl/mesa-cvs/DETAILS	                        (rev 0)
+++ moonbase/branches/crater/xgl/mesa-cvs/DETAILS	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,14 @@
+          MODULE=mesa-cvs
+             MOD=Mesa
+         VERSION=cvs
+          SOURCE=$MOD.tar.bz2
+      SOURCE_URL=http://merlin.ugent.be/lunar
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD
+        WEB_SITE=http://www.freedesktop.org/wiki/Software/Xgl
+         ENTERED=20060531
+         UPDATED=`date -u +%Y%m%d`
+           SHORT="mesa-cvs"
+
+cat << EOF
+mesa-cvs
+EOF

Added: moonbase/branches/crater/xgl/xgl-cvs/BUILD
===================================================================
--- moonbase/branches/crater/xgl/xgl-cvs/BUILD	                        (rev 0)
+++ moonbase/branches/crater/xgl/xgl-cvs/BUILD	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,27 @@
+(
+  . /etc/profile.d/x11r7.rc &&
+   cd xorg &&
+   patch -p 1 -i ${SCRIPT_DIRECTORY}/xgl-xinerama.patch &&
+   ./autogen.sh --build=$BUILD                                  \
+                --libdir=/usr/lib                               \
+                --prefix=${X11R7_PREFIX:-/usr}                  \
+                --infodir=/usr/share/info                       \
+                --mandir=/usr/man                               \
+                --with-fontdir=/usr/share/fonts                 \
+                --enable-xgl                                    \
+                --disable-xorg                                  \
+                --disable-xprint                                \
+                --enable-glx                                    \
+                --enable-dri                                    \
+	        --with-mesa-source=${BUILD_DIRECTORY}/Mesa \
+                --disable-xvfb                                  \
+                --disable-xnest                                 \
+                --enable-xglx                                   \
+                --disable-aiglx                                 \
+                --disable-dmx                                   \
+                $OPTS                                           &&
+
+  default_make
+
+) > $C_FIFO 2>&1
+

Added: moonbase/branches/crater/xgl/xgl-cvs/CONFLICTS
===================================================================
--- moonbase/branches/crater/xgl/xgl-cvs/CONFLICTS	                        (rev 0)
+++ moonbase/branches/crater/xgl/xgl-cvs/CONFLICTS	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,6 @@
+conflicts XOrg  &&
+conflicts XOrg-test &&
+conflicts XOrg-fonts-base &&
+conflicts XOrg-fonts-extra &&
+conflicts XOrg-drm &&
+conflicts XOrg-drm-cvs

Added: moonbase/branches/crater/xgl/xgl-cvs/DEPENDS
===================================================================
--- moonbase/branches/crater/xgl/xgl-cvs/DEPENDS	                        (rev 0)
+++ moonbase/branches/crater/xgl/xgl-cvs/DEPENDS	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,4 @@
+depends XOrg7		&&
+depends util-macros	&&
+depends compiz-cvs	&&
+depends glitz-cvs	

Added: moonbase/branches/crater/xgl/xgl-cvs/DETAILS
===================================================================
--- moonbase/branches/crater/xgl/xgl-cvs/DETAILS	                        (rev 0)
+++ moonbase/branches/crater/xgl/xgl-cvs/DETAILS	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,17 @@
+          MODULE=xgl-cvs
+             MOD=xserver
+         VERSION=cvs
+          SOURCE=$MOD.tar.bz2
+         SOURCE2=Mesa.tar.bz2
+      SOURCE_URL=cvs://:pserver:anonymous@anoncvs.freedesktop.org:/cvs/xorg:xserver:xgl-0-0-1
+      SOURCE2_URL=http://merlin.ugent.be/lunar
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MOD
+        WEB_SITE=http://www.freedesktop.org/wiki/Software/Xgl
+         ENTERED=20060531
+         UPDATED=`date -u +%Y%m%d`
+           SHORT="xgl-cvs"
+
+cat << EOF
+xgl-cvs
+EOF
+ 

Added: moonbase/branches/crater/xgl/xgl-cvs/PRE_BUILD
===================================================================
--- moonbase/branches/crater/xgl/xgl-cvs/PRE_BUILD	                        (rev 0)
+++ moonbase/branches/crater/xgl/xgl-cvs/PRE_BUILD	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,3 @@
+default_pre_build 	&&
+cd $BUILD_DIRECTORY 	&&
+unpack $SOURCE2

Added: moonbase/branches/crater/xgl/xgl-cvs/xgl-xinerama.patch
===================================================================
--- moonbase/branches/crater/xgl/xgl-cvs/xgl-xinerama.patch	                        (rev 0)
+++ moonbase/branches/crater/xgl/xgl-cvs/xgl-xinerama.patch	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1,248 @@
+diff -urN xgl-xorg-orig/configure.ac xgl-xorg/configure.ac
+--- xgl-xorg-orig/configure.ac	2006-04-03 08:16:14.000000000 +0200
++++ xgl-xorg/configure.ac	2006-04-25 16:57:32.000000000 +0200
+@@ -1014,7 +1014,7 @@
+ 
+ AC_MSG_CHECKING([whether to build Xglx DDX])
+ if test "x$XGLX" != xno; then
+-	PKG_CHECK_MODULES([XGLXMODULES], [glitz-glx >= $XGL_REQUIRED_GLITZ_VERSION xrender >= 0.5 xrandr >= 0.5 xkbfile], [XGLX=yes], [XGLX=no])
++	PKG_CHECK_MODULES([XGLXMODULES], [glitz-glx >= $XGL_REQUIRED_GLITZ_VERSION xrender >= 0.5 xrandr >= 0.5 xkbfile xinerama], [XGLX=yes], [XGLX=no])
+ 	AC_SUBST(XGLXMODULES_CFLAGS)
+ 	AC_SUBST(XGLXMODULES_LIBS)
+ fi
+diff -urN xgl-xorg-orig/hw/xgl/glx/xglx.c xgl-xorg/hw/xgl/glx/xglx.c
+--- xgl-xorg-orig/hw/xgl/glx/xglx.c	2006-04-07 08:27:08.000000000 +0200
++++ xgl-xorg/hw/xgl/glx/xglx.c	2006-04-25 17:02:42.000000000 +0200
+@@ -43,6 +43,12 @@
+ #include "randrstr.h"
+ #endif
+ 
++#ifdef PANORAMIX
++#include <X11/extensions/panoramiXproto.h>
++#include <X11/extensions/Xinerama.h>
++#include "extnsionst.h"
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -378,6 +384,207 @@
+ 
+ #endif
+ 
++#ifdef PANORAMIX
++
++static int xglxXineramaGeneration;
++
++static void xglxXineramaResetProc(ExtensionEntry* extEntry)
++{
++}
++
++static int
++xglxProcXineramaQueryVersion (ClientPtr client)
++{
++    xPanoramiXQueryVersionReply		rep;
++    register int			n;
++    int					majorVersion, minorVersion;
++
++    REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
++    
++    rep.type = X_Reply;
++    rep.length = 0;
++    rep.sequenceNumber = client->sequence;
++    XineramaQueryVersion (xdisplay, &majorVersion, &minorVersion);
++    rep.majorVersion = majorVersion;
++    rep.minorVersion = minorVersion;
++    if (client->swapped) { 
++        swaps(&rep.sequenceNumber, n);
++        swapl(&rep.length, n);     
++        swaps(&rep.majorVersion, n);
++        swaps(&rep.minorVersion, n);
++    }
++    WriteToClient(client, sizeof (xPanoramiXQueryVersionReply), (char *)&rep);
++    return (client->noClientException);
++}
++
++static int
++xglxProcXineramaIsActive(ClientPtr client)
++{
++    xXineramaIsActiveReply	rep;
++
++    REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
++
++    rep.type = X_Reply;
++    rep.length = 0;
++    rep.sequenceNumber = client->sequence;
++    rep.state = XineramaIsActive (xdisplay);
++    if (client->swapped) {
++	register int n;
++	swaps (&rep.sequenceNumber, n);
++	swapl (&rep.length, n);
++	swapl (&rep.state, n);
++    }	
++    WriteToClient (client, sizeof (xXineramaIsActiveReply), (char *) &rep);
++    return client->noClientException;
++}
++
++
++static int
++xglxProcXineramaQueryScreens(ClientPtr client)
++{
++    xXineramaQueryScreensReply	rep;
++    xXineramaScreenInfo		scratch;
++    XineramaScreenInfo	       *info;
++
++    REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
++
++    rep.type = X_Reply;
++    rep.sequenceNumber = client->sequence;
++    info = XineramaQueryScreens (xdisplay, &rep.number);
++    rep.length = rep.number * sz_XineramaScreenInfo >> 2;
++    if (client->swapped) {
++	register int n;
++	swaps (&rep.sequenceNumber, n);
++	swapl (&rep.length, n);
++	swapl (&rep.number, n);
++    }	
++    WriteToClient (client, sizeof (xXineramaQueryScreensReply), (char *) &rep);
++
++    if (info != NULL) {
++	xXineramaScreenInfo scratch;
++	int i;
++
++	for(i = 0; i < rep.number; i++) {
++	    scratch.x_org  = info[i].x_org;
++	    scratch.y_org  = info[i].y_org;
++	    scratch.width  = info[i].width;
++	    scratch.height  = info[i].height;
++	
++	    if(client->swapped) {
++		register int n;
++		swaps (&scratch.x_org, n);
++		swaps (&scratch.y_org, n);
++		swaps (&scratch.width, n);
++		swaps (&scratch.height, n);
++	    }
++	    WriteToClient (client, sz_XineramaScreenInfo, (char *) &scratch);
++	}
++	
++	XFree (info);
++    }
++
++    return client->noClientException;
++}
++    
++static int
++xglxProcXineramaDispatch (ClientPtr client)
++{
++    REQUEST(xReq);
++    switch (stuff->data)
++    {
++	case X_PanoramiXQueryVersion:
++	     return xglxProcXineramaQueryVersion(client);
++	case X_XineramaIsActive:
++	     return xglxProcXineramaIsActive(client);
++	case X_XineramaQueryScreens:
++	     return xglxProcXineramaQueryScreens(client);
++    }
++    return BadRequest;
++}
++
++static int
++xglxSProcXineramaQueryVersion (ClientPtr client)
++{
++    REQUEST(xPanoramiXQueryVersionReq);
++    register int n;
++
++    swaps(&stuff->length,n);
++    REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
++    return xglxProcXineramaQueryVersion(client);
++}
++
++static int 
++xglxSProcXineramaIsActive(ClientPtr client)
++{
++    REQUEST(xXineramaIsActiveReq);
++    register int n;
++
++    swaps (&stuff->length, n);
++    REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
++    return xglxProcXineramaIsActive(client);
++}
++
++static int 
++xglxSProcXineramaQueryScreens(ClientPtr client)
++{
++    REQUEST(xXineramaQueryScreensReq);
++    register int n;
++
++    swaps (&stuff->length, n);
++    REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
++    return xglxProcXineramaQueryScreens(client);
++}
++
++static int
++xglxSProcXineramaDispatch (ClientPtr client)
++{   REQUEST(xReq);
++    switch (stuff->data)
++    {
++	case X_PanoramiXQueryVersion:
++	     return xglxSProcXineramaQueryVersion(client);
++	case X_XineramaIsActive:
++	     return xglxSProcXineramaIsActive(client);
++	case X_XineramaQueryScreens:
++	     return xglxSProcXineramaQueryScreens(client);
++    }
++    return BadRequest;
++}
++
++static Bool
++xglxXineramaInit (ScreenPtr pScreen)
++{
++    Bool		success = FALSE;
++    int			xineramaEvent, xineramaError;
++    ExtensionEntry     *extEntry;
++
++    if (!XineramaQueryExtension (xdisplay, &xineramaEvent, &xineramaError))
++	return TRUE;
++
++    while (xglxXineramaGeneration != serverGeneration) {
++	extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0,0, 
++				xglxProcXineramaDispatch,
++				xglxSProcXineramaDispatch,
++				xglxXineramaResetProc, 
++				StandardMinorOpcode);
++	if (!extEntry) {
++	    ErrorF("xglxXineramaInit(): failed to AddExtension\n");
++	    break;
++ 	}
++
++	xglxXineramaGeneration = serverGeneration;
++	success = TRUE;
++    }
++
++    if (!success) {
++	ErrorF("%s Extension failed to initialize\n", PANORAMIX_PROTOCOL_NAME);
++	return;
++    }
++
++    return TRUE;
++}
++
++#endif
++
+ static void
+ xglxConstrainCursor (ScreenPtr pScreen,
+ 		     BoxPtr    pBox)
+@@ -829,6 +1036,11 @@
+ 	return FALSE;
+ #endif
+ 
++#ifdef PANORAMIX
++    if (!xglxXineramaInit (pScreen))
++        return FALSE;
++#endif
++
+     while (XNextEvent (xdisplay, &xevent))
+ 	if (xevent.type == Expose)
+ 	    break;

Modified: moonbase/branches/crater/xorg-7.0/xorg-server/BUILD
===================================================================
--- moonbase/branches/crater/xorg-7.0/xorg-server/BUILD	2006-06-17 17:43:49 UTC (rev 20432)
+++ moonbase/branches/crater/xorg-7.0/xorg-server/BUILD	2006-06-17 17:52:17 UTC (rev 20433)
@@ -1,8 +1,11 @@
 (
   . /etc/profile.d/x11r7.rc &&
+  
+  if [[ "$USE_NVIDIA" = "y" ]]; then OPTS="$OPTS --disable-glx --disable-glx-tlx"; fi &&
 
   OPTS="$OPTS --enable-composite \
-	      --with-mesa-source=${SOURCE_DIRECTORY}/Mesa-${MESA_VERSION}" &&
+	      --with-mesa-source=${SOURCE_DIRECTORY}/Mesa-${MESA_VERSION} \
+	      $OPTS                  "  &&
 
   default_build
 

Added: moonbase/branches/crater/xorg-7.0/xorg-server/CONFIGURE
===================================================================
--- moonbase/branches/crater/xorg-7.0/xorg-server/CONFIGURE	                        (rev 0)
+++ moonbase/branches/crater/xorg-7.0/xorg-server/CONFIGURE	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1 @@
+mquery USE_NVIDIA "Do you intend to use the NVIDIA binary driver?" n

Modified: moonbase/branches/crater/xorg-7.1/xorg-server/BUILD
===================================================================
--- moonbase/branches/crater/xorg-7.1/xorg-server/BUILD	2006-06-17 17:43:49 UTC (rev 20432)
+++ moonbase/branches/crater/xorg-7.1/xorg-server/BUILD	2006-06-17 17:52:17 UTC (rev 20433)
@@ -1,8 +1,11 @@
 (
   . /etc/profile.d/x11r7.rc &&
+  
+  if [[ "$USE_NVIDIA" = "y" ]]; then OPTS="$OPTS --disable-glx --disable-glx-tlx"; fi &&
 
   OPTS="$OPTS --enable-composite \
-	      --with-mesa-source=${SOURCE_DIRECTORY}/Mesa-${MESA_VERSION}" &&
+	      --with-mesa-source=${SOURCE_DIRECTORY}/Mesa-${MESA_VERSION} \
+	      $OPTS                  "  &&
 
   default_build
 

Added: moonbase/branches/crater/xorg-7.1/xorg-server/CONFIGURE
===================================================================
--- moonbase/branches/crater/xorg-7.1/xorg-server/CONFIGURE	                        (rev 0)
+++ moonbase/branches/crater/xorg-7.1/xorg-server/CONFIGURE	2006-06-17 17:52:17 UTC (rev 20433)
@@ -0,0 +1 @@
+mquery USE_NVIDIA "Do you intend to use the NVIDIA binary driver?" n



More information about the Lunar-commits mailing list