1 |
tupone 12/04/26 19:57:23 |
2 |
|
3 |
Modified: worldofpadman-1.6-gentoo.patch |
4 |
Log: |
5 |
Fix undefined references for theora. Bug #407081 |
6 |
|
7 |
(Portage version: 2.1.10.57/cvs/Linux i686) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: worldofpadman-1.6-gentoo.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- worldofpadman-1.6-gentoo.patch 24 Feb 2012 20:47:16 -0000 1.1 |
23 |
+++ worldofpadman-1.6-gentoo.patch 26 Apr 2012 19:57:23 -0000 1.2 |
24 |
@@ -1,5 +1,86 @@ |
25 |
---- Makefile.old 2012-02-23 12:15:09.582701642 +0100 |
26 |
-+++ Makefile 2012-02-23 12:15:37.970700295 +0100 |
27 |
+--- Makefile.old 2012-04-26 21:40:25.277417417 +0200 |
28 |
++++ Makefile 2012-04-26 21:43:34.300835150 +0200 |
29 |
+@@ -344,11 +344,11 @@ |
30 |
+ endif |
31 |
+ |
32 |
+ ifeq ($(USE_CIN_THEORA),1) |
33 |
+- CLIENT_LDFLAGS += -ltheora |
34 |
++ CLIENT_LIBS += -ltheora |
35 |
+ endif |
36 |
+ |
37 |
+ ifeq ($(USE_CODEC_MP3),1) |
38 |
+- CLIENT_LDFLAGS += -lmad |
39 |
++ CLIENT_LIBS += -lmad |
40 |
+ endif |
41 |
+ |
42 |
+ ifeq ($(USE_CURL),1) |
43 |
+@@ -380,12 +380,12 @@ |
44 |
+ |
45 |
+ ifeq ($(USE_CIN_THEORA),1) |
46 |
+ BASE_CFLAGS += -DUSE_CIN_THEORA |
47 |
+- CLIENT_LDFLAGS += -ltheora |
48 |
++ CLIENT_LIBS += -ltheora |
49 |
+ endif |
50 |
+ |
51 |
+ ifeq ($(USE_CODEC_MP3),1) |
52 |
+ BASE_CFLAGS += -DUSE_CODEC_MP3 |
53 |
+- CLIENT_LDFLAGS += -lmad |
54 |
++ CLIENT_LIBS += -lmad |
55 |
+ endif |
56 |
+ else # ifeq Linux |
57 |
+ |
58 |
+@@ -435,12 +435,12 @@ |
59 |
+ |
60 |
+ ifeq ($(USE_CIN_THEORA),1) |
61 |
+ BASE_CFLAGS += -DUSE_CIN_THEORA |
62 |
+- CLIENT_LDFLAGS += -ltheora |
63 |
++ CLIENT_LIBS += -ltheora |
64 |
+ endif |
65 |
+ |
66 |
+ ifeq ($(USE_CODEC_MP3),1) |
67 |
+ BASE_CFLAGS += -DUSE_CODEC_MP3 |
68 |
+- CLIENT_LDFLAGS += -lmad |
69 |
++ CLIENT_LIBS += -lmad |
70 |
+ endif |
71 |
+ |
72 |
+ BASE_CFLAGS += -D_THREAD_SAFE=1 |
73 |
+@@ -565,7 +565,7 @@ |
74 |
+ endif |
75 |
+ |
76 |
+ ifeq ($(USE_CODEC_MP3),1) |
77 |
+- CLIENT_LDFLAGS += -lmad |
78 |
++ CLIENT_LIBS += -lmad |
79 |
+ endif |
80 |
+ |
81 |
+ ifeq ($(ARCH),x86) |
82 |
+@@ -662,11 +662,11 @@ |
83 |
+ endif |
84 |
+ |
85 |
+ ifeq ($(USE_CIN_THEORA),1) |
86 |
+- CLIENT_LDFLAGS += -ltheora |
87 |
++ CLIENT_LIBS += -ltheora |
88 |
+ endif |
89 |
+ |
90 |
+ ifeq ($(USE_CODEC_MP3),1) |
91 |
+- CLIENT_LDFLAGS += -lmad |
92 |
++ CLIENT_LIBS += -lmad |
93 |
+ endif |
94 |
+ |
95 |
+ # cross-compiling tweaks |
96 |
+@@ -732,11 +732,11 @@ |
97 |
+ endif |
98 |
+ |
99 |
+ ifeq ($(USE_CIN_THEORA),1) |
100 |
+- CLIENT_LDFLAGS += -ltheora |
101 |
++ CLIENT_LIBS += -ltheora |
102 |
+ endif |
103 |
+ |
104 |
+ ifeq ($(USE_CODEC_MP3),1) |
105 |
+- CLIENT_LDFLAGS += -lmad |
106 |
++ CLIENT_LIBS += -lmad |
107 |
+ endif |
108 |
+ |
109 |
+ ifeq ($(USE_CURL),1) |
110 |
@@ -1780,7 +1780,7 @@ |
111 |
|
112 |
$(B)/wop-smp$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) |