diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2013-01-31 08:46:55 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2013-01-31 08:46:55 +0000 |
commit | 6876b7063754f55a65051dd230fd5bb989342d1c (patch) | |
tree | 7d587e1bb23a707083d72f0ebf68a6c6927eea6c /games-fps | |
parent | old (diff) | |
download | historical-6876b7063754f55a65051dd230fd5bb989342d1c.tar.gz historical-6876b7063754f55a65051dd230fd5bb989342d1c.tar.bz2 historical-6876b7063754f55a65051dd230fd5bb989342d1c.zip |
old
Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Diffstat (limited to 'games-fps')
-rw-r--r-- | games-fps/doomsday-resources/ChangeLog | 9 | ||||
-rw-r--r-- | games-fps/doomsday-resources/Manifest | 17 | ||||
-rw-r--r-- | games-fps/doomsday-resources/doomsday-resources-1.01.ebuild | 38 | ||||
-rw-r--r-- | games-fps/openarena/ChangeLog | 11 | ||||
-rw-r--r-- | games-fps/openarena/Manifest | 21 | ||||
-rw-r--r-- | games-fps/openarena/files/openarena-0.8.5-bots-strcpy-fix.patch | 33 | ||||
-rw-r--r-- | games-fps/openarena/files/openarena-0.8.5-makefile.patch | 321 | ||||
-rw-r--r-- | games-fps/openarena/files/openarena-0.8.5-unbundling.patch | 194 | ||||
-rw-r--r-- | games-fps/openarena/openarena-0.8.5.ebuild | 91 |
9 files changed, 22 insertions, 713 deletions
diff --git a/games-fps/doomsday-resources/ChangeLog b/games-fps/doomsday-resources/ChangeLog index e20e0c9a2dfa..44276d2bd2f7 100644 --- a/games-fps/doomsday-resources/ChangeLog +++ b/games-fps/doomsday-resources/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for games-fps/doomsday-resources -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday-resources/ChangeLog,v 1.7 2012/07/06 09:52:26 ago Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday-resources/ChangeLog,v 1.8 2013/01/31 08:46:06 mr_bones_ Exp $ + + 31 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> + -doomsday-resources-1.01.ebuild: + old 06 Jul 2012; Agostino Sarubbo <ago@gentoo.org> doomsday-resources-1.01-r1.ebuild: @@ -34,4 +38,3 @@ +doomsday-resources-1.01.ebuild: Initial import. Ebuild by Paul Bredbury <brebs@sent.com> and edited by me. Closing bug #117098. - diff --git a/games-fps/doomsday-resources/Manifest b/games-fps/doomsday-resources/Manifest index 8556aeaaec70..71dc4902ed7d 100644 --- a/games-fps/doomsday-resources/Manifest +++ b/games-fps/doomsday-resources/Manifest @@ -1,20 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - DIST jdoom-details.zip 1379495 SHA256 6c822f6a97eddb928d0c8b32f0c84eb5a0051207af0f820d309d94a8caa06556 SHA512 94f0c29940795368e9ffdb9fad57f0de65a936a90ad6256effe6fbaa72d1ddf45a016bb72431d1603ade84c01036f84b7dc3e739d04e6c33a41bdf50a9b45dce WHIRLPOOL 1fdf4158580e1c6c4ccdeb02c11ded119085872512e892e1a14b38b63f909e9247b74dc593d28bf9ee4e3fe81ac2fc8524c5ccc8604196df5fb96eb5f2844aa7 DIST jdoom-resource-pack-1.01.zip 23114845 SHA256 6797f3b3ccfbb4871027e8bd86153ad5b1d4d87c801a94effc962dabba5a09ac SHA512 ec40f3920338040803b7cb3029e6b52352179fe63a1c56bb74ff398e9eca0ae4c7c058213c812644add70b833c26f9a69844c2ae068cdf7d4c7a4f6c9e277636 WHIRLPOOL 309b2c39e9308bc3ba25b32414fc295a7293e7444bf81c33146a6a78568fc983eb00791cc61cd2111bb8981eb4d79127541ffe4e7372af75a3428556e8b1d26c EBUILD doomsday-resources-1.01-r1.ebuild 1062 SHA256 0985e8df3ef14d1ca15658e413c123c74e8fa23830f7298f5c5dae31bdd70100 SHA512 861dc9ace0c4648f9206db2118dc5101b7cc609ad50a7c4f472fd494e8ce55ea732b6446b985b021a85ae2e3f3109ef158ed2c5e290cc214826ee6f5981c161e WHIRLPOOL 7d8e1a811dec4aad7824d82f8216247113f83e61ff75a0738f04eff1252b292a697b20ab2c155619da5bdb69dd18ef256b55311f7b21936a09c503f8284ace3c -EBUILD doomsday-resources-1.01.ebuild 1047 SHA256 b34a149933b19e51f827f9b120fdbd7887973dad1eee9460db32eb4844e93ce2 SHA512 6c283abe5e96dea1153fabb21568a9ff387fb5d8a5408ea05754fdf0993ade2b1634379ffe148d7bc14446f3ccb7699e7f20ba2845ec2c4512d46991facaf9f3 WHIRLPOOL 80b32cd4b8838f2765ba2499033febd82778930def9df709578558b56571102db087ac9ced7a4fb6c65ef5e4c2a358bb63781b35f42a3c1b73b987d65db438d6 -MISC ChangeLog 1217 SHA256 c36c19c55c807a9a6080cc115cd8320add84dcf0f7b85b2ff79bd9ac9426ea29 SHA512 2883ee46dbe91f211d7936f0f3ec1bc69f81b2bf0e5a83daee6fd386dd9cbda9d44557602836b7f116ab7c6247c1ca01f8d53af9925f5bfc736f51c5613e3fac WHIRLPOOL 9bc3dd90e9126c66ada2c086de223c274db8dce0eaff358fe39fc6b0603051033ff92588786a1c990ba721821366459eb94952b34b525eec114ded3c82935dcb +MISC ChangeLog 1319 SHA256 9c293cb872a13f63069e6d6d526898b4f5e99810aa95f114f11d580965355db4 SHA512 31735a1d9cfb43d7df213e035dbf85484b517011c05f9437d980cb8544bfeaa1d8b96e403d94e94863b0623f5605a4375b3a638470ca743914aa032c33f7fd2b WHIRLPOOL efb71b33efe3f557bddf5076ef9790577cbccedf1ed7c70c545d0a336a266e0339563e52127c5a117dfac68b9719bc6d97d570d31d1e50e09268c33c9ab806e5 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iQEcBAEBCgAGBQJP9rVeAAoJEOTDgjZ80txdc6AH/iypQFFmKzjBS0zoqEpYvMi/ -zUB1KwDnTQZnIHqkynMcHK23uyPkfAvBpMtXCwC/5dYJacpuZnbRgePf3peepWrn -JAdWxe4VD5NBK0rnW78gsk45teVKI0zEJB4X3jwTt6mUJyBCjlEF36OSLtzQo8Ok -Ov436NOpC5hf/d7nR3NC+B7A7tolctJ/h3cM38XI8fXgMrtqwgMhJuiLQzHO23gm -2cSdWdjCaooa0QH9GNe5nBK3zJ4f3EC+wmDra//xr/YX/zid2gwkH4eGZNiiwXMR -gIDYUgvTtw/hJZwtA5cPDmebyPnER+XLQmTedUv/ukILi/dlRqZ0JHrUhtz9iEw= -=078u ------END PGP SIGNATURE----- diff --git a/games-fps/doomsday-resources/doomsday-resources-1.01.ebuild b/games-fps/doomsday-resources/doomsday-resources-1.01.ebuild deleted file mode 100644 index b8d74c648ef3..000000000000 --- a/games-fps/doomsday-resources/doomsday-resources-1.01.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday-resources/doomsday-resources-1.01.ebuild,v 1.4 2010/07/18 09:45:56 fauli Exp $ - -inherit eutils games - -DESCRIPTION="Improved models & textures for doomsday" -HOMEPAGE="http://www.doomsdayhq.com/" -SRC_URI="mirror://sourceforge/deng/jdoom-resource-pack-${PV}.zip - mirror://sourceforge/deng/jdoom-details.zip" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="x86" -IUSE="" - -RDEPEND="games-fps/doomsday" -DEPEND="app-arch/unzip" - -S=${WORKDIR} - -src_install() { - insinto "${GAMES_DATADIR}"/doomsday/data/jdoom/auto - doins data/jDoom/* *.pk3 || die "doins failed" - - # The definitions file cannot be auto-loaded - insinto "${GAMES_DATADIR}"/doomsday/defs/jdoom - doins defs/jDoom/* || die "doins failed" - - dodoc *.txt docs/* - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - elog "Add the following to the jdoom/doomsday command-line options:" - elog " -def ${GAMES_DATADIR}/doomsday/defs/jdoom/jDRP.ded" -} diff --git a/games-fps/openarena/ChangeLog b/games-fps/openarena/ChangeLog index 6944da52bda9..09ebda6cf851 100644 --- a/games-fps/openarena/ChangeLog +++ b/games-fps/openarena/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-fps/openarena -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/openarena/ChangeLog,v 1.25 2012/07/04 03:16:53 jdhore Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/openarena/ChangeLog,v 1.26 2013/01/31 08:46:50 mr_bones_ Exp $ + + 31 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org> + -files/openarena-0.8.5-bots-strcpy-fix.patch, + -files/openarena-0.8.5-makefile.patch, + -files/openarena-0.8.5-unbundling.patch, -openarena-0.8.5.ebuild: + old 04 Jul 2012; Jeff Horelick <jdhore@gentoo.org> openarena-0.8.8.ebuild: marked x86 per bug 422123 @@ -112,4 +118,3 @@ +openarena-0.7.1.ebuild: Initial import. Ebuild by Paul Bredbury <brebs@sent.com> and modified by me. Icon provided by Rémy Dupont <rem11_1999@yahoo.fr>. Closing bug #144705. - diff --git a/games-fps/openarena/Manifest b/games-fps/openarena/Manifest index 431227fcfeb7..fc2f102aaa45 100644 --- a/games-fps/openarena/Manifest +++ b/games-fps/openarena/Manifest @@ -1,14 +1,7 @@ -AUX openarena-0.8.5-bots-strcpy-fix.patch 1138 RMD160 fea6d9d492f02f75b7ed267e5c3703df1e5b22bd SHA1 ba1fd93f412ab8dcbcd0062c8acaae3147f06c3e SHA256 d4bef896dc9fc7e8b8c94dcb744f88c03f76f5025deacce50de2cf7945fa71d3 -AUX openarena-0.8.5-makefile.patch 8516 RMD160 648b0f450fd59e0799ea80f0223d1737b104d1d0 SHA1 60ba8a00a01d19eacb8b3174e8ff9a03b0b2f607 SHA256 7ae39495718541f423f4f4fa641c5dd0c38087c3994d444ecd8029f27fd3bd88 -AUX openarena-0.8.5-unbundling.patch 5905 RMD160 4dcbe1ce8ddb0a694030f265f73ff6a5fb9aa102 SHA1 009701fd4dc8323416818b45b20acb197e37c86e SHA256 ad2965612329e5d817bb3b21b6b1b373cea474f268d85d6b79b1f164ff44f0aa -AUX openarena-0.8.8-makefile.patch 763 RMD160 2dea063ca9a9672674cc38a98efbe1f635433498 SHA1 16f612ef56c1ea939e38e34e84350df79979a2ac SHA256 c91a6de3154d9b86da367fe4cc5f7ce0797a75dbb52ea1d26a11ffbfb371d931 -AUX openarena-0.8.8-unbundling.patch 4646 RMD160 6c0d90fb17c20eca6bc5033b4bbbe2819617aaa5 SHA1 5bceb3938bd550698bf10bd1fa72b3ca367c66f4 SHA256 60a1ea254a850ae1ceaa35246f2b33e66161e0a65ac5edaf17ce704dfb20511c -DIST oa081.zip 318927645 RMD160 9009eaf581ad0bf19296418da1a16e2d43daec16 SHA1 526c39e51d0b53177b02bd490bf830f622f35ad5 SHA256 c96282de8bc2ac5781df58c6adbce4265376e36190af50d7528f51dc739b6d7d -DIST oa085p.zip 42528474 RMD160 3ad339c007cfe54707a338f0d8795988646567a0 SHA1 70dd19c64adab348071c831d92dc4aa10f459110 SHA256 d360c4b095bc3b34d03d9a366b21c12052c3f9e9c57e86b17c8b2c038baa4719 -DIST openarena-0.8.8.zip 425189255 RMD160 dec7c43c2727235e97be1ab3968d8803fdd71251 SHA1 37ab41990b37459822ce8c2fe590607616e1f6d1 SHA256 5a8faf7f5b51f351b0a1618c06b6b98a5f1a6758f1d39818de2c87df2a0bac4a -DIST openarena-engine-0.8.1-1.tar.bz2 2951703 RMD160 123e9f70621fd856385c6ca7ad0580b81454d687 SHA1 6de345c0bebd87e1406cb07189537db99a422808 SHA256 430ba9b691c8085b946e004f0cc890995c7f8295498bd8c8ce744293a87274d2 -DIST openarena-engine-source-0.8.8.tar.bz2 3777830 RMD160 e823c184effacb42e9ecd2aaf789d9570221e896 SHA1 64f333c290b15b6b0e3819dc120b3eca2653340e SHA256 95aa500cb7e42e57fb1f6db7b97a254168f4fa2e3676d6cdc33180b69fde0e77 -EBUILD openarena-0.8.5.ebuild 2484 RMD160 89572353b57f7b1495d2ce9e82997226caeceffc SHA1 0209ba8d58692057e92818e7b654fd2fac9181ce SHA256 23109e35edbccd823f2cb591e20a3fe72b74a951efdeb3440ba48eda1b048066 -EBUILD openarena-0.8.8.ebuild 2011 RMD160 fd33068f2e415c658b80db2b9418f62ebf1ed70f SHA1 6f1c88118df96ec378bedcf47f0aa3f1a2e563df SHA256 667a3b0a8c22cf32e634ffa2af70fec438b197768d8734eb21127b53f07111b2 -MISC ChangeLog 4415 RMD160 3f64bf606e1f4b3c034adde130a34dbe2d512909 SHA1 7a9b120a2d8b9cfbf4e377385d660bc532fc2c55 SHA256 87b8caf01ee1e215d7d13b63df7b4b6d786f9d39e49c2e9aa27cc869a7dfb535 -MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 +AUX openarena-0.8.8-makefile.patch 763 SHA256 c91a6de3154d9b86da367fe4cc5f7ce0797a75dbb52ea1d26a11ffbfb371d931 SHA512 2cc60cfd43536f55690dd90346f11d383f39d20be4509167604d0506bddd6375a73e933eeed2c7fbbd0e2c2c9c7ce126943549a9e0194d0f831d0a9b9e59c376 WHIRLPOOL fb077c2016fdbfa9e5863e346ed850ad662cc714b3309827be7f7647c785821f6ca9a0629c433a5880c5d22315168fee633495fc038be6b6ce9d4a9488ffa156 +AUX openarena-0.8.8-unbundling.patch 4646 SHA256 60a1ea254a850ae1ceaa35246f2b33e66161e0a65ac5edaf17ce704dfb20511c SHA512 8b8dcb8d1e4b22c757c354315766f4a177ef7a6f6049f6e8a99d65cde921e897fb3061b890aa9ad5fce9350db5e95aaaa8d66a3d50e7cec9072b4d4be26cd435 WHIRLPOOL 810a6120a48cf5f98337bea0e417e2d8fe1a70dc16286ab4c76a08558ab4d05f4b2c2c4ffe82297a7331534b51d0d0da0303860ff3b48df25665af7c035ab8e2 +DIST openarena-0.8.8.zip 425189255 SHA256 5a8faf7f5b51f351b0a1618c06b6b98a5f1a6758f1d39818de2c87df2a0bac4a SHA512 9fa4dabe8a3428dc3cbec97f3b4d20c04569c14cdd00b60e6391c6dd61e310f246ff5ec97e7549821b3d6f5f94b140eb5411a2ddd83dafcad66937b7f78ea8dd WHIRLPOOL d9121b2e936063d02da7ed4de79f8d0da3fd3c9b196d3fbce9091be0d14c9f745317c833eed7ce9c0691cd8627396f0d3580eb244b7229500b44a03583612e4f +DIST openarena-engine-source-0.8.8.tar.bz2 3777830 SHA256 95aa500cb7e42e57fb1f6db7b97a254168f4fa2e3676d6cdc33180b69fde0e77 SHA512 d4ba3655fae500cf5b7475c83d39c81b6abc759da15cfb4ea9e1dc0f47ffb11c1bbbc2b6f85d613ab1d729978eda93d4d7677c9a45a33853e363c820d8b81c43 WHIRLPOOL 6093e6d209983a268d21ea487f99ab065f1b050a3af43fead3461e24dc629be8b84be56644a4ca5a35512015f187eb9880f1228b0d501de091c482e141086f2b +EBUILD openarena-0.8.8.ebuild 2011 SHA256 667a3b0a8c22cf32e634ffa2af70fec438b197768d8734eb21127b53f07111b2 SHA512 9002b01b66473f4178306a8843ff9a119cf8b2bcf8834e2a8bffe2265966326538c0ea794200e0d2b01761b2fac0752bac4cd65055ac2d265b3df996f2a6638a WHIRLPOOL ac8d97244f2e72511a0759688a61141a810b35ff221285606508ab3175f50f3da6d340f1abcd4f808fb9b839d8423d48f01fead2b4969c4286cc47f099614dd5 +MISC ChangeLog 4636 SHA256 b6b592c7eeeb5e1505efd33e3112f1094f659957ed1128ed40b745c067ac947d SHA512 80bea4fcebafda0e566a907ae6c08f3ff3abd65ee2e9b408684fb27486864a75acd0ad9d1a3ce62cfae19bc4aa327d0a7936ed92ada19eeee02e933cf92edabd WHIRLPOOL c08d92dbf04ebdde4616f3e5ed1d2f059e3a5f82e8fdc633decdbf3291c2446f9d08bc9f86ed8979393b0a4347efca292bc8d2c656b913b0f6349139fbf504c7 +MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada diff --git a/games-fps/openarena/files/openarena-0.8.5-bots-strcpy-fix.patch b/games-fps/openarena/files/openarena-0.8.5-bots-strcpy-fix.patch deleted file mode 100644 index af2b8f0fe3b0..000000000000 --- a/games-fps/openarena/files/openarena-0.8.5-bots-strcpy-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up quake3-1.36/code/botlib/l_precomp.c~ quake3-1.36/code/botlib/l_precomp.c ---- quake3-1.36/code/botlib/l_precomp.c~ 2009-04-27 08:42:37.000000000 +0200 -+++ quake3-1.36/code/botlib/l_precomp.c 2009-11-03 21:03:08.000000000 +0100 -@@ -948,7 +948,7 @@ void PC_ConvertPath(char *path) - if ((*ptr == '\\' || *ptr == '/') && - (*(ptr+1) == '\\' || *(ptr+1) == '/')) - { -- strcpy(ptr, ptr+1); -+ memmove(ptr, ptr+1, strlen(ptr)); - } //end if - else - { -diff -up quake3-1.36/code/botlib/l_script.c~ quake3-1.36/code/botlib/l_script.c ---- quake3-1.36/code/botlib/l_script.c~ 2009-04-27 08:42:37.000000000 +0200 -+++ quake3-1.36/code/botlib/l_script.c 2009-11-03 21:06:11.000000000 +0100 -@@ -1118,7 +1118,7 @@ void StripDoubleQuotes(char *string) - { - if (*string == '\"') - { -- strcpy(string, string+1); -+ memmove(string, string+1, strlen(string)); - } //end if - if (string[strlen(string)-1] == '\"') - { -@@ -1135,7 +1135,7 @@ void StripSingleQuotes(char *string) - { - if (*string == '\'') - { -- strcpy(string, string+1); -+ memmove(string, string+1, strlen(string)); - } //end if - if (string[strlen(string)-1] == '\'') - { diff --git a/games-fps/openarena/files/openarena-0.8.5-makefile.patch b/games-fps/openarena/files/openarena-0.8.5-makefile.patch deleted file mode 100644 index a716763d84f6..000000000000 --- a/games-fps/openarena/files/openarena-0.8.5-makefile.patch +++ /dev/null @@ -1,321 +0,0 @@ ---- openarena-engine-0.8.1/Makefile 2008-08-09 22:22:37.000000000 +0200 -+++ openarena-engine-0.8.1/Makefile.new 2009-01-07 19:33:31.000000000 +0100 -@@ -67,6 +67,10 @@ - - ifndef ARCH - ARCH=$(COMPILE_ARCH) -+else -+ ifeq ($(ARCH),amd64) -+ ARCH=x86_64 -+ endif - endif - export ARCH - -@@ -231,8 +231,7 @@ - endif - endif - -- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes \ -- -pipe -DUSE_ICON $(shell sdl-config --cflags) -+ BASE_CFLAGS = -fno-strict-aliasing -DUSE_ICON $(shell sdl-config --cflags) -I. - - ifeq ($(USE_OPENAL),1) - BASE_CFLAGS += -DUSE_OPENAL -@@ -283,29 +283,29 @@ - SHLIBCFLAGS=-fPIC - SHLIBLDFLAGS=-shared $(LDFLAGS) - -- THREAD_LDFLAGS=-lpthread -- LDFLAGS=-ldl -lm -+ THREAD_LIBS=-lpthread -+ LDLIBS=-ldl -lm -lz - -- CLIENT_LDFLAGS=$(shell sdl-config --libs) -lGL -+ CLIENT_LIBS=$(shell sdl-config --libs) -lGL -ljpeg - - ifeq ($(USE_OPENAL),1) - ifneq ($(USE_OPENAL_DLOPEN),1) -- CLIENT_LDFLAGS += -lopenal -+ CLIENT_LIBS += -lopenal - endif - endif - - ifeq ($(USE_CURL),1) - ifneq ($(USE_CURL_DLOPEN),1) -- CLIENT_LDFLAGS += -lcurl -+ CLIENT_LIBS += -lcurl - endif - endif - - ifeq ($(USE_CODEC_VORBIS),1) -- CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg -+ CLIENT_LIBS += -lvorbisfile -lvorbis -logg - endif - - ifeq ($(USE_MUMBLE),1) -- CLIENT_LDFLAGS += -lrt -+ CLIENT_LIBS += -lrt - endif - - ifeq ($(USE_LOCAL_HEADERS),1) -@@ -323,7 +322,7 @@ - endif - - DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 -- RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) -+ RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG - - else # ifeq Linux - -@@ -336,7 +336,7 @@ - - ifeq ($(PLATFORM),darwin) - HAVE_VM_COMPILED=true -- CLIENT_LDFLAGS= -+ CLIENT_LIBS= - OPTIMIZE= - - BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes -@@ -357,7 +357,7 @@ - ifeq ($(USE_OPENAL),1) - BASE_CFLAGS += -DUSE_OPENAL - ifneq ($(USE_OPENAL_DLOPEN),1) -- CLIENT_LDFLAGS += -framework OpenAL -+ CLIENT_LIBS += -framework OpenAL - else - BASE_CFLAGS += -DUSE_OPENAL_DLOPEN - endif -@@ -366,7 +366,7 @@ - ifeq ($(USE_CURL),1) - BASE_CFLAGS += -DUSE_CURL - ifneq ($(USE_CURL_DLOPEN),1) -- CLIENT_LDFLAGS += -lcurl -+ CLIENT_LIBS += -lcurl - else - BASE_CFLAGS += -DUSE_CURL_DLOPEN - endif -@@ -374,7 +374,7 @@ - - ifeq ($(USE_CODEC_VORBIS),1) - BASE_CFLAGS += -DUSE_CODEC_VORBIS -- CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg -+ CLIENT_LIBS += -lvorbisfile -lvorbis -logg - endif - - BASE_CFLAGS += -D_THREAD_SAFE=1 -@@ -387,7 +387,7 @@ - # the file has been modified by each build. - LIBSDLMAIN=$(B)/libSDLmain.a - LIBSDLMAINSRC=$(LIBSDIR)/macosx/libSDLmain.a -- CLIENT_LDFLAGS += -framework Cocoa -framework IOKit -framework OpenGL \ -+ CLIENT_LIBS += -framework Cocoa -framework IOKit -framework OpenGL \ - $(LIBSDIR)/macosx/libSDL-1.2.0.dylib - - OPTIMIZE += -ffast-math -falign-loops=16 -@@ -441,7 +441,7 @@ - ifeq ($(USE_OPENAL_DLOPEN),1) - BASE_CFLAGS += -DUSE_OPENAL_DLOPEN - else -- CLIENT_LDFLAGS += $(OPENAL_LDFLAGS) -+ CLIENT_LIBS += $(OPENAL_LDFLAGS) - endif - endif - -@@ -461,8 +461,8 @@ - - BINEXT=.exe - -- LDFLAGS= -lws2_32 -lwinmm -- CLIENT_LDFLAGS = -mwindows -lgdi32 -lole32 -lopengl32 -+ LDLIBS= -lws2_32 -lwinmm -+ CLIENT_LIBS = -mwindows -lgdi32 -lole32 -lopengl32 - - ifeq ($(USE_CURL),1) - BASE_CFLAGS += -DUSE_CURL -@@ -470,9 +470,9 @@ - ifneq ($(USE_CURL_DLOPEN),1) - ifeq ($(USE_LOCAL_HEADERS),1) - BASE_CFLAGS += -DCURL_STATICLIB -- CLIENT_LDFLAGS += $(LIBSDIR)/win32/libcurl.a -+ CLIENT_LIBS += $(LIBSDIR)/win32/libcurl.a - else -- CLIENT_LDFLAGS += $(CURL_LIBS) -+ CLIENT_LIBS += $(CURL_LIBS) - endif - endif - endif -@@ -480,9 +480,9 @@ - ifeq ($(USE_CODEC_VORBIS),1) - #Sago: Here I get vorbis to compile in Windows: - ifeq ($(PLATFORM),mingw32) -- CLIENT_LDFLAGS += $(LIBSDIR)/win32/libvorbisfile.a $(LIBSDIR)/win32/libvorbis.a $(LIBSDIR)/win32/libogg.a -+ CLIENT_LIBS += $(LIBSDIR)/win32/libvorbisfile.a $(LIBSDIR)/win32/libvorbis.a $(LIBSDIR)/win32/libogg.a - else -- CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg -+ CLIENT_LIBS += -lvorbisfile -lvorbis -logg - endif - endif - -@@ -496,14 +496,14 @@ - RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) - - # libmingw32 must be linked before libSDLmain -- CLIENT_LDFLAGS += -lmingw32 -+ CLIENT_LIBS += -lmingw32 - ifeq ($(USE_LOCAL_HEADERS),1) - BASE_CFLAGS += -I$(SDLHDIR)/include -- CLIENT_LDFLAGS += $(LIBSDIR)/win32/libSDLmain.a \ -+ CLIENT_LIBS += $(LIBSDIR)/win32/libSDLmain.a \ - $(LIBSDIR)/win32/libSDL.dll.a - else - BASE_CFLAGS += $(SDL_CFLAGS) -- CLIENT_LDFLAGS += $(SDL_LIBS) -+ CLIENT_LIBS += $(SDL_LIBS) - endif - - -@@ -561,22 +561,22 @@ - SHLIBCFLAGS=-fPIC - SHLIBLDFLAGS=-shared $(LDFLAGS) - -- THREAD_LDFLAGS=-lpthread -+ THREAD_LIBS=-lpthread - # don't need -ldl (FreeBSD) -- LDFLAGS=-lm -+ LDLIBS=-lm -lz - -- CLIENT_LDFLAGS = -+ CLIENT_LIBS = - -- CLIENT_LDFLAGS += $(shell sdl-config --libs) -lGL -+ CLIENT_LIBS += $(shell sdl-config --libs) -lGL - - ifeq ($(USE_OPENAL),1) - ifneq ($(USE_OPENAL_DLOPEN),1) -- CLIENT_LDFLAGS += $(THREAD_LDFLAGS) -lopenal -+ CLIENT_LIBS += $(THREAD_LIBS) -lopenal - endif - endif - - ifeq ($(USE_CODEC_VORBIS),1) -- CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg -+ CLIENT_LIBS += -lvorbisfile -lvorbis -logg - endif - - else # ifeq freebsd -@@ -618,21 +618,21 @@ - SHLIBCFLAGS=-fPIC - SHLIBLDFLAGS=-shared $(LDFLAGS) - -- THREAD_LDFLAGS=-lpthread -- LDFLAGS=-lm -+ THREAD_LIBS=-lpthread -+ LDLIBS=-lm -lz - -- CLIENT_LDFLAGS = -+ CLIENT_LIBS = - -- CLIENT_LDFLAGS += $(shell sdl-config --libs) -lGL -+ CLIENT_LIBS += $(shell sdl-config --libs) -lGL - - ifeq ($(USE_OPENAL),1) - ifneq ($(USE_OPENAL_DLOPEN),1) -- CLIENT_LDFLAGS += $(THREAD_LDFLAGS) -lossaudio -lopenal -+ CLIENT_LIBS += $(THREAD_LIBS) -lossaudio -lopenal - endif - endif - - ifeq ($(USE_CODEC_VORBIS),1) -- CLIENT_LDFLAGS += -lvorbisfile -lvorbis -logg -+ CLIENT_LIBS += -lvorbisfile -lvorbis -logg - endif - - else # ifeq openbsd -@@ -647,11 +647,11 @@ - ARCH=i386 - endif - -- LDFLAGS=-lm -+ LDLIBS=-lm -lz - SHLIBEXT=so - SHLIBCFLAGS=-fPIC - SHLIBLDFLAGS=-shared $(LDFLAGS) -- THREAD_LDFLAGS=-lpthread -+ THREAD_LIBS=-lpthread - - BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes - -@@ -686,9 +686,9 @@ - SHLIBCFLAGS= - SHLIBLDFLAGS=-shared - -- LDFLAGS=-ldl -lm -lgen -+ LDLIBS=-ldl -lm -lgen -lz - # FIXME: The X libraries probably aren't necessary? -- CLIENT_LDFLAGS=-L/usr/X11/$(LIB) $(shell sdl-config --libs) -lGL \ -+ CLIENT_LIBS=-L/usr/X11/$(LIB) $(shell sdl-config --libs) -lGL \ -- -lX11 -lXext -lm -+ -lX11 -lXext -lm -ljpeg - - else # ifeq IRIX -@@ -736,7 +736,7 @@ - BASE_CFLAGS += -m32 - LDFLAGS += -m32 - BASE_CFLAGS += -I/usr/X11/include/NVIDIA -- CLIENT_LDFLAGS += -L/usr/X11/lib/NVIDIA -R/usr/X11/lib/NVIDIA -+ CLIENT_LIBS += -L/usr/X11/lib/NVIDIA -R/usr/X11/lib/NVIDIA - endif - endif - -@@ -752,12 +752,12 @@ - SHLIBCFLAGS=-fPIC - SHLIBLDFLAGS=-shared $(LDFLAGS) - -- THREAD_LDFLAGS=-lpthread -- LDFLAGS=-lsocket -lnsl -ldl -lm -+ THREAD_LIBS=-lpthread -+ LDLIBS=-lsocket -lnsl -ldl -lm -lz - - BOTCFLAGS=-O0 - -- CLIENT_LDFLAGS +=$(shell sdl-config --libs) -lGL -+ CLIENT_LIBS +=$(shell sdl-config --libs) -lGL -ljpeg - - else # ifeq sunos - -@@ -825,7 +825,7 @@ - ifeq ($(USE_INTERNAL_SPEEX),1) - BASE_CFLAGS += -DFLOATING_POINT -DUSE_ALLOCA -I$(SPEEXDIR)/include - else -- CLIENT_LDFLAGS += -lspeex -+ CLIENT_LIBS += -lspeex -lspeexdsp - endif - endif - -@@ -1421,13 +1421,13 @@ - - $(B)/openarena.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) - $(echo_cmd) "LD $@" -- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \ -- $(LDFLAGS) $(LIBSDLMAIN) -+ $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) \ -+ $(LDFLAGS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(LDLIBS) - - $(B)/openarena-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) - $(echo_cmd) "LD $@" -- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ -- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) -+ $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \ -+ $(LDFLAGS) $(THREAD_LIBS) $(LIBSDLMAIN) $(CLIENT_LIBS) $(LDLIBS) - - ifneq ($(strip $(LIBSDLMAIN)),) - ifneq ($(strip $(LIBSDLMAINSRC)),) -@@ -1553,7 +1553,7 @@ - - $(B)/oa_ded.$(ARCH)$(BINEXT): $(Q3DOBJ) - $(echo_cmd) "LD $@" -- $(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) -+ $(Q)$(CC) -o $@ $(Q3DOBJ) $(LDFLAGS) $(LDLIBS) - - - diff --git a/games-fps/openarena/files/openarena-0.8.5-unbundling.patch b/games-fps/openarena/files/openarena-0.8.5-unbundling.patch deleted file mode 100644 index 687668e602b8..000000000000 --- a/games-fps/openarena/files/openarena-0.8.5-unbundling.patch +++ /dev/null @@ -1,194 +0,0 @@ ---- openarena-engine-0.8.1/Makefile.old 2010-03-06 21:51:19.000000000 +0100 -+++ openarena-engine-0.8.1/Makefile 2010-03-06 21:58:01.000000000 +0100 -@@ -1278,41 +1278,7 @@ - $(B)/client/l_script.o \ - $(B)/client/l_struct.o \ - \ -- $(B)/client/jcapimin.o \ -- $(B)/client/jcapistd.o \ -- $(B)/client/jchuff.o \ -- $(B)/client/jcinit.o \ -- $(B)/client/jccoefct.o \ -- $(B)/client/jccolor.o \ -- $(B)/client/jfdctflt.o \ -- $(B)/client/jcdctmgr.o \ -- $(B)/client/jcphuff.o \ -- $(B)/client/jcmainct.o \ -- $(B)/client/jcmarker.o \ -- $(B)/client/jcmaster.o \ -- $(B)/client/jcomapi.o \ -- $(B)/client/jcparam.o \ -- $(B)/client/jcprepct.o \ -- $(B)/client/jcsample.o \ -- $(B)/client/jdapimin.o \ -- $(B)/client/jdapistd.o \ - $(B)/client/jdatasrc.o \ -- $(B)/client/jdcoefct.o \ -- $(B)/client/jdcolor.o \ -- $(B)/client/jddctmgr.o \ -- $(B)/client/jdhuff.o \ -- $(B)/client/jdinput.o \ -- $(B)/client/jdmainct.o \ -- $(B)/client/jdmarker.o \ -- $(B)/client/jdmaster.o \ -- $(B)/client/jdpostct.o \ -- $(B)/client/jdsample.o \ -- $(B)/client/jdtrans.o \ -- $(B)/client/jerror.o \ -- $(B)/client/jidctflt.o \ -- $(B)/client/jmemmgr.o \ -- $(B)/client/jmemnobs.o \ -- $(B)/client/jutils.o \ - \ - $(B)/client/tr_animation.o \ - $(B)/client/tr_backend.o \ ---- openarena-engine-0.8.1/code/qcommon/unzip.h.old 2010-03-06 21:59:46.000000000 +0100 -+++ openarena-engine-0.8.1/code/qcommon/unzip.h 2010-03-06 22:00:58.000000000 +0100 -@@ -19,6 +19,8 @@ - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - =========================================================================== - */ -+#include <zconf.h> -+#include <zlib.h> - - #if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP) - /* like the STRICT of WIN32, we define a pointer that cannot be converted -@@ -80,6 +82,7 @@ - typedef void* (*alloc_func) (void* opaque, unsigned int items, unsigned int size); - typedef void (*free_func) (void* opaque, void* address); - -+#if 0 - struct internal_state; - - typedef struct z_stream_s { -@@ -105,6 +108,7 @@ - - typedef z_stream *z_streamp; - -+#endif - - /* file_in_zip_read_info_s contain internal information about a file in zipfile, - when reading and decompress it */ ---- openarena-engine-0.8.1/code/qcommon/unzip.c.old 2010-03-06 22:01:40.000000000 +0100 -+++ openarena-engine-0.8.1/code/qcommon/unzip.c 2010-03-06 22:03:35.000000000 +0100 -@@ -49,7 +49,7 @@ - ftp://ftp.cdrom.com/pub/infozip/doc/appnote-970311-iz.zip - PkWare has also a specification at : - ftp://ftp.pkware.com/probdesc.zip */ -- -+#if 0 - /* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.1.3, July 9th, 1998 - -@@ -955,6 +955,7 @@ - // static const char * zError OF((int err)); - // static int inflateSyncPoint OF((z_streamp z)); - // static const uLong * get_crc_table OF((void)); -+#endif - - typedef unsigned char uch; - typedef unsigned short ush; -@@ -2248,6 +2249,8 @@ - return (int)uReadThis; - } - -+#if 0 -+ - /* infblock.h -- header to use infblock.c - * Copyright (C) 1995-1998 Mark Adler - * For conditions of distribution and use, see copyright notice in zlib.h -@@ -4295,3 +4298,4 @@ - } - - -+#endif ---- openarena-engine-0.8.1/code/jpeg-6/jdatasrc.c.old 2010-03-10 09:13:25.000000000 +0100 -+++ openarena-engine-0.8.1/code/jpeg-6/jdatasrc.c 2010-03-10 09:23:39.000000000 +0100 -@@ -16,9 +16,15 @@ - - - /* this is not a core library module, so it doesn't define JPEG_INTERNALS */ --#include "jinclude.h" --#include "jpeglib.h" --#include "jerror.h" -+#include <stdio.h> -+#include <string.h> -+#include <jpeglib.h> -+#include <jerror.h> -+#undef METHODDEF -+#define METHODDEF static -+#undef GLOBAL -+#define GLOBAL -+#define SIZEOF(object) ((size_t) sizeof(object)) - - #ifndef MIN - #define MIN(a, b) ((a)<(b)?(a):(b)) -@@ -189,7 +195,7 @@ - */ - - GLOBAL void --jpeg_mem_src (j_decompress_ptr cinfo, unsigned char *inbuf, size_t size) -+jpeg_mem_src (j_decompress_ptr cinfo, unsigned char *inbuf, unsigned long size) - { - my_src_ptr src; - ---- openarena-engine-0.8.1/code/renderer/tr_image_jpg.c.old 2010-03-10 09:30:30.000000000 +0100 -+++ openarena-engine-0.8.1/code/renderer/tr_image_jpg.c 2010-03-10 10:17:42.000000000 +0100 -@@ -31,7 +31,7 @@ - */ - - #define JPEG_INTERNALS --#include "../jpeg-6/jpeglib.h" -+#include <jpeglib.h> - - void R_LoadJPG( const char *filename, unsigned char **pic, int *width, int *height ) { - /* This struct contains the JPEG decompression parameters and pointers to -@@ -128,7 +128,10 @@ - } - - memcount = pixelcount * 4; -- row_stride = cinfo.output_width * cinfo.output_components; -+ if (3 == cinfo.output_components) -+ row_stride = cinfo.output_width * 4; -+ else -+ row_stride = cinfo.output_width * cinfo.output_components; - - out = ri.Malloc(memcount); - -@@ -141,14 +144,26 @@ - /* Here we use the library's state variable cinfo.output_scanline as the - * loop counter, so that we don't have to keep track ourselves. - */ -+ buf = out; - while (cinfo.output_scanline < cinfo.output_height) { - /* jpeg_read_scanlines expects an array of pointers to scanlines. - * Here the array is only one element long, but you could ask for - * more than one scanline at a time if that's more convenient. - */ -- buf = ((out+(row_stride*cinfo.output_scanline))); - buffer = &buf; - (void) jpeg_read_scanlines(&cinfo, buffer, 1); -+ if (3 == cinfo.output_components) { -+ /* turn RGB into RGBA */ -+ int ioffset = cinfo.output_width * 3 - 1; -+ int ooffset = cinfo.output_width * 4 - 1; -+ do { -+ buf[ooffset--] = 255; -+ buf[ooffset--] = buf[ioffset--]; -+ buf[ooffset--] = buf[ioffset--]; -+ buf[ooffset--] = buf[ioffset--]; -+ } while (ioffset > 0); -+ } -+ buf += row_stride; - } - - buf = out; -@@ -173,7 +188,7 @@ - buf[--dindex] = greyshade; - } while(sindex); - } -- else -+ else if (4 == cinfo.output_components) - { - // clear all the alphas to 255 - int i; diff --git a/games-fps/openarena/openarena-0.8.5.ebuild b/games-fps/openarena/openarena-0.8.5.ebuild deleted file mode 100644 index 64cc539df306..000000000000 --- a/games-fps/openarena/openarena-0.8.5.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/openarena/openarena-0.8.5.ebuild,v 1.5 2011/09/25 21:32:21 mr_bones_ Exp $ - -EAPI=2 -inherit eutils flag-o-matic versionator games - -MY_PV=$(delete_all_version_separators) -BASE_PV="0.8.1" -OLD_PV=$(delete_all_version_separators $BASE_PV) - -DESCRIPTION="Open-source replacement for Quake 3 Arena" -HOMEPAGE="http://openarena.ws/" -SRC_URI="http://download.tuxfamily.org/openarena/rel/${OLD_PV}/oa${OLD_PV}.zip - http://download.tuxfamily.org/openarena/rel/${MY_PV}/oa${MY_PV}p.zip - http://openarena.ws/svn/source/${OLD_PV}/${PN}-engine-${BASE_PV}-1.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+curl +openal +vorbis" - -RDEPEND="virtual/opengl - media-libs/libsdl[joystick,opengl,video] - media-libs/speex - virtual/jpeg - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - curl? ( net-misc/curl ) - openal? ( media-libs/openal ) - vorbis? ( media-libs/libvorbis )" -DEPEND="${RDEPEND} - app-arch/unzip" - -MY_S=${WORKDIR}/${PN}-engine-${BASE_PV} -S=${WORKDIR}/${PN}-${BASE_PV} -BUILD_DIR=${PN}-build -DIR=${GAMES_DATADIR}/${PN} - -src_prepare() { - cd "${WORKDIR}" - epatch "${FILESDIR}"/${P}-makefile.patch \ - "${FILESDIR}"/${P}-unbundling.patch - sed -i \ - -e '/ALDRIVER_DEFAULT/s/libopenal.so.0/libopenal.so/' \ - "${MY_S}"/code/client/snd_openal.c \ - || die "sed failed" - cd "${MY_S}" - epatch "${FILESDIR}"/${P}-bots-strcpy-fix.patch - touch jpegint.h - - sed -i -e '1i#define OF(x) x' $(find -name unzip.c) || die -} - -src_compile() { - local myopts - - # enable voip, disable mumble - # also build always server and use smp by default - myopts="USE_INTERNAL_SPEEX=0 USE_VOIP=1 USE_MUMBLE=0 - BUILD_SERVER=1 BUILD_CLIENT_SMP=1 USE_LOCAL_HEADERS=0" - use curl || myopts="${myopts} USE_CURL=0" - use openal || myopts="${myopts} USE_OPENAL=0" - use vorbis || myopts="${myopts} USE_CODEC_VORBIS=0" - - cd "${MY_S}" - emake \ - V=1 \ - DEFAULT_BASEDIR="${DIR}" \ - BR="${BUILD_DIR}" \ - ${myopts} \ - || die "emake failed" -} - -src_install() { - cd "${MY_S}"/"${BUILD_DIR}" - newgamesbin openarena-smp.* "${PN}" || die "binary install failed" - newgamesbin oa_ded.* "${PN}-ded" || die "dedicated binary not found" - cd "${S}" - - insinto "${DIR}" - doins -r baseoa missionpack || die "doins -r failed" - - dodoc CHANGES CREDITS LINUXNOTES README - newicon "${MY_S}"/misc/quake3.png ${PN}.png - make_desktop_entry ${PN} "OpenArena" - - prepgamesdirs -} |