- updated to 9.1.3

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

diff --git a/Mesa-link.patch b/Mesa-link.patch
index a07e1af343bf1076ca984fc04c944bde71f67085..18819f8b90d21809d4a2fb33f5cfb10c4057b639 100644 (file)
--- a/Mesa-link.patch
+++ b/Mesa-link.patch
@@ -1,76 +1,43 @@
---- Mesa-8.0.1/src/gallium/targets/vdpau-nouveau/Makefile.orig 2012-02-15 00:44:00.000000000 +0100
-+++ Mesa-8.0.1/src/gallium/targets/vdpau-nouveau/Makefile      2012-03-11 12:26:44.906377873 +0100
+--- Mesa-9.1/src/gallium/targets/xa-vmwgfx/Makefile.am~        2013-02-22 23:28:22.000000000 +0100
++++ Mesa-9.1/src/gallium/targets/xa-vmwgfx/Makefile.am 2013-02-26 19:51:30.938891682 +0100
+@@ -45,7 +45,8 @@
+       $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \
+       $(top_builddir)/src/gallium/drivers/svga/libsvga.la \
+       $(top_builddir)/src/gallium/drivers/trace/libtrace.la \
+-      $(top_builddir)/src/gallium/drivers/rbug/librbug.la
++      $(top_builddir)/src/gallium/drivers/rbug/librbug.la \
++      $(LIBDRM_LIBS)
+ 
+ nodist_EXTRA_libxatracker_la_SOURCES = dummy.cpp
+ 
+--- Mesa-9.1/src/gbm/Makefile.am~      2013-02-16 02:32:00.000000000 +0100
++++ Mesa-9.1/src/gbm/Makefile.am       2013-02-26 19:53:54.295673416 +0100
 @@ -19,7 +19,7 @@
-       $(COMMON_GALLIUM_SOURCES) \
-       $(DRIVER_SOURCES)
- 
--DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau --libs) -lXfixes
-+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau libdrm --libs) -lXfixes
- 
- LINK_WITH_CXX=1
- 
---- Mesa-8.0.1/src/gallium/targets/xvmc-nouveau/Makefile.orig  2012-02-15 00:44:00.000000000 +0100
-+++ Mesa-8.0.1/src/gallium/targets/xvmc-nouveau/Makefile       2012-03-11 12:34:15.799733412 +0100
-@@ -19,7 +19,7 @@
-       $(COMMON_GALLIUM_SOURCES) \
-       $(DRIVER_SOURCES)
- 
--DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau --libs) -lXfixes
-+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau libdrm --libs) -lXfixes -lXvMC
- 
- LINK_WITH_CXX=1
- 
---- Mesa-8.0.1/src/gallium/targets/xvmc-r300/Makefile.orig     2012-02-15 00:44:00.000000000 +0100
-+++ Mesa-8.0.1/src/gallium/targets/xvmc-r300/Makefile  2012-03-11 12:34:46.519728247 +0100
-@@ -15,7 +15,7 @@
-       $(COMMON_GALLIUM_SOURCES) \
-       $(DRIVER_SOURCES)
- 
--DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes
-+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -lXvMC
- 
- include ../Makefile.xvmc
- 
---- Mesa-8.0.1/src/gallium/targets/xvmc-r600/Makefile.orig     2012-02-15 00:44:00.000000000 +0100
-+++ Mesa-8.0.1/src/gallium/targets/xvmc-r600/Makefile  2012-03-11 12:35:23.323061190 +0100
-@@ -15,7 +15,7 @@
-       $(COMMON_GALLIUM_SOURCES) \
-       $(DRIVER_SOURCES)
- 
--DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes
-+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -lXvMC
- 
- include ../Makefile.xvmc
- 
---- Mesa-8.0.1/src/gallium/targets/xvmc-softpipe/Makefile.orig 2012-02-15 00:44:00.000000000 +0100
-+++ Mesa-8.0.1/src/gallium/targets/xvmc-softpipe/Makefile      2012-03-11 12:35:53.273062913 +0100
-@@ -14,7 +14,7 @@
- C_SOURCES = \
-       $(TOP)/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
- 
--DRIVER_LIBS =
-+DRIVER_LIBS = -lXvMC -lXext
- 
- include ../Makefile.xvmc
- 
---- Mesa-8.0.1/src/gallium/targets/xa-vmwgfx/Makefile.orig     2012-02-15 00:44:00.000000000 +0100
-+++ Mesa-8.0.1/src/gallium/targets/xa-vmwgfx/Makefile  2012-03-11 12:43:05.479747729 +0100
-@@ -30,6 +30,9 @@
- SOURCES = vmw_target.c
- OBJECTS = $(SOURCES:.c=.o)
- 
-+XA_LIBS = $(shell $(PKG_CONFIG) libdrm --libs)
-+XA_PC_REQ_PRIV = libdrm
-+
- ifeq ($(MESA_LLVM),1)
- LDFLAGS += $(LLVM_LDFLAGS)
- GALLIUM_AUXILIARIES += $(LLVM_LIBS)
-@@ -64,7 +67,7 @@
-               $(MKLIB_OPTIONS) \
-               -exports xa_symbols \
-                -install $(TOP)/$(LIB_DIR)/gallium \
--              $(OBJECTS) $(XA_LIB_DEPS) $(GALLIUM_AUXILIARIES)
-+              $(OBJECTS) $(XA_LIB_DEPS) $(GALLIUM_AUXILIARIES) $(XA_LIBS)
- 
- # xa pkgconfig file
- pcedit = sed \
+       main/backend.c \
+       main/common.c
+ libgbm_la_LDFLAGS = -version-info 1:0
+-libgbm_la_LIBADD = $(LIBUDEV_LIBS) $(LIBKMS_LIBS) $(DLOPEN_LIBS)
++libgbm_la_LIBADD = $(LIBUDEV_LIBS) $(LIBKMS_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIBS)
+ 
+ if HAVE_EGL_PLATFORM_WAYLAND
+ AM_CPPFLAGS = -DHAVE_WAYLAND_PLATFORM
+--- Mesa-9.1/src/gallium/targets/xvmc-nouveau/Makefile.am.orig 2013-02-20 01:26:22.000000000 +0100
++++ Mesa-9.1/src/gallium/targets/xvmc-nouveau/Makefile.am      2013-02-27 20:42:00.199549898 +0100
+@@ -48,6 +48,7 @@
+       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+       $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
+       $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
++      $(top_builddir)/src/gallium/drivers/nv30/libnv30.la \
+       $(top_builddir)/src/gallium/drivers/nv50/libnv50.la \
+       $(top_builddir)/src/gallium/drivers/nvc0/libnvc0.la \
+       $(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
+--- Mesa-9.1/src/mesa/libdricore/Makefile.am.orig      2013-02-20 01:26:22.000000000 +0100
++++ Mesa-9.1/src/mesa/libdricore/Makefile.am   2013-02-27 20:43:01.806214222 +0100
+@@ -42,6 +42,7 @@
+ libdricore@VERSION@_la_LDFLAGS = -version-number 1:0
+ libdricore@VERSION@_la_LIBADD = \
+         ../program/libdricore_program.la \
++      $(DLOPEN_LIBS)
+         $()
+ 
+ if HAVE_X86_ASM