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

--- 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
@@ -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 -lxcb
 
 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 -lxcb -lX11
 
 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
@@ -17,7 +17,7 @@
 	$(COMMON_GALLIUM_SOURCES) \
 	$(DRIVER_SOURCES)
 
-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -lXvMC -ldrm_radeon -lX11 -lxcb
 
 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
@@ -17,7 +17,7 @@
 	$(COMMON_GALLIUM_SOURCES) \
 	$(DRIVER_SOURCES)
 
-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -lXvMC -ldrm_radeon -lX11 -lxcb
 
 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 -lX11
 
 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 \

--- m/src/gallium/targets/vdpau-r300/Makefile~	2012-05-10 22:56:51.000000000 +0200
+++ m/src/gallium/targets/vdpau-r300/Makefile	2012-05-11 09:25:42.791993195 +0200
@@ -21,7 +21,7 @@
 	$(COMMON_GALLIUM_SOURCES) \
 	$(DRIVER_SOURCES)
 
-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon -lxcb
 
 include ../Makefile.vdpau

--- m/src/gallium/targets/vdpau-r600/Makefile~	2012-05-10 22:56:51.000000000 +0200
+++ m/src/gallium/targets/vdpau-r600/Makefile	2012-05-11 09:26:14.899501899 +0200
@@ -17,7 +17,7 @@
 	$(COMMON_GALLIUM_SOURCES) \
 	$(DRIVER_SOURCES)
 
-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon -lxcb
 
 include ../Makefile.vdpau
 
--- p/src/gallium/targets/vdpau-softpipe/Makefile~	2012-05-10 22:56:51.000000000 +0200
+++ p/src/gallium/targets/vdpau-softpipe/Makefile	2012-05-11 09:27:05.364159093 +0200
@@ -14,7 +14,7 @@
 C_SOURCES = \
 	$(TOP)/src/gallium/auxiliary/vl/vl_winsys_xsp.c
 
-DRIVER_LIBS =
+DRIVER_LIBS = -lX11 -lXext
 
 include ../Makefile.vdpau

--- 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
 
-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon -lxcb
 
 include ../Makefile.vdpau
 
--- 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
Commit	Line	Data
f7cf327a	1	--- Mesa-8.0.1/src/gallium/targets/vdpau-nouveau/Makefile.orig 2012-02-15 00:44:00.000000000 +0100
	2	+++ Mesa-8.0.1/src/gallium/targets/vdpau-nouveau/Makefile 2012-03-11 12:26:44.906377873 +0100
	3	@@ -19,7 +19,7 @@
	4	$(COMMON_GALLIUM_SOURCES) \
	5	$(DRIVER_SOURCES)
	6
	7	-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau --libs) -lXfixes
6f8265c3	8	+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau libdrm --libs) -lXfixes -lxcb
f7cf327a	9
	10	LINK_WITH_CXX=1
	11
	12	--- Mesa-8.0.1/src/gallium/targets/xvmc-nouveau/Makefile.orig 2012-02-15 00:44:00.000000000 +0100
	13	+++ Mesa-8.0.1/src/gallium/targets/xvmc-nouveau/Makefile 2012-03-11 12:34:15.799733412 +0100
	14	@@ -19,7 +19,7 @@
	15	$(COMMON_GALLIUM_SOURCES) \
	16	$(DRIVER_SOURCES)
	17
	18	-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau --libs) -lXfixes
6f8265c3	19	+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau libdrm --libs) -lXfixes -lXvMC -lxcb -lX11
f7cf327a	20
	21	LINK_WITH_CXX=1
	22
	23	--- Mesa-8.0.1/src/gallium/targets/xvmc-r300/Makefile.orig 2012-02-15 00:44:00.000000000 +0100
	24	+++ Mesa-8.0.1/src/gallium/targets/xvmc-r300/Makefile 2012-03-11 12:34:46.519728247 +0100
6f8265c3	25	@@ -17,7 +17,7 @@
f7cf327a	26	$(COMMON_GALLIUM_SOURCES) \
	27	$(DRIVER_SOURCES)
	28
6f8265c3 AM	29	-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
6f8265c3 AM	30	+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -lXvMC -ldrm_radeon -lX11 -lxcb
f7cf327a	31
	32	include ../Makefile.xvmc
	33
	34	--- Mesa-8.0.1/src/gallium/targets/xvmc-r600/Makefile.orig 2012-02-15 00:44:00.000000000 +0100
	35	+++ Mesa-8.0.1/src/gallium/targets/xvmc-r600/Makefile 2012-03-11 12:35:23.323061190 +0100
6f8265c3	36	@@ -17,7 +17,7 @@
f7cf327a	37	$(COMMON_GALLIUM_SOURCES) \
	38	$(DRIVER_SOURCES)
	39
6f8265c3 AM	40	-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
6f8265c3 AM	41	+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -lXvMC -ldrm_radeon -lX11 -lxcb
f7cf327a	42
	43	include ../Makefile.xvmc
	44
	45	--- Mesa-8.0.1/src/gallium/targets/xvmc-softpipe/Makefile.orig 2012-02-15 00:44:00.000000000 +0100
	46	+++ Mesa-8.0.1/src/gallium/targets/xvmc-softpipe/Makefile 2012-03-11 12:35:53.273062913 +0100
	47	@@ -14,7 +14,7 @@
	48	C_SOURCES = \
	49	$(TOP)/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
	50
	51	-DRIVER_LIBS =
6f8265c3	52	+DRIVER_LIBS = -lXvMC -lXext -lX11
f7cf327a	53
	54	include ../Makefile.xvmc
	55
	56	--- Mesa-8.0.1/src/gallium/targets/xa-vmwgfx/Makefile.orig 2012-02-15 00:44:00.000000000 +0100
	57	+++ Mesa-8.0.1/src/gallium/targets/xa-vmwgfx/Makefile 2012-03-11 12:43:05.479747729 +0100
	58	@@ -30,6 +30,9 @@
	59	SOURCES = vmw_target.c
	60	OBJECTS = $(SOURCES:.c=.o)
	61
	62	+XA_LIBS = $(shell $(PKG_CONFIG) libdrm --libs)
	63	+XA_PC_REQ_PRIV = libdrm
	64	+
	65	ifeq ($(MESA_LLVM),1)
	66	LDFLAGS += $(LLVM_LDFLAGS)
	67	GALLIUM_AUXILIARIES += $(LLVM_LIBS)
	68	@@ -64,7 +67,7 @@
	69	$(MKLIB_OPTIONS) \
	70	-exports xa_symbols \
	71	-install $(TOP)/$(LIB_DIR)/gallium \
	72	- $(OBJECTS) $(XA_LIB_DEPS) $(GALLIUM_AUXILIARIES)
	73	+ $(OBJECTS) $(XA_LIB_DEPS) $(GALLIUM_AUXILIARIES) $(XA_LIBS)
	74
	75	# xa pkgconfig file
	76	pcedit = sed \
6f8265c3 AM	77
	78	--- m/src/gallium/targets/vdpau-r300/Makefile~ 2012-05-10 22:56:51.000000000 +0200
	79	+++ m/src/gallium/targets/vdpau-r300/Makefile 2012-05-11 09:25:42.791993195 +0200
	80	@@ -21,7 +21,7 @@
	81	$(COMMON_GALLIUM_SOURCES) \
	82	$(DRIVER_SOURCES)
	83
	84	-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
	85	+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon -lxcb
	86
	87	include ../Makefile.vdpau
	88
	89	--- m/src/gallium/targets/vdpau-r600/Makefile~ 2012-05-10 22:56:51.000000000 +0200
	90	+++ m/src/gallium/targets/vdpau-r600/Makefile 2012-05-11 09:26:14.899501899 +0200
	91	@@ -17,7 +17,7 @@
	92	$(COMMON_GALLIUM_SOURCES) \
	93	$(DRIVER_SOURCES)
	94
	95	-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
	96	+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon -lxcb
	97
	98	include ../Makefile.vdpau
	99
	100	--- p/src/gallium/targets/vdpau-softpipe/Makefile~ 2012-05-10 22:56:51.000000000 +0200
	101	+++ p/src/gallium/targets/vdpau-softpipe/Makefile 2012-05-11 09:27:05.364159093 +0200
	102	@@ -14,7 +14,7 @@
	103	C_SOURCES = \
	104	$(TOP)/src/gallium/auxiliary/vl/vl_winsys_xsp.c
	105
	106	-DRIVER_LIBS =
	107	+DRIVER_LIBS = -lX11 -lXext
	108
	109	include ../Makefile.vdpau
	110
3dc87f1a AM	111	--- p/src/gallium/targets/vdpau-radeonsi/Makefile~ 2012-08-06 18:56:40.000000000 +0200
	112	+++ p/src/gallium/targets/vdpau-radeonsi/Makefile 2012-09-07 22:44:07.304997361 +0200
	113	@@ -23,7 +23,7 @@
	114	DRIVER_DEFINES = \
	115	-DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_NOOP
	116
	117	-DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon
	118	+DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -ldrm_radeon -lxcb
	119
	120	include ../Makefile.vdpau
	121
	122	--- p/src/mesa/libdricore/Makefile.am~ 2012-08-26 21:00:26.000000000 +0200
	123	+++ p/src/mesa/libdricore/Makefile.am 2012-09-07 22:45:58.210981683 +0200
	124	@@ -46,7 +46,7 @@
	125	$(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
	126	$(top_builddir)/src/glsl/builtin_function.cpp
	127	libdricore@VERSION@_la_LDFLAGS = -version-number 1:0
	128	-libdricore@VERSION@_la_LIBADD = libdricore-asm.la
	129	+libdricore@VERSION@_la_LIBADD = libdricore-asm.la -ldl
	130
	131	# This is separated from libdricore to avoid conflics in object
	132	# outputs between main/clip.c and sparc/clip.c. The documented way to