Mesa: some adjustments and cleanups.

Don't build with libva, ever, it's unmaintained code in this project. libva acceleration will work just fine in media players without this. Hints about NVIDIA and fglrx building. Remove libva patch.
lunar-linux · Oct 12, 2012 · b8946c3 · b8946c3
1 parent 446068e
commit b8946c3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/lib/mesa-lib/BUILD b/lib/mesa-lib/BUILD
@@ -7,9 +7,8 @@
     bad_flags linker
   fi  &&
 
-  # Do not look for old libva
+  # Do not use libva here at all
-  sedit 's/libva = 0.31.1/libva = 0.32.1/' configure &&
+  OPTS+=" --disable-va" &&
-  patch_it $SOURCE2 1 &&
 
   OPTS+=" --with-dri-drivers=$(echo $MESADRIVER | sed s/\ /,/g)" &&
 

diff --git a/lib/mesa-lib/CONFIGURE b/lib/mesa-lib/CONFIGURE
@@ -57,9 +57,13 @@ message "${MESSAGE_COLOR}Gallium is an alternative to DRI and needed to do 3D ac
 message "nouveau, radeon(-hd), ati or Intel GMA (Poulsbo/Cedar Trail). However, Gallium is not"
 message "performing on Intel GENX graphics (Any onboard Corei3/5/7, G25/33/45, pinetrail gfx"
 message ""
+message "Open Source Drivers:"
 message "If you build for Intel DRI-based hardware, disable Gallium, llvm and enable libva, xvmc."
 message "If you build for Intel CedarTrail or Poulsbo, enable Gallium, llvm, xvmc, vdpau."
 message "If you build for NVidia or Ati hardware, enable Gallium, llvm, xvmc, vdpau."
+message ""
+message "Binary / Proprietary Drivers:"
+message "If building the NVIDIA/fglrx binary driver, disable gallium, llvm, vdpau, xvmc."
 message "${DEFAULT_COLOR}"
 
 mquery GALLIUM "Enable Gallium llvm renderer?" y "--enable-gallium-llvm" "--disable-gallium-llvm"

diff --git a/lib/mesa-lib/DEPENDS b/lib/mesa-lib/DEPENDS
@@ -10,6 +10,5 @@ depends libXt
 depends libXxf86vm
 
 optional_depends "libvdpau" "--enable-vdpau" "--disable-vdpau" "vdpau hw acceleration"
-optional_depends "libva"    "--enable-va"    "--disable-va"    "libVA hw acceleration (Disable if using a gallium driver)"
 optional_depends "libXvMC"  "--enable-xvmc"  "--disable-xvmc"  "XvMC hw acceleration"
 optional_depends "llvm"     ""  ""  "llvm is required when building Gallium drivers"
diff --git a/lib/mesa-lib/DETAILS b/lib/mesa-lib/DETAILS
@@ -1,15 +1,12 @@
            MODULE=mesa-lib
           VERSION=9.0
            SOURCE=MesaLib-$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=$PATCH_URL
        SOURCE_VFY=sha1:dcddfd6b6b4a4ed4f7123ca75fd0108007bbad74
-      SOURCE2_VFY=sha1:81f1e921a5cfe30655e79eb1a95beee77affda79
          WEB_SITE=http://www.mesa3d.org
           ENTERED=20060215
-          UPDATED=20121011
+          UPDATED=20121012
             SHORT="Mesa 3D library"
 
 cat << EOF