[Lunar-commits] <moonbase> mesa-lib: updated to 8.0.2

[Zbigniew Luszpinski]

commit e9604122ee6d05b8465a8b6ffeafdc511f94d8d0
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sun Apr 29 23:15:39 2012 +0200

    mesa-lib: updated to 8.0.2
---
 xorg7/mesa-lib/BUILD     |   29 ++++++++++++++++++++---------
 xorg7/mesa-lib/CONFIGURE |    5 ++---
 xorg7/mesa-lib/DEPENDS   |    4 ++++
 xorg7/mesa-lib/DETAILS   |   13 ++++++-------
 xorg7/mesa-lib/PRE_BUILD |    4 ----
 5 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/xorg7/mesa-lib/BUILD b/xorg7/mesa-lib/BUILD
index 73ba3bc..95751e9 100644
--- a/xorg7/mesa-lib/BUILD
+++ b/xorg7/mesa-lib/BUILD
@@ -1,9 +1,15 @@
 (
 
+ # Do not look for old libva
+ sedit 's/libva = 0.31.1/libva = 0.32.0/' configure &&
+ patch_it $SOURCE2 1 &&
+
+ # EGL is for embedded use only when needed by deps later
+  OPTS+=" --disable-egl"  &&
+
   # Detect VMware VGA virtual 3D card and add driver for it
   VGA=`lspci | grep 'VGA.*VMware.*SVGA.*'`
   if [[ -n $VGA  ]]; then
-     bad_flags linker
      SUPPORTED_GALLIUM+="svga"
   fi  &&
 
@@ -15,9 +21,19 @@
   fi  &&
 
   if [[ $GALLIUM == y ]]; then
-    OPTS+=" --enable-gallium-llvm --enable-gallium-egl --enable-openvg "
+    OPTS+=" --enable-gallium-llvm --enable-egl --enable-gallium-egl --enable-openvg --enable-xa --enable-gallium-g3dvl"
+    if module_installed libXvMC; then
+       OPTS+=" --enable-xvmc"
+    fi
+    if module_installed libvdpau; then
+       OPTS+=" --enable-vdpau"
+    fi
+    if module_installed libva; then
+       OPTS+=" --enable-va"
+    fi
     if [[ -n $SUPPORTED_GALLIUM ]]; then
-    OPTS+="--with-gallium-drivers=$(echo $SUPPORTED_GALLIUM | sed s/\ /,/g)"
+    OPTS+=" --with-gallium-drivers=swrast,"
+    OPTS+=$(echo $SUPPORTED_GALLIUM | sed s/\ /,/g)
     fi
   else OPTS+=" --disable-gallium-llvm "
   fi  &&
@@ -26,13 +42,8 @@
   else sedit 's/^GALLIUM_DRIVERS_DEFAULT=.*/GALLIUM_DRIVERS_DEFAULT="swrast"/' configure
   fi  &&
 
-  # Don't overlap with freeglut
-  OPTS+=" --disable-glut"  &&
-  # Needed with mesa-lib 7.8.2
-  rm -f include/GL/glut{,f90}.h  &&
-
   if module_installed xorg-server; then
-     OPTS+=" --with-x --enable-xcb --enable-xorg"
+     OPTS+=" --with-x --enable-xorg"
   fi  &&
 
   ./configure --prefix=/usr $OPTS &&
diff --git a/xorg7/mesa-lib/CONFIGURE b/xorg7/mesa-lib/CONFIGURE
index 0954c3c..3aeee15 100644
--- a/xorg7/mesa-lib/CONFIGURE
+++ b/xorg7/mesa-lib/CONFIGURE
@@ -1,8 +1,7 @@
 # swrast is always included, in BUILD
 # nouveau is removed from the list because it fails to build in mesa 7.10.2
-SUPPORTED_DRIVERS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 radeon savage sis tdfx unichrome"
-SUPPORTED_GALLIUM="cell i915 i965 nouveau nv50 nvc0 nvfx r300 r600 svga"
-
+SUPPORTED_DRIVERS="i915 i965 nouveau r200 radeon"
+SUPPORTED_GALLIUM="i915 nouveau nv50 nvc0 nvfx r300 r600 svga"
 make_drivers_checklist() {
 
   # For each locale, extract name, title and charmap information
diff --git a/xorg7/mesa-lib/DEPENDS b/xorg7/mesa-lib/DEPENDS
index 6e42e91..254a8ac 100644
--- a/xorg7/mesa-lib/DEPENDS
+++ b/xorg7/mesa-lib/DEPENDS
@@ -8,3 +8,7 @@ depends libXi
 depends libXdamage
 depends libXt
 depends libXxf86vm
+
+optional_depends "libvdpau"         ""  ""  "vdpau hw acceleration using any gallium supported 3D GPU"
+optional_depends "libva"         ""  ""  "libVA hw acceleration using any gallium supported 3D GPU"
+optional_depends "libXvMC"         ""  ""  "XvMC hw acceleration using any gallium supported 3D GPU"
diff --git a/xorg7/mesa-lib/DETAILS b/xorg7/mesa-lib/DETAILS
index 616e069..78f7215 100644
--- a/xorg7/mesa-lib/DETAILS
+++ b/xorg7/mesa-lib/DETAILS
@@ -1,18 +1,17 @@
            MODULE=mesa-lib
-          VERSION=7.11.2
+          VERSION=8.0.2
            SOURCE=MesaLib-$VERSION.tar.bz2
-          SOURCE2=MesaGLUT-$VERSION.tar.bz2
+          SOURCE2=mesa-va-0.32.patch.bz2
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/Mesa-$VERSION
        SOURCE_URL=ftp://ftp.freedesktop.org/pub/mesa/$VERSION
-      SOURCE2_URL=$SOURCE_URL
-       SOURCE_VFY=sha1:5981ac2de8438e5f4a1f3561f2044d700c5f0de9
-      SOURCE2_VFY=sha1:2e6e730204800a0748b301a5f58b86332699788b
+      SOURCE2_URL=$PATCH_URL
+       SOURCE_VFY=sha1:bbb55d81294425137ee66c7389fbb474a43c9ab9
+      SOURCE2_VFY=sha1:81f1e921a5cfe30655e79eb1a95beee77affda79
          WEB_SITE=http://www.mesa3d.org
           ENTERED=20060215
-          UPDATED=20120122
+          UPDATED=20120325
             SHORT="Mesa 3D library"
 
-PSAFE=no
 cat << EOF
 Mesa is a 3-D graphics library with an API which is very similar to
 that of OpenGL.
diff --git a/xorg7/mesa-lib/PRE_BUILD b/xorg7/mesa-lib/PRE_BUILD
deleted file mode 100644
index e6879a5..0000000
--- a/xorg7/mesa-lib/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build        &&
-cd $BUILD_DIRECTORY      &&
-unpack $SOURCE2          &&
-cd $SOURCE_DIRECTORY