mesalib: pick GIT option and the r600 and swrast drivers NO gallium

9 files changed, 101 insertions, 47 deletions

diff --git a/graphics-libs/mesalib/BUILD b/graphics-libs/mesalib/BUILD
index 8cb1c61f43..6bffb44376 100755
--- a/graphics-libs/mesalib/BUILD
+++ b/graphics-libs/mesalib/BUILD
@@ -1,4 +1,12 @@
 local MESALIB_DRIVERS_CONF="${MESALIB_DRIVERS//\ /,}"  &&
+
+case $MESALIB_GALLIUM in
+  none) OPTS="${OPTS} --disable-gallium" ;;
+  intel) OPTS="${OPTS} --enable-gallium-intel" ;;
+  radeon) OPTS="${OPTS} --enable-gallium-radeon --disable-gallium-intel" ;;
+  nouveau) OPTS="${OPTS} --enable-gallium-nouveau --disable-gallium-intel" ;;
+  all) OPTS="${OPTS} --enable-gallium-intel --enable-gallium-radeon --enable-gallium-nouveau" ;;
+esac &&
 OPTS="--with-driver=$MESALIB_BUILD                     \
       --with-dri-drivers=$MESALIB_DRIVERS_CONF         \
       $OPTS"                                           &&
diff --git a/graphics-libs/mesalib/CONFIGURE b/graphics-libs/mesalib/CONFIGURE
index 2341231506..437ef7292e 100755
--- a/graphics-libs/mesalib/CONFIGURE
+++ b/graphics-libs/mesalib/CONFIGURE
@@ -33,29 +33,17 @@ config_query_list MESALIB_BUILD                                          \
                   dri                                                    \
                   osmesa                                                 &&
 if [[ $MESALIB_BUILD == dri ]]; then
+  if  [[  "$MESALIB_GIT"  ==  "y"  ]];  then
+    AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon s3v savage sis tdfx trident unichrome ffb swrast"
+  else
+    AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome ffb swrast"
+  fi
 config_query_multi MESALIB_DRIVERS                                       \
                    "What drivers would you like to build?"               \
-                   swrast                                                \
-                   all                                                   \
-                   i810                                                  \
-                   i915                                                  \
-                   i965                                                  \
-                   mach64                                                \
-                   mga                                                   \
-                   r128                                                  \
-                   r200                                                  \
-                   r300                                                  \
-                   radeon                                                \
-                   s3v                                                   \
-                   savage                                                \
-                   sis                                                   \
-                   tdfx                                                  \
-                   trident                                               \
-                   unichrome                                             \
-                   ffb                                                   &&
+                   $AVAILABLE_DRIVERS                                    &&
   if list_find "$MESALIB_DRIVERS" all
   then
-  MESALIB_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome ffb swrast"
+  MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
   fi
 fi                                                                       &&
 
@@ -63,4 +51,8 @@ if [[ $MESALIB_BUILD == xlib ]]; then
 config_query_multi MESALIB_DRIVERS                                       \
                    "What drivers would you like to build?"               \
                    swrast
-fi
+fi                                                                       &&
+
+config_query_multi MESALIB_GALLIUM                                       \
+                   "What Gallium3D drivers woulld you like to build?"    \
+                   none intel radeon nouveau all
diff --git a/graphics-libs/mesalib/DEPENDS b/graphics-libs/mesalib/DEPENDS
index d2218987af..f509d9c33e 100755
--- a/graphics-libs/mesalib/DEPENDS
+++ b/graphics-libs/mesalib/DEPENDS
@@ -16,9 +16,14 @@ depends libxau &&
 depends libxfixes &&
 depends glproto &&
 
-if spell_ok libdrm && [[ $(installed_version libdrm|sed 's:\.::g') -lt 243 ]]; then
-  force_depends libdrm
-fi &&
+optional_depends libxcb \
+                 '--enable-xcb' \
+                 '--disable-xcb' \
+                 'Enable XCB support?'
+
+#if spell_ok libdrm && [[ $(installed_version libdrm|sed 's:\.::g') -lt 243 ]]; then
+#  force_depends libdrm
+#fi &&
 
 
 if [[ $MESALIB_GIT == y ]]; then
diff --git a/graphics-libs/mesalib/DETAILS b/graphics-libs/mesalib/DETAILS
index dc4a280c96..cbc8561d25 100755
--- a/graphics-libs/mesalib/DETAILS
+++ b/graphics-libs/mesalib/DETAILS
@@ -11,15 +11,15 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/mesalib-git
    SOURCE_URL[0]=git://anongit.freedesktop.org/git/mesa/mesa:mesalib-git
    SOURCE_IGNORE=volatile
 else
-         VERSION=7.4.4
-     SOURCE_HASH=sha512:cb3a9abba1b4594341ad6e0bd17fbd613913b7348648c2269c855ff9ab10452784f479fdd7368fbdc56460354c3b9d48b6db82c56852b3b761240fe754e49c5f
+         VERSION=7.5.1
+     SOURCE_HASH=sha512:6ecbaf918c8dd5fae8852f4fdf26129904bee09c4feb67515d01ce5a48a801425e7b18258a5c4c6ae72fc94c70b9883c80dcf54879dcd4688fa01bd141338364
           SOURCE=MesaLib-${VERSION}.tar.bz2
-   SOURCE_URL[0]=${SOURCEFORGE_URL}/mesa3d/${SOURCE}
+   SOURCE_URL[0]=ftp://ftp.freedesktop.org/pub/mesa/$VERSION/$SOURCE
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Mesa-${VERSION}
 #      SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
 fi
       LICENSE[0]=GPL
-        WEB_SITE=http://mesa3d.sourceforge.net/
+        WEB_SITE=http://www.mesa3d.org/
         KEYWORDS="graphics libs"
          ENTERED=20021120
            SHORT="Mesa implementation of the OpenGL(TM) API"
diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY
index 6243db604a..f95f803ad9 100644
--- a/graphics-libs/mesalib/HISTORY
+++ b/graphics-libs/mesalib/HISTORY
@@ -1,3 +1,9 @@
+2009-09-13 Peng Chang (Charles) <chp@sourcemage.org>
+	* DETAILS: updated to 7.5.1, also updated SOURCE_URL and WEB_SITE
+
+2009-08-06 Arjan Bouter <abouter@sourcemage.org>
+	* CONFIGURE, BUILD: added gallium drivers
+
 2009-07-31 Eric Sandall <sandalle@sourcemage.org>
 	* DEPENDS: Bash does not support floating point arithmetic, reduce
 	  to integer.
@@ -6,6 +12,21 @@
 	  This fixes libdrm always being forced
 	* PRE_BUILD: autogen.sh only exists in GIT checkout so only fix there
 
+2009-07-28 Arjan Bouter <abouter@sourcemage.org>
+	* PRE_BUILD: moved the sedit for configure
+
+2009-07-25 Arjan Bouter <abouter@sourcemage.org>
+	* PRE_BUILD: add patch for scm version, don't run configure
+	  from autogen.sh
+	* DEPENDS: added optional dep on libxcb
+	* CONFIGURE, SUB_DEPENDS: added r600 for scm version
+	* PROVIDES: provides GLUT
+	* gl_select-scm.patch: added
+
+2009-07-17 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: Updated to 7.5
+	  SOURCE matches upstream posted MD5
+
 2009-06-24 Ladislav Hagara <hgr@vabo.cz>
 	* DETAILS: 7.4.4
 
diff --git a/graphics-libs/mesalib/PRE_BUILD b/graphics-libs/mesalib/PRE_BUILD
index 1500359151..0c29c2c078 100755
--- a/graphics-libs/mesalib/PRE_BUILD
+++ b/graphics-libs/mesalib/PRE_BUILD
@@ -1,6 +1,10 @@
 default_pre_build                                            &&
 cd ${SOURCE_DIRECTORY}                                       &&
-patch -p1 < $SPELL_DIRECTORY/gl_select.patch                 &&
+if  [[  "$MESALIB_GIT"  ==  "y"  ]];  then
+  patch -p1 < $SPELL_DIRECTORY/gl_select-scm.patch
+else
+  patch -p1 < $SPELL_DIRECTORY/gl_select.patch
+fi                                                           &&
 cd ${SOURCE_DIRECTORY}/configs                               &&
 sedit "s:/usr/local:/usr:g" default                          &&
 
diff --git a/graphics-libs/mesalib/PROVIDES b/graphics-libs/mesalib/PROVIDES
index 3fc56f65bb..3721e176ce 100755
--- a/graphics-libs/mesalib/PROVIDES
+++ b/graphics-libs/mesalib/PROVIDES
@@ -1 +1,2 @@
 OPENGL
+GLUT
diff --git a/graphics-libs/mesalib/SUB_DEPENDS b/graphics-libs/mesalib/SUB_DEPENDS
index dc613c1633..8b1f39f5e4 100755
--- a/graphics-libs/mesalib/SUB_DEPENDS
+++ b/graphics-libs/mesalib/SUB_DEPENDS
@@ -11,29 +11,17 @@ case $THIS_SUB_DEPENDS in
 
     . $GRIMOIRE/config_query_multi.function                              &&
    if [[ $MESALIB_BUILD == dri ]]; then
+      if  [[  "$MESALIB_GIT"  ==  "y"  ]];  then
+         AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon s3v savage sis tdfx trident unichrome ffb swrast"
+      else
+         AVAILABLE_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome ffb swrast"
+      fi
    config_query_multi MESALIB_DRIVERS                                    \
                       "What drivers would you like to build?"            \
-                      swrast                                             \
-                      all                                                \
-                      i810                                               \
-                      i915                                               \
-                      i965                                               \
-                      mach64                                             \
-                      mga                                                \
-                      r128                                               \
-                      r200                                               \
-                      r300                                               \
-                      radeon                                             \
-                      s3v                                                \
-                      savage                                             \
-                      sis                                                \
-                      tdfx                                               \
-                      trident                                            \
-                      unichrome                                          \
-                      ffb                                                &&
+                      $AVAILABLE_DRIVERS                                 &&
      if list_find "$MESALIB_DRIVERS" all
      then
-     MESALIB_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v savage sis tdfx trident unichrome ffb swrast"
+     MESALIB_DRIVERS="$AVAILABLE_DRIVERS"
      fi
    fi                                                                    ;;
 
diff --git a/graphics-libs/mesalib/gl_select-scm.patch b/graphics-libs/mesalib/gl_select-scm.patch
new file mode 100644
index 0000000000..c770e9b9f6
--- /dev/null
+++ b/graphics-libs/mesalib/gl_select-scm.patch
@@ -0,0 +1,35 @@
+diff -Naur ./mesalib-git.orig/src/mesa/Makefile mesalib-git/src/mesa/Makefile
+--- ./mesalib-git.orig/src/mesa/Makefile	2009-07-24 12:06:06.000000000 +0200
++++ mesalib-git/src/mesa/Makefile	2009-07-25 21:02:07.827668651 +0200
+@@ -123,14 +123,30 @@
+ 
+ install-headers:
+ 	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
++	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/mesa
++	$(INSTALL) -m 644  $(TOP)/include/GL/gl.h \
++		$(DESTDIR)$(INSTALL_INC_DIR)/GL/mesa/
++	$(INSTALL) -m 644  $(TOP)/include/GL/glx.h \
++		$(DESTDIR)$(INSTALL_INC_DIR)/GL/mesa/
++	$(INSTALL) -m 644  $(TOP)/include/GL/glxext.h \
++		$(DESTDIR)$(INSTALL_INC_DIR)/GL/mesa/
++	$(INSTALL) -m 644  $(TOP)/include/GL/glext.h \
++		$(DESTDIR)$(INSTALL_INC_DIR)/GL/mesa/
++	mkdir -p $(TOP)/include/GL/backups
++	mv $(TOP)/include/GL/gl.h $(TOP)/include/GL/backups/
++	mv $(TOP)/include/GL/glx.h $(TOP)/include/GL/backups/
++	mv $(TOP)/include/GL/glxext.h $(TOP)/include/GL/backups/
++	mv $(TOP)/include/GL/glext.h $(TOP)/include/GL/backups/
+ 	$(INSTALL) -m 644 $(TOP)/include/GL/*.h \
+ 		$(DESTDIR)$(INSTALL_INC_DIR)/GL
++	mv $(TOP)/include/GL/backups/* $(TOP)/include/GL/
+ 
+ install-libgl: default gl.pc install-headers
+ 	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
++	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/mesa
+ 	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+ 	$(MINSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
+-		$(DESTDIR)$(INSTALL_LIB_DIR)
++		$(DESTDIR)$(INSTALL_LIB_DIR)/mesa
+ 	$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
+ 
+ install-osmesa: default osmesa.pc