Fix undefined references for theora. Bug #407081

Package-Manager: portage-2.1.10.57/cvs/Linux i686

3 files changed, 95 insertions, 9 deletions

diff --git a/games-fps/worldofpadman/ChangeLog b/games-fps/worldofpadman/ChangeLog
index a529a8208f79..9e0c1b991862 100644
--- a/games-fps/worldofpadman/ChangeLog
+++ b/games-fps/worldofpadman/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/worldofpadman
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/worldofpadman/ChangeLog,v 1.8 2012/02/24 20:47:16 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/worldofpadman/ChangeLog,v 1.9 2012/04/26 19:57:23 tupone Exp $
+
+  26 Apr 2012; Tupone Alfredo <tupone@gentoo.org>
+  files/worldofpadman-1.6-gentoo.patch:
+  Fix undefined references for theora. Bug #407081 by Lars Wendler
+  (Polynomial-C)
 
 *worldofpadman-1.6 (24 Feb 2012)
 
diff --git a/games-fps/worldofpadman/Manifest b/games-fps/worldofpadman/Manifest
index 1303ddb08145..b83b1d7f4bc7 100644
--- a/games-fps/worldofpadman/Manifest
+++ b/games-fps/worldofpadman/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX worldofpadman-1.6-gentoo.patch 524 RMD160 82c47b1be2dfa7907cf7dd8e20b5cf06d2a16bff SHA1 0d2bdbf4e31303438a6b548251b9011bfd23fe80 SHA256 151467453ca218397e202be804f23d2022fc14802b72dbe5535db6bc5961a7ac
+AUX worldofpadman-1.6-gentoo.patch 2102 RMD160 149ddab77f2d562774ce1316ba89bcddc24764dd SHA1 062161d5035453d9ea5e4aa0cd1c173178520b5b SHA256 4755298fa34f296d6fdc9334d875b582463ca4e5ae74c65c69e2bbdfb07a463f
 DIST wop-1.5-unified.zip 947290087 RMD160 5a2e1ffdd0f331590d4bce47ae39ca816b18164b SHA1 ff3b24e7067dee9863e83fef19807899530f7445 SHA256 82af4a8b93cac1a6fa8deb2607e9b0a15255f8386b0c8cb21d6e532ac6c601f5
 DIST wop-1.5.x-to-1.6-patch-unified.zip 122204892 RMD160 3563e55acd98f217c496e671bac9f921cf71e64b SHA1 bc83939f1991a5edb3329d35c028a9f54227f3d4 SHA256 fe120218823825d742c506b2f448e15bf6ca756b99bc1d11d12749191e12c4c7
 DIST wop-engine-1.2.tar.bz2 6083105 RMD160 dc9fc47072ab32f8219b050db58b3e730c7f34b8 SHA1 9b9da3e7526043df941cac29f6b58ce7a93c6542 SHA256 23d7c68736796a1566fdb2b4398c18420fbceaaa9e9c385a0332cda2788fa976
@@ -10,12 +10,12 @@ DIST wop_patch_1_2.run 72187892 RMD160 8da168113f37e57f15bda46586be0573770c6d4d
 DIST worldofpadman.run 576952895 RMD160 314b16ef92346e9ff25da39b2fcf148f5423c9a3 SHA1 cd6e37bf6148fbd7a2f1553d6c52bd9aa7c6193f SHA256 35ca142d9f212ac25781f2a28ae4a60180c9e93dcd0acee7d2125bf49871582d
 EBUILD worldofpadman-1.2-r1.ebuild 2333 RMD160 8929546de7f14f07e135c48aeac435824ae12154 SHA1 48178999a4b838bd90ebc58101c5f29eaf4c1eb5 SHA256 48f52a48733940b0e478971228f63e2d5f86b930c1ca3cedc4a745ddd78a2f82
 EBUILD worldofpadman-1.6.ebuild 2282 RMD160 9550e11f6e099a312b9ce4d1ec226b51d474592e SHA1 72f13de3b41e1a9f0b5dabec22a02b310025ca74 SHA256 4955c3799dc20885443cc7ef1731a65fc8f60a63f45679d9db9ca6b37ff6099b
-MISC ChangeLog 1389 RMD160 2e33146fd5e55fbec06aaf982b677e8e67e67d8e SHA1 51ad235f0e7cd4286711230a8cd4b92cf6b56e37 SHA256 d378d8ba57a13950fa6d071379d946e61c0acc565516dc0b0c73cde6c0b76673
+MISC ChangeLog 1564 RMD160 1ff4aef1cae8a12d54f29d619e25cd529d935a34 SHA1 e4975104a7fd993dd26f99ac463394186cccd565 SHA256 69a9bc50aab94cbcb5c1917869f4222a67697362e7f060b731bad8b5ffeddba9
 MISC metadata.xml 235 RMD160 aa0c60d8e162d5720851d213ee34c152d1de6712 SHA1 039cceb76a7f0e8b80b1704ebd8ad8501ea84f61 SHA256 ba7e89e78da07591bbf79b474180b7d9f4e53e8f877663be273bf0b7a6af7c29
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk9H92IACgkQIY77eQFFFC2EowCg6ndMAKIgqkh5RRmS6gKxyuvU
-OXAAnjRO3ZZaaZGKxtVE8tm45CAQy2qk
-=Y0W+
+iEYEARECAAYFAk+ZqK4ACgkQIY77eQFFFC1iLwCfePdah3Q29RFAJOQzjVmtRnJ4
++pIAoKYpq5GI9SiA+q2jZlsftUbG8jmZ
+=ls/1
 -----END PGP SIGNATURE-----
diff --git a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch b/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
index 1fc70501e6a6..04804563646d 100644
--- a/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
+++ b/games-fps/worldofpadman/files/worldofpadman-1.6-gentoo.patch
@@ -1,5 +1,86 @@
---- Makefile.old	2012-02-23 12:15:09.582701642 +0100
-+++ Makefile	2012-02-23 12:15:37.970700295 +0100
+--- Makefile.old	2012-04-26 21:40:25.277417417 +0200
++++ Makefile	2012-04-26 21:43:34.300835150 +0200
+@@ -344,11 +344,11 @@
+   endif
+   
+   ifeq ($(USE_CIN_THEORA),1)
+-    CLIENT_LDFLAGS += -ltheora
++    CLIENT_LIBS += -ltheora
+   endif
+   
+   ifeq ($(USE_CODEC_MP3),1)
+-    CLIENT_LDFLAGS += -lmad
++    CLIENT_LIBS += -lmad
+   endif
+ 
+   ifeq ($(USE_CURL),1)
+@@ -380,12 +380,12 @@
+   
+   ifeq ($(USE_CIN_THEORA),1)
+     BASE_CFLAGS += -DUSE_CIN_THEORA
+-    CLIENT_LDFLAGS += -ltheora
++    CLIENT_LIBS += -ltheora
+   endif
+   
+   ifeq ($(USE_CODEC_MP3),1)
+     BASE_CFLAGS += -DUSE_CODEC_MP3
+-    CLIENT_LDFLAGS += -lmad
++    CLIENT_LIBS += -lmad
+   endif
+ else # ifeq Linux
+ 
+@@ -435,12 +435,12 @@
+   
+    ifeq ($(USE_CIN_THEORA),1)
+     BASE_CFLAGS += -DUSE_CIN_THEORA
+-    CLIENT_LDFLAGS += -ltheora
++    CLIENT_LIBS += -ltheora
+   endif
+   
+   ifeq ($(USE_CODEC_MP3),1)
+     BASE_CFLAGS += -DUSE_CODEC_MP3
+-    CLIENT_LDFLAGS += -lmad
++    CLIENT_LIBS += -lmad
+   endif
+ 
+   BASE_CFLAGS += -D_THREAD_SAFE=1
+@@ -565,7 +565,7 @@
+   endif
+ 
+   ifeq ($(USE_CODEC_MP3),1)
+-    CLIENT_LDFLAGS += -lmad
++    CLIENT_LIBS += -lmad
+   endif
+ 
+   ifeq ($(ARCH),x86)
+@@ -662,11 +662,11 @@
+   endif
+   
+   ifeq ($(USE_CIN_THEORA),1)
+-    CLIENT_LDFLAGS += -ltheora
++    CLIENT_LIBS += -ltheora
+   endif
+   
+   ifeq ($(USE_CODEC_MP3),1)
+-    CLIENT_LDFLAGS += -lmad
++    CLIENT_LIBS += -lmad
+   endif
+ 
+   # cross-compiling tweaks
+@@ -732,11 +732,11 @@
+   endif
+   
+   ifeq ($(USE_CIN_THEORA),1)
+-    CLIENT_LDFLAGS += -ltheora
++    CLIENT_LIBS += -ltheora
+   endif
+   
+   ifeq ($(USE_CODEC_MP3),1)
+-    CLIENT_LDFLAGS += -lmad
++    CLIENT_LIBS += -lmad
+   endif
+ 
+   ifeq ($(USE_CURL),1) 
 @@ -1780,7 +1780,7 @@
  
  $(B)/wop-smp$(FULLBINEXT): $(Q3OBJ) $(Q3ROBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN)