update to 9.2.4

.abf.yml

@@ -1,2 +1,4 @@
-sources:
+removed_sources:
   MesaLib-9.2.2.tar.bz2: 276ba49cea50b28eb3bc96df56520ae8b66cbb17
+sources:
+  MesaLib-9.2.4.tar.bz2: 8782c3c68b8024a011ab37b0c9d458ffa6d8d37c

0201-revert-fix-glxinitializevisualconfigfromtags-handling.patch

@@ -1,36 +0,0 @@
-This patch should make invesalius work again (#59269).
-
-Note that if you run your apps with LIBGL_DIAGNOSTIC=1 mesa will act as if this
-patch was not applied (making invesalius crash).
-
-It reverts the following commit from mesa 7.8 branch:
-
-From ad7d36e91933a49ce3f6ed2c14ae585a8a84fdf5 Mon Sep 17 00:00:00 2001
-From: Aaron Plattner <aplattner@nvidia.com>
-Date: Thu, 22 Apr 2010 16:30:42 +0000
-Subject: Fix __glXInitializeVisualConfigFromTags's handling of unrecognized
-fbconfig tags.
-
-__glXInitializeVisualConfigFromTags doesn't skip the payload of
-unrecognized tags.  Instead, it treats the value as if it were the
-next tag, which can happen if the server's GLX extension is not
-Mesa's.  For example, this falls down when NVIDIA sends a
-GLX_FLOAT_COMPONENTS_NV = 0 pair, causing
-__glXInitializeVisualConfigFromTags to bail out early.
-
-Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
-Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
-
-diff -p -up ./src/glx/glxext.c.orig ./src/glx/glxext.c
---- ./src/glx/glxext.c.orig	2010-10-02 00:51:28.000000000 +0200
-+++ ./src/glx/glxext.c	2010-10-05 21:04:00.000000000 +0200
-@@ -568,9 +568,6 @@ __glXInitializeVisualConfigFromTags(stru
-              long int tagvalue = *bp++;
-              fprintf(stderr, "WARNING: unknown GLX tag from server: "
-                      "tag 0x%lx value 0x%lx\n", tag, tagvalue);
--         } else {
--             /* Ignore the unrecognized tag's value */
--             bp++;
-          }
-          break;
-       }

mesa-9.2-no-useless-vdpau.patch

@@ -0,0 +1,27 @@
+Neither of these drivers does anything on-GPU, so, no.
+
+diff -up mesa-20130508/src/gallium/targets/Makefile.am.jx mesa-20130508/src/gallium/targets/Makefile.am
+--- mesa-20130508/src/gallium/targets/Makefile.am.jx	2013-05-08 13:23:41.000000000 -0400
++++ mesa-20130508/src/gallium/targets/Makefile.am	2013-05-08 14:59:50.897835932 -0400
+@@ -78,10 +78,6 @@ endif
+ if HAVE_ST_XVMC
+ SUBDIRS += xvmc-r300
+ endif
+-
+-if HAVE_ST_VDPAU
+-SUBDIRS += vdpau-r300
+-endif
+ endif
+ 
+ if HAVE_GALLIUM_R600
+@@ -142,10 +138,6 @@ endif
+ if HAVE_ST_XVMC
+ SUBDIRS += xvmc-softpipe
+ endif
+-
+-if HAVE_ST_VDPAU
+-SUBDIRS += vdpau-softpipe
+-endif
+ endif
+ 
+ if NEED_GALLIUM_LOADER

mesa.spec

@@ -4,8 +4,6 @@
 # (aco) Needed for the dri drivers
 %define _disable_ld_no_undefined 1
 
-%define OpenGL_supported_ver 3.1
-
 %bcond_with opencl
 %bcond_without osmesa
 %bcond_without radeonsi
@@ -14,23 +12,23 @@
 %bcond_without wayland
 
 %ifarch %{arm}
-%define dri_drivers "nouveau,r200,radeon,swrast"
+%define dri_drivers "nouveau,r200,radeon"
 %else
-%define dri_drivers "i915,i965,nouveau,r200,radeon,swrast"
+%define dri_drivers "i915,i965,nouveau,r200,radeon"
+%bcond_without vmware
 %endif
 
-# To select what gallium drivers to build, Mesa >= 7.11 uses a driver list
 # as for the dri drivers: so providing one.
 %define gallium_drivers "i915,r300,r600,nouveau,svga,swrast"
 %if %{with radeonsi}
 %define gallium_drivers "i915,r300,r600,radeonsi,nouveau,svga,swrast"
 %endif
 
-%define short_ver 9.2.2
+%define short_ver 9.2.4
 
 Summary:	OpenGL 3.0 compatible 3D graphics library
 Name:		mesa
-Version:	9.2.2
+Version:	9.2.4
 Release:	1
 License:	MIT
 Group:		System/Libraries
@@ -40,10 +38,12 @@ Source3:	make-git-snapshot.sh
 Source5:	mesa-driver-install
 Source6:	XvMCConfig
 Source7:	README.xvmc
-Patch0:		0201-revert-fix-glxinitializevisualconfigfromtags-handling.patch
 Patch1:		GLX_INDIRECT_RENDERING_mesa9_1.patch
 Patch2:		mesa-9.2-evergreen-big-endian.patch
 Patch3:		mesa-9.2-hardware-float.patch
+#Fedora
+Patch16: mesa-9.2-no-useless-vdpau.patch
+
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	gccmakedep
@@ -622,10 +622,7 @@ Mesa common meta-package for development files.
 
 %prep
 %setup -q -n Mesa-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%apply_patches
 
 %if %{with osmesa}
 # OSMesa cannot be built at the same time with the whole of Mesa:
@@ -650,7 +647,6 @@ export LDFLAGS="-L%{_libdir}/llvm"
 %configure2_5x \
 	--enable-dri \
 	--enable-glx \
-	--enable-xa \
 	--enable-vdpau \
 %if %{with opencl}
 	--enable-opencl \
@@ -661,16 +657,19 @@ export LDFLAGS="-L%{_libdir}/llvm"
 %endif
 	--with-dri-driverdir=%{_libdir}/dri \
 	--with-dri-drivers="%{dri_drivers}" \
+%if %{with vmware}
+    --enable-xa \
+%endif
 	--with-gallium-drivers="%{gallium_drivers}" \
 	--enable-gallium-llvm \
 	--with-llvm-shared-libs \
 	--enable-egl \
-	--enable-gallium-egl \
+	--disable-gallium-egl \
 	--enable-gallium-gbm \
+	--disable-xvmc \
 	--enable-gbm \
 	--enable-gles1 \
 	--enable-gles2 \
-	--enable-openvg \
 	--enable-shared-glapi \
 %if %{with wayland}
 	--with-egl-platforms=x11,drm,wayland \
@@ -682,7 +681,7 @@ export LDFLAGS="-L%{_libdir}/llvm"
 %else
 	--disable-glx-tls \
 %endif
-	--enable-texture-float
+	--enable-texture-float=yes
 
 # 2. Build only OSMesa separately, since we want to build OSMesa without shared-glapi.
 %if %{with osmesa}