From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 28 Feb 2013 15:31:04 +0000 (+0100)
Subject: - added vdpau-softpipe fix to link patch (bug introduced with automake support, made... 
X-Git-Tag: auto/th/Mesa-9.1-3~3
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=d9ca63e35769520c1467b509af73c0586fb96533;p=packages%2FMesa.git

- added vdpau-softpipe fix to link patch (bug introduced with automake support, made this backend unusable)
- removed fixed libraries from skip_post_check_so
---

diff --git a/Mesa-link.patch b/Mesa-link.patch
index 18819f8..9f34e81 100644
--- a/Mesa-link.patch
+++ b/Mesa-link.patch
@@ -41,3 +41,14 @@
          $()
  
  if HAVE_X86_ASM
+--- Mesa-9.1/src/gallium/targets/vdpau-softpipe/Makefile.am.orig	2013-02-20 01:26:22.000000000 +0100
++++ Mesa-9.1/src/gallium/targets/vdpau-softpipe/Makefile.am	2013-02-28 15:46:37.886610941 +0100
+@@ -35,7 +35,7 @@
+ vdpau_LTLIBRARIES = libvdpau_softpipe.la
+ 
+ libvdpau_softpipe_la_SOURCES = \
+-	$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_dri.c
++	$(top_srcdir)/src/gallium/auxiliary/vl/vl_winsys_xsp.c
+ 
+ libvdpau_softpipe_la_LDFLAGS = \
+ 	-module \
diff --git a/Mesa.spec b/Mesa.spec
index 37c9ad7..e913640 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -98,7 +98,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 #  _glapi_tls_Dispatch is defined in libglapi, but it's some kind of symbol ldd -r doesn't notice(?)
 # libdricore: internal library, not linked with libglapi
 # libgbm: circular dependency with libEGL (wayland_buffer_is_drm symbol)
-%define		skip_post_check_so      libGLESv1_CM.so.1.* libGLESv2.so.2.* libGL.so.1.* libOSMesa.so.* libdricore.*.so.* libgbm.*.so.* libXvMCnouveau.so.* libvdpau_softpipe.so.*
+%define		skip_post_check_so      libGLESv1_CM.so.1.* libGLESv2.so.2.* libGL.so.1.* libOSMesa.so.* libdricore.*.so.* libgbm.*.so.*
 
 # llvm build broken
 %define		filterout_ld    -Wl,--as-needed
@@ -979,8 +979,8 @@ dri_drivers="r200 radeon \
 %if %{without gallium_intel}
 i915 \
 %endif
-i965
-nouveau
+i965 \
+nouveau \
 %ifarch sparc sparcv9 sparc64
 ffb \
 %endif