[Lunar-commits] <moonbase> mesa-lib: fix GLUT conflict & add glx-tls option

[Paul Bredbury]

commit 3ca044318b6fef12bee6c5c800f475af12a28195
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Mon Feb 21 11:36:41 2011 +0700

    mesa-lib: fix GLUT conflict & add glx-tls option
    
    glx-tls is *enabled* in mesa-lib as the default, so it can safely be
    enabled or disabled in xorg-server. This is the least confusing default
    to have, in terms of compilation.
---
 xorg7/mesa-lib/BUILD        |   11 +++++++----
 xorg7/mesa-lib/CONFIGURE    |    5 ++++-
 xorg7/mesa-lib/DETAILS      |    2 +-
 xorg7/mesa-lib/POST_INSTALL |    5 +++++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/xorg7/mesa-lib/BUILD b/xorg7/mesa-lib/BUILD
index 0e0d16c..e652fa2 100644
--- a/xorg7/mesa-lib/BUILD
+++ b/xorg7/mesa-lib/BUILD
@@ -7,7 +7,10 @@
     OPTS+=$(echo $MESADRIVER | sed s/\ /,/g)
   fi  &&
 
-  sedit s at glew@@g configure.ac &&
+  # Don't overlap with freeglut
+  OPTS+=" --disable-glut"  &&
+  # Needed with mesa-lib 7.8.2
+  rm -f include/GL/glut{,f90}.h  &&
 
   ./configure --prefix=/usr $OPTS  &&
   prepare_install  &&
@@ -19,10 +22,10 @@
   make glxgears glxinfo  &&
   cd ../..  &&
 
-  # Prevent glew headers from being installed
-  rm include/GL/{glew,glxew,wglew}.h  &&
+  # glew headers are installed from the glew module instead
+  rm -f include/GL/{glew,glxew,wglew}.h  &&
 
-  make install  &&                 
+  make install  &&
 
   install -v -m755 progs/xdemos/glx{gears,info} /usr/bin/
 
diff --git a/xorg7/mesa-lib/CONFIGURE b/xorg7/mesa-lib/CONFIGURE
index a10e961..e261baa 100644
--- a/xorg7/mesa-lib/CONFIGURE
+++ b/xorg7/mesa-lib/CONFIGURE
@@ -2,7 +2,7 @@
 SUPPORTED_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome"
 
 make_drivers_checklist() {
-  
+
   # For each locale, extract name, title and charmap information
   for driver in $SUPPORTED_DRIVERS; do
       title=$driver
@@ -42,3 +42,6 @@ if ! grep -q CONFIGURED $MODULE_CONFIG; then
   echo "OPTS=\"\$OPTS $OPTS\"" >> $MODULE_CONFIG
   echo "CONFIGURED=y"          >> $MODULE_CONFIG
 fi
+
+# Default is y, so xorg-server can be compiled with it disabled or enabled
+mquery ENABLE_GLX_TLS "Enable glx-tls? (${PROBLEM_COLOR}lin xorg-server also${DEFAULT_COLOR})" y "--enable-glx-tls" "--disable-glx-tls"
diff --git a/xorg7/mesa-lib/DETAILS b/xorg7/mesa-lib/DETAILS
index a3dbed9..13bb264 100644
--- a/xorg7/mesa-lib/DETAILS
+++ b/xorg7/mesa-lib/DETAILS
@@ -12,7 +12,7 @@
       SOURCE3_VFY=sha1:90879578b11b2d043b378818d2c6750fe47518b7
          WEB_SITE=http://www.mesa3d.org
           ENTERED=20060215
-          UPDATED=20100724
+          UPDATED=20110218
             SHORT="Mesa 3D library"
 
 PSAFE=no
diff --git a/xorg7/mesa-lib/POST_INSTALL b/xorg7/mesa-lib/POST_INSTALL
new file mode 100644
index 0000000..4351df0
--- /dev/null
+++ b/xorg7/mesa-lib/POST_INSTALL
@@ -0,0 +1,5 @@
+if [[ ! -e /usr/include/GL/glut.h ]] || [[ ! -e /usr/include/GL/freeglut.h ]] ; then
+  # freeglut provides %GLUT, previously overlapping with mesa-lib.
+  # mesa-lib previously installed part of %GLUT, so install freeglut so it is complete.
+  lin -c freeglut
+fi