]>
Commit | Line | Data |
---|---|---|
a651d613 JB |
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 | |
8 | +DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau libdrm --libs) -lXfixes | |
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 | |
19 | +DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm_nouveau libdrm --libs) -lXfixes -lXvMC | |
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 | |
25 | @@ -15,7 +15,7 @@ | |
26 | $(COMMON_GALLIUM_SOURCES) \ | |
27 | $(DRIVER_SOURCES) | |
28 | ||
29 | -DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes | |
30 | +DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -lXvMC | |
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 | |
36 | @@ -15,7 +15,7 @@ | |
37 | $(COMMON_GALLIUM_SOURCES) \ | |
38 | $(DRIVER_SOURCES) | |
39 | ||
40 | -DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes | |
41 | +DRIVER_LIBS = $(shell $(PKG_CONFIG) libdrm --libs) -lXfixes -lXvMC | |
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 = | |
52 | +DRIVER_LIBS = -lXvMC -lXext | |
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 \ |