[Lunar-commits] <moonbase> xorg-server: add glx-tls option

[Paul Bredbury]

commit ab129255b9d526bdbed4fb03ffc98451a04fabd9
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Mon Feb 21 11:48:59 2011 +0700

    xorg-server: add glx-tls option
    
    Same option is in mesa-lib, and they should be synchronized, or be y in
    mesa-lib and n in xorg-server. Cannot be n in mesa-lib and y in
    xorg-server.
---
 xorg7/xorg-server/BUILD     |    6 ------
 xorg7/xorg-server/CONFIGURE |    5 +++--
 xorg7/xorg-server/DETAILS   |    2 +-
 xorg7/xorg-server/PRE_BUILD |   12 +++++++++---
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/xorg7/xorg-server/BUILD b/xorg7/xorg-server/BUILD
index 11fe68e..890ec18 100644
--- a/xorg7/xorg-server/BUILD
+++ b/xorg7/xorg-server/BUILD
@@ -1,17 +1,11 @@
 (
 
-#  patch_it $SOURCE2 1  &&
-
   . /etc/profile.d/x11r7.rc  &&
 
   if [ -h /usr/share/X11/xkb/compiled ]; then
     rm -f /usr/share/X11/xkb/compiled
   fi  &&
 
-#  if [[ "$USE_NVIDIA" = "y" ]]; then
-#    OPTS+=" --disable-glx --disable-glx-tlx"
-#  fi &&
-
   OPTS+=" --enable-composite --enable-aiglx --disable-devel-docs \
           --enable-install-libxf86config --enable-unix-transport \
           --with-fontrootdir=/usr/share/fonts/X11  \
diff --git a/xorg7/xorg-server/CONFIGURE b/xorg7/xorg-server/CONFIGURE
index 5200295..c8e4a41 100644
--- a/xorg7/xorg-server/CONFIGURE
+++ b/xorg7/xorg-server/CONFIGURE
@@ -1,5 +1,6 @@
-#mquery USE_NVIDIA "Do you intend to use the NVIDIA binary driver?" n
-
 mquery USE_DBUS "Enable use of D-Bus?" n "--enable-config-dbus" ""
 mquery ENABLE_IPV6 "Enable IPv6?" y "" "--disable-ipv6"
 mquery ENABLE_IPV4 "Enable IPv4?" y "" "--disable-tcp-transport"
+
+# Default is n, to match xorg's default
+mquery ENABLE_GLX_TLS "Enable glx-tls? (${PROBLEM_COLOR}if y, enable in mesa-lib first${DEFAULT_COLOR})" n "--enable-glx-tls" "--disable-glx-tls"
diff --git a/xorg7/xorg-server/DETAILS b/xorg7/xorg-server/DETAILS
index bb49d67..6dfe72a 100644
--- a/xorg7/xorg-server/DETAILS
+++ b/xorg7/xorg-server/DETAILS
@@ -6,7 +6,7 @@
    MODULE_PREFIX=${X11R7_PREFIX:-/usr}
         WEB_SITE=http://www.x.org
          ENTERED=20060120
-         UPDATED=20110205
+         UPDATED=20110218
       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 3185795..874ecc7 100644
--- a/xorg7/xorg-server/PRE_BUILD
+++ b/xorg7/xorg-server/PRE_BUILD
@@ -1,3 +1,9 @@
-default_pre_build         &&
-cd $SOURCE_DIRECTORY         
-#unpack $SOURCE2
+if [ "$ENABLE_GLX_TLS" == "y" ] ; then
+  # /usr/lib/libGL.so is from mesa-lib when compiled with --enable-glx-tls
+  if [ ! -e /usr/lib/libGL.so ] ; then
+    message "${PROBLEM_COLOR}lin -rc mesa-lib first, with glx-tls enabled!${DEFAULT_COLOR}"
+    exit 1
+  fi
+fi
+
+default_pre_build