[Lunar-commits] r22605 - moonbase/trunk/xorg7/xorg-server

[Moritz Heiber]

Author: moe
Date: 2006-12-17 10:22:41 +0100 (Sun, 17 Dec 2006)
New Revision: 22605

Modified:
   moonbase/trunk/xorg7/xorg-server/BUILD
   moonbase/trunk/xorg7/xorg-server/DETAILS
Log:
Adding a patch to fix bug #155.



Modified: moonbase/trunk/xorg7/xorg-server/BUILD
===================================================================
--- moonbase/trunk/xorg7/xorg-server/BUILD	2006-12-17 07:37:56 UTC (rev 22604)
+++ moonbase/trunk/xorg7/xorg-server/BUILD	2006-12-17 09:22:41 UTC (rev 22605)
@@ -1,12 +1,15 @@
 (
   . /etc/profile.d/x11r7.rc &&
   
-  if [[ "$USE_NVIDIA" = "y" ]]; then OPTS="$OPTS --disable-glx --disable-glx-tlx"; fi &&
+  patch_it $SOURCE3 1 &&
 
-  OPTS="$OPTS --enable-composite --enable-aiglx \
-	      --with-mesa-source=${SOURCE_DIRECTORY}/Mesa-${MESA_VERSION} \
-	      $OPTS                  "  &&
+  if [[ "$USE_NVIDIA" = "y" ]]; then
+    OPTS="$OPTS --disable-glx --disable-glx-tlx";
+  fi &&
 
+  OPTS+="--enable-composite --enable-aiglx \
+	 --with-mesa-source=${SOURCE_DIRECTORY}/Mesa-${MESA_VERSION}" &&
+
   default_build
 
 ) > $C_FIFO 2>&1

Modified: moonbase/trunk/xorg7/xorg-server/DETAILS
===================================================================
--- moonbase/trunk/xorg7/xorg-server/DETAILS	2006-12-17 07:37:56 UTC (rev 22604)
+++ moonbase/trunk/xorg7/xorg-server/DETAILS	2006-12-17 09:22:41 UTC (rev 22605)
@@ -3,10 +3,13 @@
     MESA_VERSION=6.5
           SOURCE=$MODULE-$VERSION.tar.bz2
          SOURCE2=MesaLib-${MESA_VERSION}.tar.bz2
+         SOURCE3=$MODULE-1.1.0-grabkeys.patch
       SOURCE_URL=$XORG_URL/X11R7.1/src/xserver/
      SOURCE2_URL=$SFORGE_URL/mesa3d/
+     SOURCE3_URL=$PATCH_URL/
       SOURCE_VFY=sha1:959c66376f4468b60aa288d5153b823499596eb3 
-     SOURCE2_VFY=sha1:a77368901b0731b662d0858aef2c405a7ddf6014  
+     SOURCE2_VFY=sha1:a77368901b0731b662d0858aef2c405a7ddf6014
+     SOURCE3_VFY=sha1:c9df6f85ba7070decd7794c40027e91f673677a6
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org/
          ENTERED=20060120