[Lunar-commits] <moonbase> xorg-server: bump to 1.5.0

[Samuel Verstraete]

commit a9f04120d2b37555b1381448c11cc7210cf7f9ee
Author: Samuel Verstraete <elangelo at lunar-linux.org>
Date:   Wed Sep 10 17:28:45 2008 +0200

    xorg-server: bump to 1.5.0
---
 xorg7/xorg-server/BUILD     |    8 ++++----
 xorg7/xorg-server/CONFIGURE |    2 +-
 xorg7/xorg-server/DEPENDS   |    1 +
 xorg7/xorg-server/DETAILS   |   14 +++++++-------
 xorg7/xorg-server/PRE_BUILD |    4 ++--
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/xorg7/xorg-server/BUILD b/xorg7/xorg-server/BUILD
index eefd0f4..cc345d7 100644
--- a/xorg7/xorg-server/BUILD
+++ b/xorg7/xorg-server/BUILD
@@ -6,13 +6,13 @@
     rm -f /usr/share/X11/xkb/compiled
   fi &&
 
-  if [[ "$USE_NVIDIA" = "y" ]]; then
-    OPTS="$OPTS --disable-glx --disable-glx-tlx"
-  fi &&
+#  if [[ "$USE_NVIDIA" = "y" ]]; then
+#    OPTS="$OPTS --disable-glx --disable-glx-tlx"
+#  fi &&
 
   OPTS+=" --enable-composite --enable-aiglx --enable-xorgcfg \
-         --with-mesa-source=${SOURCE_DIRECTORY}/Mesa-${MESA_VERSION} \
          --with-dri-driver-path=${MODULE_PREFIX}/lib/dri" &&
+         #--with-mesa-source=${SOURCE_DIRECTORY}/Mesa-${MESA_VERSION} \
 
   default_build &&
 
diff --git a/xorg7/xorg-server/CONFIGURE b/xorg7/xorg-server/CONFIGURE
index 659c2db..7bf847c 100644
--- a/xorg7/xorg-server/CONFIGURE
+++ b/xorg7/xorg-server/CONFIGURE
@@ -1 +1 @@
-mquery USE_NVIDIA "Do you intend to use the NVIDIA binary driver?" n
+#mquery USE_NVIDIA "Do you intend to use the NVIDIA binary driver?" n
diff --git a/xorg7/xorg-server/DEPENDS b/xorg7/xorg-server/DEPENDS
index c657725..84b5e5b 100644
--- a/xorg7/xorg-server/DEPENDS
+++ b/xorg7/xorg-server/DEPENDS
@@ -29,5 +29,6 @@ depends  pixman
 depends  dbus-glib
 depends  hal
 depends  xkeyboard-config
+depends  mesa-lib
 
 optional_depends "acpid" "" "" "for ACPI support through xorg-server"
diff --git a/xorg7/xorg-server/DETAILS b/xorg7/xorg-server/DETAILS
index 04b15c9..f79160f 100644
--- a/xorg7/xorg-server/DETAILS
+++ b/xorg7/xorg-server/DETAILS
@@ -1,16 +1,16 @@
           MODULE=xorg-server
-         VERSION=1.4.2
-    MESA_VERSION=7.0.4
+         VERSION=1.5.0
+    #MESA_VERSION=7.1
           SOURCE=$MODULE-$VERSION.tar.bz2
-         SOURCE2=MesaLib-${MESA_VERSION}.tar.bz2
+     #    SOURCE2=MesaLib-${MESA_VERSION}.tar.bz2
       SOURCE_URL=$XORG_URL/individual/xserver
-     SOURCE2_URL=$SFORGE_URL/mesa3d
-      SOURCE_VFY=sha1:385348721ecb6da4bc51a2b7ee5784de6be0a8b6
-     SOURCE2_VFY=sha1:7e2ecbe89d245510d2681d04e959aee6adc205c5
+    # SOURCE2_URL=$SFORGE_URL/mesa3d
+      SOURCE_VFY=sha1:b9554f3996ae18fdce109f475d745dc05d6a5970
+    # SOURCE2_VFY=sha1:0b946a8a4334ca22baf3e0fe583f88187e9d74fa
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org
          ENTERED=20060120
-         UPDATED=20080816
+         UPDATED=20080909
       MAINTAINER=elangelo at lunar-linux.org
            SHORT="The X.Org X11R7 server for the X Window System"
 
diff --git a/xorg7/xorg-server/PRE_BUILD b/xorg7/xorg-server/PRE_BUILD
index de60ec0..3185795 100644
--- a/xorg7/xorg-server/PRE_BUILD
+++ b/xorg7/xorg-server/PRE_BUILD
@@ -1,3 +1,3 @@
 default_pre_build         &&
-cd $SOURCE_DIRECTORY         &&
-unpack $SOURCE2
+cd $SOURCE_DIRECTORY         
+#unpack $SOURCE2