Author: arekm Date: Fri May 11 08:10:29 2012 GMT Module: packages Tag: DEVEL ---- Log message: - git master version
---- Files affected: packages/Mesa: Mesa-link.patch (NONE -> 1.1.2.1) (NEW) ---- Diffs: ================================================================ Index: packages/Mesa/Mesa-link.patch diff -u /dev/null packages/Mesa/Mesa-link.patch:1.1.2.1 --- /dev/null Fri May 11 10:10:29 2012 +++ packages/Mesa/Mesa-link.patch Fri May 11 10:10:24 2012 @@ -0,0 +1,121 @@ +--- 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/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 @@ + + lib_LTLIBRARIES = libglapi.la + libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) +-libglapi_la_LDFLAGS = -no-undefined ++libglapi_la_LDFLAGS = -no-undefined -pthread + + include $(GLAPI)/gen/glapi_gen.mk + glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) ================================================================ _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
