[SM-Commit] GIT changes to master grimoire by Eric Sandall (f6bf061a96c7423cd93c992f4a7cc5c38f1fdd7a)

Eric Sandall scm at sourcemage.org
Tue Oct 7 02:49:21 EDT 2008


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 graphics-libs/mesalib/BUILD                   |    7 ++++---
 graphics-libs/mesalib/CONFIGURE               |    8 +++++---
 graphics-libs/mesalib/DETAILS                 |    5 +++--
 graphics-libs/mesalib/HISTORY                 |    6 ++++++
 graphics-libs/mesalib/MesaLib-7.2.tar.bz2.sig |binary
 graphics-libs/mesalib/PRE_BUILD               |    1 -
 graphics-libs/mesalib/glw.pc.in               |   11 -----------
 graphics/mesademos/BUILD                      |   14 +++-----------
 graphics/mesademos/DETAILS                    |    8 +++++---
 graphics/mesademos/HISTORY                    |    5 +++++
 graphics/mesademos/INSTALL                    |    2 +-
 graphics/mesademos/MesaDemos-7.2.tar.bz2.sig  |binary
 graphics/mesademos/MesaLib-7.2.tar.bz2.sig    |binary
 13 files changed, 32 insertions(+), 35 deletions(-)

New commits:
commit f6bf061a96c7423cd93c992f4a7cc5c38f1fdd7a
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    mesademos: Updated to 7.2, uses autoconf

commit e4d32adf6279297e9175be6f5e232889943b55ba
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    mesalib: Updated to 7.2, uses autoconf, no more nouveau nor i915tex

diff --git a/graphics-libs/mesalib/BUILD b/graphics-libs/mesalib/BUILD
index a7d5f57..8a4108d 100755
--- a/graphics-libs/mesalib/BUILD
+++ b/graphics-libs/mesalib/BUILD
@@ -1,3 +1,4 @@
-make_single           &&
-make ${MESALIB_BUILD} &&
-make_normal
+local MESALIB_DRIVERS_CONF="${MESALIB_DRIVERS//\ /,}"  &&
+OPTS="--with-dri-drivers=$MESALIB_DRIVERS_CONF         \
+      $OPTS"                                           &&
+default_build
diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index 1f82ab3..e4df854 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -1,3 +1,6 @@
+list_remove  MESALIB_DRIVERS  nouveau  || true
+list_remove  MESALIB_DRIVERS  i915tex  || true
+
 . $GRIMOIRE/config_query_multi.function                                  &&
 if [[ "${SMGL_COMPAT_ARCHS[1]}" == "sparc" ]]
 then
@@ -51,12 +54,10 @@ config_query_multi MESALIB_DRIVERS                                       \
                    "What drivers would you like to build?"               \
                    all                                                   \
                    i810                                                  \
-                   i915tex                                               \
                    i915                                                  \
                    i965                                                  \
                    mach64                                                \
                    mga                                                   \
-                   nouveau                                               \
                    r128                                                  \
                    r200                                                  \
                    r300                                                  \
@@ -70,6 +71,7 @@ config_query_multi MESALIB_DRIVERS                                       \
                    ffb                                                   &&
   if list_find "$MESALIB_DRIVERS" all
   then
-  MESALIB_DRIVERS="i810 i915tex i915 i965 mach64 mga nouveau r128 r200 r300 radeon s3v savage sis tdfx trident unichrome ffb"
+  MESALIB_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome ffb"
   fi
 fi
+
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index 29c33c6..28d75cf 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -11,11 +11,12 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/mesalib-git
    SOURCE_URL[0]=git://anongit.freedesktop.org/git/mesa/mesa:mesalib-git
    SOURCE_IGNORE=volatile
 else
-         VERSION=7.0.4
+         VERSION=7.2
           SOURCE=MesaLib-${VERSION}.tar.bz2
    SOURCE_URL[0]=${SOURCEFORGE_URL}/mesa3d/${SOURCE}
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Mesa-${VERSION}
-     SOURCE_HASH=sha512:7b0120cb2cbb27155de8c4c3ca595aacc6a00d1692b84796d2cdf81fd1dfade718f4617b771f5f86a67ab44d68798ea139e27fc1a05e866011a088b1873be3d3
+#     SOURCE_HASH=sha512:7b0120cb2cbb27155de8c4c3ca595aacc6a00d1692b84796d2cdf81fd1dfade718f4617b771f5f86a67ab44d68798ea139e27fc1a05e866011a088b1873be3d3
+      SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
 fi
       LICENSE[0]=GPL
         WEB_SITE=http://mesa3d.sourceforge.net/
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 94cb335..6da61d5 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,9 @@
+2008-10-06 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 7.2
+	  Seems to still honour MESALIB_BUILD
+	* CONFIGURE: No more nouveau, i915tex
+	* PRE_BUILD: glw.pc.in is now included
+
 2008-08-22 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: updated spell to 7.0.4
 
diff --git a/graphics-libs/mesalib/MesaLib-7.2.tar.bz2.sig b/graphics-libs/mesalib/MesaLib-7.2.tar.bz2.sig
new file mode 100644
index 0000000..7f285b4
Binary files /dev/null and b/graphics-libs/mesalib/MesaLib-7.2.tar.bz2.sig differ
diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 5c82378..e6c012a 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -1,6 +1,5 @@
 default_pre_build                                            &&
 # missing file in 7.0.2 release tarball
-cp $SPELL_DIRECTORY/glw.pc.in $SOURCE_DIRECTORY/src/glw/     &&
 cd ${SOURCE_DIRECTORY}/configs                               &&
 sedit "s:/usr/local:/usr:g" default                          &&
 
diff --git a/graphics-libs/mesalib/glw.pc.in b/graphics-libs/mesalib/glw.pc.in
deleted file mode 100644
index 951e2dc..0000000
--- a/graphics-libs/mesalib/glw.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@INSTALL_DIR@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/@LIB_DIR@
-includedir=${prefix}/include
-
-Name: glw
-Description: Mesa OpenGL widget library
-Requires: gl
-Version: @VERSION@
-Libs: -L${libdir} -lGLU
-Cflags: -I${includedir}
diff --git a/graphics/mesademos/BUILD b/graphics/mesademos/BUILD
index e76e98d..7368810 100755
--- a/graphics/mesademos/BUILD
+++ b/graphics/mesademos/BUILD
@@ -1,11 +1,3 @@
-make ${MESADEMOS_BUILD}             &&
-#demos want to call them explicitly
-#since some are broken
-cd $SOURCE_DIRECTORY/progs/xdemos   &&
-make glthreads glxdemo glxgears     \
-     glxgears_fbconfig glxcontexts  \
-     glxheads glxinfo glxpixmap     \
-     glxpbdemo glxswapcontrol       \
-     manywin offset overlay pbinfo  \
-     pbdemo wincopy xfont           \
-     xrotfontdemo yuvrect_client
+OPTS="--with-demos  \
+      $OPTS"        &&
+default_build
diff --git a/graphics/mesademos/DETAILS b/graphics/mesademos/DETAILS
index 74745f8..533bb72 100755
--- a/graphics/mesademos/DETAILS
+++ b/graphics/mesademos/DETAILS
@@ -1,12 +1,14 @@
            SPELL=mesademos
-         VERSION=7.0.3
+         VERSION=7.2
           SOURCE=MesaLib-${VERSION}.tar.bz2
          SOURCE2=MesaDemos-${VERSION}.tar.bz2
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Mesa-${VERSION}
    SOURCE_URL[0]=${SOURCEFORGE_URL}/mesa3d/${SOURCE}
   SOURCE2_URL[0]=${SOURCEFORGE_URL}/mesa3d/${SOURCE2}
-     SOURCE_HASH=sha512:e1b4cf8f944e902b1449726229cbb7240860abfef498f1882bf1872ed6172af5bafb75b7433c5f3f7ba0782fa13bd8044de4ef5f2d80ea6fb9f5955e0d4d709a
-    SOURCE2_HASH=sha512:cebd3bfd3c929e4961559faaddfc2382aafd8797fb1afd6f61659de852cf222fd634d47163bc9028cf916c98ef775a5a496aee9396f67fc8199c8551c01b41f1
+#     SOURCE_HASH=sha512:e1b4cf8f944e902b1449726229cbb7240860abfef498f1882bf1872ed6172af5bafb75b7433c5f3f7ba0782fa13bd8044de4ef5f2d80ea6fb9f5955e0d4d709a
+#    SOURCE2_HASH=sha512:cebd3bfd3c929e4961559faaddfc2382aafd8797fb1afd6f61659de852cf222fd634d47163bc9028cf916c98ef775a5a496aee9396f67fc8199c8551c01b41f1
+      SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+     SOURCE2_GPG=gurus.gpg:$SOURCE2.sig:WORKS_FOR_ME
       LICENSE[0]=GPL
       LICENSE[1]=GPL
         WEB_SITE=http://www.mesa3d.org
diff --git a/graphics/mesademos/HISTORY b/graphics/mesademos/HISTORY
index 193efbd..948ec19 100644
--- a/graphics/mesademos/HISTORY
+++ b/graphics/mesademos/HISTORY
@@ -1,3 +1,8 @@
+2008-10-06 Eric Sandall <sandalle at sourcemage.org>
+	* DETAILS: Updated to 7.2
+	* BUILD: Compile demos via autoconf
+	* INSTALL: No more yuvrect_client
+
 2008-06-16 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
 	* DETAILS: updated spell to 7.0.3
 
diff --git a/graphics/mesademos/INSTALL b/graphics/mesademos/INSTALL
index 6bc8aa5..46b1937 100755
--- a/graphics/mesademos/INSTALL
+++ b/graphics/mesademos/INSTALL
@@ -1,7 +1,7 @@
 cd ${SOURCE_DIRECTORY}/progs/xdemos                                        &&
 MESA_DEMOS="glthreads glxdemo glxgears glxgears_fbconfig glxcontexts       \
 glxheads glxinfo glxpixmap glxpbdemo glxswapcontrol manywin offset overlay \
-pbinfo pbdemo wincopy xfont xrotfontdemo yuvrect_client"
+pbinfo pbdemo wincopy xfont xrotfontdemo"
 
 for i in $MESA_DEMOS
 do
diff --git a/graphics/mesademos/MesaDemos-7.2.tar.bz2.sig b/graphics/mesademos/MesaDemos-7.2.tar.bz2.sig
new file mode 100644
index 0000000..3fe7c9a
Binary files /dev/null and b/graphics/mesademos/MesaDemos-7.2.tar.bz2.sig differ
diff --git a/graphics/mesademos/MesaLib-7.2.tar.bz2.sig b/graphics/mesademos/MesaLib-7.2.tar.bz2.sig
new file mode 100644
index 0000000..96fb375
Binary files /dev/null and b/graphics/mesademos/MesaLib-7.2.tar.bz2.sig differ



More information about the SM-Commit mailing list