[Lunar-commits] <moonbase> Revert "mesa-lib: version bump to 7.5.1"

[Paul Bredbury]

commit a082d6fcffa7fc56361af0efae1b8f97da39629f
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Sun Sep 6 19:20:10 2009 +0700

    Revert "mesa-lib: version bump to 7.5.1"
    
    This reverts commit 7f51e8b73c5088d23c6bc18d917bd561a40fa436.
    
    mesa-lib conflicts with libs from glew.
---
 xorg7/mesa-lib/BUILD   |   20 ++++++--------------
 xorg7/mesa-lib/DETAILS |   16 ++++++++--------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/xorg7/mesa-lib/BUILD b/xorg7/mesa-lib/BUILD
index 8942639..9048e1c 100644
--- a/xorg7/mesa-lib/BUILD
+++ b/xorg7/mesa-lib/BUILD
@@ -1,23 +1,15 @@
 (
 
-  OPTS+=" --with-dri-drivers=" &&
+  OPTS+="--with-dri-drivers=" &&
   OPTS+=$(echo $MESADRIVER | sed s/\ /,/g) &&
+  ./configure --prefix=/usr $OPTS && 
 
-  # Copy some headers, to avoid this error:
-  # /usr/include/GL/glew.h:1138:20: error: GL/glu.h: No such file or directory
-  # samplers.c:43:21: error: GL/glut.h: No such file or directory
-
-  # The problem is the inter-relation of mesa-lib, glew, and glut libs.
-  # mesa-lib 7.5.1 introduced a dependency on glew.
-  mkdir -p /usr/include/GL/ &&
-  install -m644 -t /usr/include/GL/ include/GL/gl{,u,ut}.h &&
-
-  ./configure --prefix=/usr $OPTS &&
   prepare_install &&
 
-  make all &&
-  make install &&                 
+  make && 
 
-  install -v -m755 progs/xdemos/glx{gears,info} /usr/bin/
+  make install &&                 
+#  install -v -m644 include/GLView.h /usr/include/        &&
+  install -v -m755 progs/xdemos/glxinfo progs/xdemos/glxgears /usr/bin
 
 ) > $C_FIFO 2>&1
diff --git a/xorg7/mesa-lib/DETAILS b/xorg7/mesa-lib/DETAILS
index b479b14..d5666d7 100644
--- a/xorg7/mesa-lib/DETAILS
+++ b/xorg7/mesa-lib/DETAILS
@@ -1,18 +1,18 @@
            MODULE=mesa-lib
-          VERSION=7.5.1
+          VERSION=7.4.4
            SOURCE=MesaLib-$VERSION.tar.bz2
           SOURCE2=MesaDemos-$VERSION.tar.bz2
           SOURCE3=MesaGLUT-$VERSION.tar.bz2
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/Mesa-$VERSION
-       SOURCE_URL=ftp://ftp.freedesktop.org/pub/mesa/$VERSION/
-      SOURCE2_URL=$SOURCE_URL
-      SOURCE3_URL=$SOURCE_URL
-       SOURCE_VFY=sha1:26171fb4de23a21431861d6663203e400df45bf7
-      SOURCE2_VFY=sha1:5bafef98a896f4e5c22d17b435db0d14e981ba6c
-      SOURCE3_VFY=sha1:349c6dee14d8c641dc161d1584e5960b6001b944
+       SOURCE_URL=$SFORGE_URL/mesa3d/
+      SOURCE2_URL=$SFORGE_URL/mesa3d/
+      SOURCE3_URL=$SFORGE_URL/mesa3d/
+       SOURCE_VFY=sha1:1cdcef24900489bc0a879013b2138c0d9aedffe3
+      SOURCE2_VFY=sha1:190b51dd1e456f12c70cd428ec47ca8de0ed72fe
+      SOURCE3_VFY=sha1:41635a1c5b3bfe4bff4f9a086fb0b17fd441c431
          WEB_SITE=http://www.mesa3d.org
           ENTERED=20060215
-          UPDATED=20090904
+          UPDATED=20090706
             SHORT="Mesa 3D library"
 
 cat << EOF