- fetch Mesa 9.0; 8.0.x left on MESA_8_0 branch

[packages/Mesa.git] / Mesa-link.patch

diff --git a/Mesa-link.patch b/Mesa-link.patch
index 6a1d5e71dd05538b48293cc7ac174aae2943eb92..cf561ee47892c006f18645de47c9654d41b2a6ec 100644 (file)
--- a/Mesa-link.patch
+++ b/Mesa-link.patch
@@ -108,14 +108,25 @@
  
  include ../Makefile.vdpau
 
---- p/src/mapi/shared-glapi/Makefile.am~       2012-05-10 22:56:51.000000000 +0200
-+++ p/src/mapi/shared-glapi/Makefile.am        2012-05-11 09:41:41.159294241 +0200
-@@ -6,7 +6,7 @@
+--- p/src/gallium/targets/vdpau-radeonsi/Makefile~     2012-08-06 18:56:40.000000000 +0200
++++ p/src/gallium/targets/vdpau-radeonsi/Makefile      2012-09-07 22:44:07.304997361 +0200
+@@ -23,7 +23,7 @@
+ DRIVER_DEFINES = \
+       -DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_NOOP
  
- lib_LTLIBRARIES = libglapi.la
- libglapi_la_SOURCES = $(MAPI_GLAPI_FILES)
--libglapi_la_LDFLAGS = -no-undefined
-+libglapi_la_LDFLAGS = -no-undefined -pthread
+-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
++DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon -lxcb
+ 
+ include ../Makefile.vdpau
  
- include $(GLAPI)/gen/glapi_gen.mk
- glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
+--- p/src/mesa/libdricore/Makefile.am~ 2012-08-26 21:00:26.000000000 +0200
++++ p/src/mesa/libdricore/Makefile.am  2012-09-07 22:45:58.210981683 +0200
+@@ -46,7 +46,7 @@
+       $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
+       $(top_builddir)/src/glsl/builtin_function.cpp
+ libdricore@VERSION@_la_LDFLAGS = -version-number 1:0
+-libdricore@VERSION@_la_LIBADD = libdricore-asm.la
++libdricore@VERSION@_la_LIBADD = libdricore-asm.la -ldl
+ 
+ # This is separated from libdricore to avoid conflics in object
+ # outputs between main/clip.c and sparc/clip.c.  The documented way to