From: Michael Sterrett Date: Fri, 9 Jan 2015 01:16:57 +0000 (+0000) Subject: old X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=703ace46462eacb986313f3fe9101e06bb6881be;p=gentoo.git old Package-Manager: portage-2.2.14/cvs/Linux x86_64 --- diff --git a/games-action/teeworlds/ChangeLog b/games-action/teeworlds/ChangeLog index 95f068023068..e3181bb98daf 100644 --- a/games-action/teeworlds/ChangeLog +++ b/games-action/teeworlds/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for games-action/teeworlds # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/ChangeLog,v 1.16 2015/01/06 09:27:01 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/ChangeLog,v 1.17 2015/01/09 01:16:52 mr_bones_ Exp $ + + 09 Jan 2015; Michael Sterrett + -files/0.6.1/01-use-system-wavpack.patch, + -files/0.6.1/02-fixed-wavpack-sound-loading.patch, + -files/0.6.1/03-use-system-pnglite.patch, + -files/0.6.2/01-use-system-wavpack.patch, + -files/0.6.2/02-fixed-wavpack-sound-loading.patch, + -files/0.6.2/03-use-system-pnglite.patch, -files/0.6.2/04-dedicated.patch, + -files/0.6.2/05-cc-cflags.patch: + old *teeworlds-0.6.3 (06 Jan 2015) diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest index de4dd5e81621..f5c7e940f2db 100644 --- a/games-action/teeworlds/Manifest +++ b/games-action/teeworlds/Manifest @@ -1,11 +1,3 @@ -AUX 0.6.1/01-use-system-wavpack.patch 3063 SHA256 2475275f1dd8264cb9e880bfccca13951a9bcdfbee24c4c9953e830cdf6a5180 SHA512 6dedb9200788bb5f121c0955684a047a4be5e0d320fdc2bf8c72412e35f6555b061f0e22332e88c38fe66ae10c046c9f07e9381b1143cdbaf229c3f9d54c59f1 WHIRLPOOL 55811a4e059eeb55798178c1e16e4e542180baf71042d06498e691c29718599e278afdb3b21db561a9ec5293d13abcd1e5aa0e967986f8e3fde582e1a2fc53b6 -AUX 0.6.1/02-fixed-wavpack-sound-loading.patch 2905 SHA256 4da6873dff90d89ea786daa1f9d67e38cd7038860eb45e655401d94c692e25cf SHA512 fdf1c583852fd96cc9242efe6518f24ad03b3349142cd931a97f6ac337617157223b108cdbec698f3e1e48b6099b69f73a4cab09ab1ab4663cc5139bac04af5c WHIRLPOOL f1442ae0fb04f1d50344dadc74ce27178ce8ce054bd533e42f1bf55d6b143c6ed2204e74394fcb52f6726818623693245feaabdf1acd57ab1339c3f97f40c703 -AUX 0.6.1/03-use-system-pnglite.patch 3935 SHA256 e035cb3074de6c8bc95c7e8486baa51fd2c85b10f2f8badbeb91253cb6721415 SHA512 28a21e40886690e700684769e5238436a4ce30349a8099a75e7ebc9c27d8442af6922001ba00638b2e309273aff2d0f0c388ce435eaa5a8fad02612ddbd7d538 WHIRLPOOL e5cb26ea4d72f57a36fdef8d96a9e93a21cb35e526745d86f913c328e0b97234266bf11c337e9d0ecaefb40fd2fc37d2a26bf4a57f010caadb09c9c0986d8301 -AUX 0.6.2/01-use-system-wavpack.patch 3182 SHA256 266ebb1e36bbcb9ef3008a53bc9fb1e726fd4c53d00107022759789ff70b0b76 SHA512 2210a018c3917b78109e31b3fa51a292c5c3714371880d2b9ce10de4cde999f014ff44555fa657fed78d961dbada2511601b3aa8e9356eb34de187f24b16dbad WHIRLPOOL 85faa33f93e8994cf5c0321ac0d9376b994f865a781b25bd98f08b9bb53d6789cb4d1da1ade1b1dfb4f5136f40113a1ca4ce8a76bb65d3b8127f253c176bcabb -AUX 0.6.2/02-fixed-wavpack-sound-loading.patch 2916 SHA256 5f75a6dd06bd69d90bc53e69ff714d1a469ae50a566e64dbbf926493b603692b SHA512 9cada7356b588a220dba4a0c104a28738969c7755c80f9e9f10c4bf1f57ae1b6ea64c084aa012410de135fed0267e0e7ab8375137f2f16aba2d81c0441de2e8a WHIRLPOOL a7e13d2b8aec541bd3f8677edd31b0c2bde5c91bc7722a87285403efd01c4d1fff0757770c607b401ef9107980b2891e0783a95905987a8bf8bea04d684db22a -AUX 0.6.2/03-use-system-pnglite.patch 5703 SHA256 3fb1df74e020704d0a4cd1849f2955ce753be9d2ac614a4a325b986529a95e85 SHA512 c069fc15de002b9e3f01bf9a36e40396aa62158bec1bb70a2dae6fbbace07299c298854319f80141d26e34b49dd270b9478383c55eb4b7e8873aedd323eb412b WHIRLPOOL 6cf80cef92040a0c952bac59ae3e4673693d4ab1c5d1ec82137cab0a79dac88c8fbf0f38825062984b9f3ba99ac295a1bc2bf4acce6e80c39865afc0596eec9d -AUX 0.6.2/04-dedicated.patch 491 SHA256 2dcf3a886a5e22c308b041463d3e40ac1e6047f93c5022028ba915b0598e45ed SHA512 c292b638e58e69fcf6b273617fc43cc4c8d96ffe4c75ad7911c1b319a129de6c01255f988569a0532b8e6c29f775ececc679274f7f85c6a9933bf713620ab8fb WHIRLPOOL cd224d0f8897749c3bbca245ef93b5ddb2ba42cd743fbe3e4ce6a745ea08e25da7bd0419780a0fd153b76bd3654240ffe6ca69446607ce6ccd3d980a3677856e -AUX 0.6.2/05-cc-cflags.patch 482 SHA256 ab634107cb694cf1030e3311c3c0bbc1c4bdc723a8840bb3656b56532479bb69 SHA512 92b74845413c20cf4626cb89b8b825bc5cb2f25e9af1d61d2ecabbda3acf024ee0c5e03abf8de2b57d6a8c739a8cf343fcb109a3a72d4baa016711e53368d0f8 WHIRLPOOL f38b40006b8978b82731cf2d422f9af98206057a493c49698138a7b75255306cf13a325803d6c40f4e551385a7a7d1a0a206e260ff623ecf0416ae6697da297e AUX 0.6.3/01-use-system-wavpack.patch 3182 SHA256 266ebb1e36bbcb9ef3008a53bc9fb1e726fd4c53d00107022759789ff70b0b76 SHA512 2210a018c3917b78109e31b3fa51a292c5c3714371880d2b9ce10de4cde999f014ff44555fa657fed78d961dbada2511601b3aa8e9356eb34de187f24b16dbad WHIRLPOOL 85faa33f93e8994cf5c0321ac0d9376b994f865a781b25bd98f08b9bb53d6789cb4d1da1ade1b1dfb4f5136f40113a1ca4ce8a76bb65d3b8127f253c176bcabb AUX 0.6.3/02-fixed-wavpack-sound-loading.patch 2916 SHA256 5f75a6dd06bd69d90bc53e69ff714d1a469ae50a566e64dbbf926493b603692b SHA512 9cada7356b588a220dba4a0c104a28738969c7755c80f9e9f10c4bf1f57ae1b6ea64c084aa012410de135fed0267e0e7ab8375137f2f16aba2d81c0441de2e8a WHIRLPOOL a7e13d2b8aec541bd3f8677edd31b0c2bde5c91bc7722a87285403efd01c4d1fff0757770c607b401ef9107980b2891e0783a95905987a8bf8bea04d684db22a AUX 0.6.3/03-use-system-pnglite.patch 5703 SHA256 3fb1df74e020704d0a4cd1849f2955ce753be9d2ac614a4a325b986529a95e85 SHA512 c069fc15de002b9e3f01bf9a36e40396aa62158bec1bb70a2dae6fbbace07299c298854319f80141d26e34b49dd270b9478383c55eb4b7e8873aedd323eb412b WHIRLPOOL 6cf80cef92040a0c952bac59ae3e4673693d4ab1c5d1ec82137cab0a79dac88c8fbf0f38825062984b9f3ba99ac295a1bc2bf4acce6e80c39865afc0596eec9d @@ -16,5 +8,5 @@ AUX teeworlds.xpm 2785 SHA256 0b31cc3e65ca26676324a7b66de29cb91df90221e28f9e4b5a AUX teeworlds_srv.cfg 193 SHA256 9c00eca2c72d02893c288282793b81abb472ee0a7302847e472e964179339687 SHA512 d9a55f749f6974caddf96438eb38e490e0e507fbe07ebdac070fe91ab46eed93afb5dd6300a5b7a86b6282c6b97fdd178a00720483c3e71490be816b8c6a73b5 WHIRLPOOL 93726bef063d4d280f9058d3698c4f76492e2705d1f0c5506400c391fdb3c0feeb99374fbe814c0b3735e41f6d4a77f80b90baa206f1bac7dad6c740e115b6a2 DIST teeworlds-0.6.3-src.tar.gz 13101446 SHA256 490ee7c372898761c609af8d7b0c6bd55942c6c6fcd7f361eefa00abfc70077b SHA512 0c7ef6ca59e4b49f9e208f39e8b0edd76965d67848008af3a223cb7615a6c62ff433d3113f733ae4dafc364baf522d2f56255e058d26d9f5c48071cdde41526d WHIRLPOOL dc501bb9a2f4c3971ad063102a55cc70633857e3052f3a349d032dd8e92ea05f6138c62e9775b743b38dc3a56366d9920850b5a7ffbf6913ed73536a5cacdff4 EBUILD teeworlds-0.6.3.ebuild 2541 SHA256 4543f7d273a6220d3ef1c87d782490b189b7ed38fbb9a586c1b7a18291bdc696 SHA512 5d8c11a23d6b6ae91591baa9fd45e7aa1ed1445c8f7423e9919f82cbf3fb70e025a694c2fc8d78ab1f9e0a774e266d52bc15cd2c3508fbd47928dae1702ee647 WHIRLPOOL a86252ef4ed02d9caae67d9c9f5f86fd27e54eb0389a86a63a574ef1e963997b3e5cf2b549c1284cf435bea5f1ccc07a9e616ac52253e64147e73f92acf8a1d3 -MISC ChangeLog 3503 SHA256 b7aab1863ddfdd8bc59fd7e85df87df57041980a2edafec9c03741d69dd217ef SHA512 1980d184d5a86d6ebedb18ba821a66b8e26894ee0fb2e3eb85ad2e20a160d9bf40f4c811a8fad2cc9c1cfb41a1d1382700b1ed0c2180b9c9622935f5e198aac1 WHIRLPOOL 60978a3dab4e8913ee6d7b6510a6fb1fdd963b4b847ba0c41165029b7a54d4df26817f8dc139022c10988439d5ea56df6f395237d41bff04f91aadeb544e3fb8 +MISC ChangeLog 3915 SHA256 fc0fbaff7aaa3c6ca8d7a7672a2ecc06278dcbc1730368b7c18785d0a34295b2 SHA512 9cc00b7a6c44c5171f59370abbd56dd70b9fa6e1eb4f40f86b1b0f3e24e2f1f29924454becc2a008b26c0b2adaa194f3aae8810a83f258e2a233ed1354aa0036 WHIRLPOOL c2a7e20eddfd39f078f05a2a91794b5033236aaf44521e39d2be0f7cac949d7777b6eb9c0310640ea8d8c66396a07e060fceaabffc011446b92ce11e22e1db0f MISC metadata.xml 160 SHA256 03e34b6506e114bf8eee720498f15d09a5344e83b766a45c59ee7ea1d633b38b SHA512 80110e2b6ef0090c930e59a08f8fc233483a32660cc6017b0ce74d9a6fb56ff8b45f2548d68af5773f7f2d746bd1a910c8c6b9ab369f8e1ffcee5bd5741a6c63 WHIRLPOOL fb75ede00e701e3ce31b5f7638062b35fdf47e0cc59eca112c82273c366a4b2aa9ad4063812373713212617a73127c75daa1c545655e8021fd96322ad2aed809 diff --git a/games-action/teeworlds/files/0.6.1/01-use-system-wavpack.patch b/games-action/teeworlds/files/0.6.1/01-use-system-wavpack.patch deleted file mode 100644 index 3a1944dcf739..000000000000 --- a/games-action/teeworlds/files/0.6.1/01-use-system-wavpack.patch +++ /dev/null @@ -1,103 +0,0 @@ -Use system wavpack. Based on patch from Gentoo Bugzilla - -From: Azamat H. Hackimov - -https://bugs.gentoo.org/show_bug.cgi?id=363395 ---- - - bam.lua | 15 +++++++++++++-- - src/engine/client/sound.cpp | 10 +++++++++- - 2 files changed, 22 insertions(+), 3 deletions(-) - - -diff --git a/bam.lua b/bam.lua -index 5699251..ce24cff 100644 ---- a/bam.lua -+++ b/bam.lua -@@ -9,6 +9,7 @@ config = NewConfig() - config:Add(OptCCompiler("compiler")) - config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all")) - config:Add(OptLibrary("zlib", "zlib.h", false)) -+config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false)) - config:Add(SDL.OptFind("sdl", true)) - config:Add(FreeType.OptFind("freetype", true)) - config:Finalize("config.lua") -@@ -165,7 +166,7 @@ function build(settings) - end - - -- compile zlib if needed -- if config.zlib.value == 1 then -+ if config.zlib.value == true then - settings.link.libs:Add("z") - if config.zlib.include_path then - settings.cc.includes:Add(config.zlib.include_path) -@@ -176,8 +177,18 @@ function build(settings) - settings.cc.includes:Add("src/engine/external/zlib") - end - -+ if config.wavpack.value == true then -+ settings.link.libs:Add("wavpack") -+ if config.wavpack.include_path then -+ settings.cc.includes:Add(config.wavpack.include_path) -+ end -+ wavpack = {} -+ else -+ wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) -+ settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder -+ end -+ - -- build the small libraries -- wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) - pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) - - -- build game components -diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp -index c2ca91f..f356e34 100644 ---- a/src/engine/client/sound.cpp -+++ b/src/engine/client/sound.cpp -@@ -10,7 +10,7 @@ - #include "sound.h" - - extern "C" { // wavpack -- #include -+ #include - } - #include - -@@ -333,19 +333,25 @@ int CSound::LoadWV(const char *pFilename) - if(!m_pStorage) - return -1; - -+ #ifndef WAVPACK_H - ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL); - if(!ms_File) - { - dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename); - return -1; - } -+ #endif - - SampleID = AllocID(); - if(SampleID < 0) - return -1; - pSample = &m_aSamples[SampleID]; - -+ #ifndef WAVPACK_H - pContext = WavpackOpenFileInput(ReadData, aError); -+ #else -+ pContext = WavpackOpenFileInput(pFilename, aError, 0, 0); -+ #endif - if (pContext) - { - int m_aSamples = WavpackGetNumSamples(pContext); -@@ -401,8 +407,10 @@ int CSound::LoadWV(const char *pFilename) - dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError); - } - -+ #ifndef WAVPACK_H - io_close(ms_File); - ms_File = NULL; -+ #endif - - if(g_Config.m_Debug) - dbg_msg("sound/wv", "loaded %s", pFilename); diff --git a/games-action/teeworlds/files/0.6.1/02-fixed-wavpack-sound-loading.patch b/games-action/teeworlds/files/0.6.1/02-fixed-wavpack-sound-loading.patch deleted file mode 100644 index b129aaf11ce4..000000000000 --- a/games-action/teeworlds/files/0.6.1/02-fixed-wavpack-sound-loading.patch +++ /dev/null @@ -1,109 +0,0 @@ -Fixing wavpack sound loading. Based on Gentoo Bugzilla - -From: Azamat H. Hackimov - -https://bugs.gentoo.org/show_bug.cgi?id=363395 ---- - - src/engine/client/sound.cpp | 56 ++++++++++++++++++++++++++++++++++++++----- - 1 files changed, 50 insertions(+), 6 deletions(-) - - -diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp -index f356e34..b55a798 100644 ---- a/src/engine/client/sound.cpp -+++ b/src/engine/client/sound.cpp -@@ -50,6 +50,54 @@ struct CVoice - int m_X, m_Y; - } ; - -+#ifdef WAVPACK_H -+static int32_t ReadBytes(void *pFile, void *pBuffer, int32_t Size) -+{ -+ return (int32_t)io_read((IOHANDLE)pFile, pBuffer, Size); -+} -+static uint32_t GetPos(void *pFile) -+{ -+ return (uint32_t)io_tell((IOHANDLE)pFile); -+} -+static int SetPosAbs(void *pFile, uint32_t Offset) -+{ -+ return io_seek((IOHANDLE)pFile, Offset, IOSEEK_START); -+} -+static int SetPosRel(void *pFile, int32_t Offset, int Mode) -+{ -+ switch(Mode) -+ { -+ case SEEK_SET: -+ Mode = IOSEEK_START; -+ break; -+ case SEEK_CUR: -+ Mode = IOSEEK_CUR; -+ break; -+ case SEEK_END: -+ Mode = IOSEEK_END; -+ } -+ return io_seek((IOHANDLE)pFile, Offset, Mode); -+} -+ -+//TODO: Fix if 'real' functionality is needed by the wavpack header -+static int PushBackByte(void *pFile, int Char) -+{ -+ return io_seek((IOHANDLE)pFile, -1, IOSEEK_CUR); -+} -+static uint32_t GetLength(void *pFile) -+{ -+ return (uint32_t)io_length((IOHANDLE)pFile); -+} -+// Essentially assuming this to always be true, should fix if this isn't the case -+static int CanSeek(void *pFile) -+{ -+ return pFile != NULL; -+} -+static WavpackStreamReader CWavpackReader = { -+ ReadBytes, GetPos, SetPosAbs, SetPosRel, PushBackByte, GetLength, CanSeek, 0 -+}; -+#endif -+ - static CSample m_aSamples[NUM_SAMPLES] = { {0} }; - static CVoice m_aVoices[NUM_VOICES] = { {0} }; - static CChannel m_aChannels[NUM_CHANNELS] = { {255, 0} }; -@@ -333,14 +381,12 @@ int CSound::LoadWV(const char *pFilename) - if(!m_pStorage) - return -1; - -- #ifndef WAVPACK_H - ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL); - if(!ms_File) - { - dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename); - return -1; - } -- #endif - - SampleID = AllocID(); - if(SampleID < 0) -@@ -350,7 +396,7 @@ int CSound::LoadWV(const char *pFilename) - #ifndef WAVPACK_H - pContext = WavpackOpenFileInput(ReadData, aError); - #else -- pContext = WavpackOpenFileInput(pFilename, aError, 0, 0); -+ pContext = WavpackOpenFileInputEx(&CWavpackReader, ms_File, 0, aError, 0, 0); - #endif - if (pContext) - { -@@ -404,13 +450,11 @@ int CSound::LoadWV(const char *pFilename) - } - else - { -- dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError); -+ dbg_msg("sound/wv", "failed to open '%s': %s", pFilename, aError); - } - -- #ifndef WAVPACK_H - io_close(ms_File); - ms_File = NULL; -- #endif - - if(g_Config.m_Debug) - dbg_msg("sound/wv", "loaded %s", pFilename); diff --git a/games-action/teeworlds/files/0.6.1/03-use-system-pnglite.patch b/games-action/teeworlds/files/0.6.1/03-use-system-pnglite.patch deleted file mode 100644 index 998a08659362..000000000000 --- a/games-action/teeworlds/files/0.6.1/03-use-system-pnglite.patch +++ /dev/null @@ -1,112 +0,0 @@ -Use system pnglite. Based on Gentoo Bugzilla - -From: Azamat H. Hackimov - -https://bugs.gentoo.org/show_bug.cgi?id=363395 ---- - - bam.lua | 33 +++++++++++++++++++++------------ - src/engine/client/graphics.cpp | 2 +- - src/tools/dilate.cpp | 2 +- - src/tools/tileset_borderfix.cpp | 2 +- - 4 files changed, 24 insertions(+), 15 deletions(-) - - -diff --git a/bam.lua b/bam.lua -index ce24cff..46b8e42 100644 ---- a/bam.lua -+++ b/bam.lua -@@ -9,6 +9,7 @@ config = NewConfig() - config:Add(OptCCompiler("compiler")) - config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all")) - config:Add(OptLibrary("zlib", "zlib.h", false)) -+config:Add(OptLibrary("pnglite", "pnglite.h", false)) - config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false)) - config:Add(SDL.OptFind("sdl", true)) - config:Add(FreeType.OptFind("freetype", true)) -@@ -177,26 +178,34 @@ function build(settings) - settings.cc.includes:Add("src/engine/external/zlib") - end - -+ -- build game components -+ engine_settings = settings:Copy() -+ server_settings = engine_settings:Copy() -+ client_settings = engine_settings:Copy() -+ launcher_settings = engine_settings:Copy() -+ -+ if config.pnglite.value == true then -+ client_settings.link.libs:Add("pnglite") -+ if config.pnglite.include_path then -+ client_settings.cc.includes:Add(config.pnglite.include_path) -+ end -+ pnglite = {} -+ else -+ pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) -+ client_settings.cc.includes:Add("src/engine/external/pnglite") -+ end -+ - if config.wavpack.value == true then -- settings.link.libs:Add("wavpack") -+ client_settings.link.libs:Add("wavpack") - if config.wavpack.include_path then -- settings.cc.includes:Add(config.wavpack.include_path) -+ client_settings.cc.includes:Add(config.wavpack.include_path) - end - wavpack = {} - else - wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) -- settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder -+ client_settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder - end - -- -- build the small libraries -- pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) -- -- -- build game components -- engine_settings = settings:Copy() -- server_settings = engine_settings:Copy() -- client_settings = engine_settings:Copy() -- launcher_settings = engine_settings:Copy() -- - if family == "unix" then - if platform == "macosx" then - client_settings.link.frameworks:Add("OpenGL") -diff --git a/src/engine/client/graphics.cpp b/src/engine/client/graphics.cpp -index d1f0b8a..f654e87 100644 ---- a/src/engine/client/graphics.cpp -+++ b/src/engine/client/graphics.cpp -@@ -20,7 +20,7 @@ - #endif - - #include --#include -+#include - - #include - #include -diff --git a/src/tools/dilate.cpp b/src/tools/dilate.cpp -index eb770a9..cbd7a3e 100644 ---- a/src/tools/dilate.cpp -+++ b/src/tools/dilate.cpp -@@ -2,7 +2,7 @@ - /* If you are missing that file, acquire a complete release at teeworlds.com. */ - #include - #include --#include -+#include - - typedef struct - { -diff --git a/src/tools/tileset_borderfix.cpp b/src/tools/tileset_borderfix.cpp -index 0facb9a..ab36292 100644 ---- a/src/tools/tileset_borderfix.cpp -+++ b/src/tools/tileset_borderfix.cpp -@@ -1,7 +1,7 @@ - /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */ - /* If you are missing that file, acquire a complete release at teeworlds.com. */ - #include --#include -+#include - - typedef struct - { diff --git a/games-action/teeworlds/files/0.6.2/01-use-system-wavpack.patch b/games-action/teeworlds/files/0.6.2/01-use-system-wavpack.patch deleted file mode 100644 index 4a11a866511d..000000000000 --- a/games-action/teeworlds/files/0.6.2/01-use-system-wavpack.patch +++ /dev/null @@ -1,101 +0,0 @@ -commit 7202b142891ee10771af9f1f3063664d75a38bbc -Author: hasufell -Date: Thu Sep 5 12:28:30 2013 +0200 - - Use system wavpack. Based on patch from Gentoo Bugzilla - - From: Azamat H. Hackimov - - https://bugs.gentoo.org/show_bug.cgi?id=363395 - -diff --git a/bam.lua b/bam.lua -index 11ac7b9..35c1d8d 100644 ---- a/bam.lua -+++ b/bam.lua -@@ -11,6 +11,7 @@ config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-p - config:Add(OptTestCompileC("minmacosxsdk", "int main(){return 0;}", "-mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk")) - config:Add(OptTestCompileC("macosxppc", "int main(){return 0;}", "-arch ppc")) - config:Add(OptLibrary("zlib", "zlib.h", false)) -+config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false)) - config:Add(SDL.OptFind("sdl", true)) - config:Add(FreeType.OptFind("freetype", true)) - config:Finalize("config.lua") -@@ -187,7 +188,7 @@ function build(settings) - end - - -- compile zlib if needed -- if config.zlib.value == 1 then -+ if config.zlib.value == true then - settings.link.libs:Add("z") - if config.zlib.include_path then - settings.cc.includes:Add(config.zlib.include_path) -@@ -198,8 +199,18 @@ function build(settings) - settings.cc.includes:Add("src/engine/external/zlib") - end - -+ if config.wavpack.value == true then -+ settings.link.libs:Add("wavpack") -+ if config.wavpack.include_path then -+ settings.cc.includes:Add(config.wavpack.include_path) -+ end -+ wavpack = {} -+ else -+ wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) -+ settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder -+ end -+ - -- build the small libraries -- wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) - pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) - - -- build game components -diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp -index 343fa2e..e32cac9 100644 ---- a/src/engine/client/sound.cpp -+++ b/src/engine/client/sound.cpp -@@ -13,7 +13,7 @@ - #include "sound.h" - - extern "C" { // wavpack -- #include -+ #include - } - #include - -@@ -351,19 +351,25 @@ int CSound::LoadWV(const char *pFilename) - if(!m_pStorage) - return -1; - -+ #ifndef WAVPACK_H - ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL); - if(!ms_File) - { - dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename); - return -1; - } -+ #endif - - SampleID = AllocID(); - if(SampleID < 0) - return -1; - pSample = &m_aSamples[SampleID]; - -+ #ifndef WAVPACK_H - pContext = WavpackOpenFileInput(ReadData, aError); -+ #else -+ pContext = WavpackOpenFileInput(pFilename, aError, 0, 0); -+ #endif - if (pContext) - { - int m_aSamples = WavpackGetNumSamples(pContext); -@@ -419,8 +425,10 @@ int CSound::LoadWV(const char *pFilename) - dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError); - } - -+ #ifndef WAVPACK_H - io_close(ms_File); - ms_File = NULL; -+ #endif - - if(g_Config.m_Debug) - dbg_msg("sound/wv", "loaded %s", pFilename); diff --git a/games-action/teeworlds/files/0.6.2/02-fixed-wavpack-sound-loading.patch b/games-action/teeworlds/files/0.6.2/02-fixed-wavpack-sound-loading.patch deleted file mode 100644 index e207a4a354bf..000000000000 --- a/games-action/teeworlds/files/0.6.2/02-fixed-wavpack-sound-loading.patch +++ /dev/null @@ -1,109 +0,0 @@ -commit b96981f5f23b4269108afb465f29a23abbd32ae2 -Author: hasufell -Date: Thu Sep 5 12:31:19 2013 +0200 - - Fixing wavpack sound loading. Based on Gentoo Bugzilla - - From: Azamat H. Hackimov - - https://bugs.gentoo.org/show_bug.cgi?id=363395 - -diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp -index e32cac9..2a4c653 100644 ---- a/src/engine/client/sound.cpp -+++ b/src/engine/client/sound.cpp -@@ -51,6 +51,55 @@ struct CVoice - int m_X, m_Y; - } ; - -+#ifdef WAVPACK_H -+static int32_t ReadBytes(void *pFile, void *pBuffer, int32_t Size) -+{ -+ return (int32_t)io_read((IOHANDLE)pFile, pBuffer, Size); -+} -+static uint32_t GetPos(void *pFile) -+{ -+ return (uint32_t)io_tell((IOHANDLE)pFile); -+} -+static int SetPosAbs(void *pFile, uint32_t Offset) -+{ -+ return io_seek((IOHANDLE)pFile, Offset, IOSEEK_START); -+} -+static int SetPosRel(void *pFile, int32_t Offset, int Mode) -+{ -+ switch(Mode) -+ { -+ case SEEK_SET: -+ Mode = IOSEEK_START; -+ break; -+ case SEEK_CUR: -+ Mode = IOSEEK_CUR; -+ break; -+ case SEEK_END: -+ Mode = IOSEEK_END; -+ } -+ return io_seek((IOHANDLE)pFile, Offset, Mode); -+} -+ -+//TODO: Fix if 'real' functionality is needed by the wavpack header -+static int PushBackByte(void *pFile, int Char) -+{ -+ return io_seek((IOHANDLE)pFile, -1, IOSEEK_CUR); -+} -+static uint32_t GetLength(void *pFile) -+{ -+ return (uint32_t)io_length((IOHANDLE)pFile); -+} -+// Essentially assuming this to always be true, should fix if this isn't the case -+static int CanSeek(void *pFile) -+{ -+ return pFile != NULL; -+} -+static WavpackStreamReader CWavpackReader = { -+ ReadBytes, GetPos, SetPosAbs, SetPosRel, PushBackByte, GetLength, CanSeek, 0 -+}; -+#endif -+ -+ - static CSample m_aSamples[NUM_SAMPLES] = { {0} }; - static CVoice m_aVoices[NUM_VOICES] = { {0} }; - static CChannel m_aChannels[NUM_CHANNELS] = { {255, 0} }; -@@ -351,14 +400,12 @@ int CSound::LoadWV(const char *pFilename) - if(!m_pStorage) - return -1; - -- #ifndef WAVPACK_H - ms_File = m_pStorage->OpenFile(pFilename, IOFLAG_READ, IStorage::TYPE_ALL); - if(!ms_File) - { - dbg_msg("sound/wv", "failed to open file. filename='%s'", pFilename); - return -1; - } -- #endif - - SampleID = AllocID(); - if(SampleID < 0) -@@ -368,7 +415,7 @@ int CSound::LoadWV(const char *pFilename) - #ifndef WAVPACK_H - pContext = WavpackOpenFileInput(ReadData, aError); - #else -- pContext = WavpackOpenFileInput(pFilename, aError, 0, 0); -+ pContext = WavpackOpenFileInputEx(&CWavpackReader, ms_File, 0, aError, 0, 0); - #endif - if (pContext) - { -@@ -422,13 +469,11 @@ int CSound::LoadWV(const char *pFilename) - } - else - { -- dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError); -+ dbg_msg("sound/wv", "failed to open '%s': %s", pFilename, aError); - } - -- #ifndef WAVPACK_H - io_close(ms_File); - ms_File = NULL; -- #endif - - if(g_Config.m_Debug) - dbg_msg("sound/wv", "loaded %s", pFilename); diff --git a/games-action/teeworlds/files/0.6.2/03-use-system-pnglite.patch b/games-action/teeworlds/files/0.6.2/03-use-system-pnglite.patch deleted file mode 100644 index 81c3d915316b..000000000000 --- a/games-action/teeworlds/files/0.6.2/03-use-system-pnglite.patch +++ /dev/null @@ -1,160 +0,0 @@ -commit 291a375000ac8d9cd5548a863ea6b49c46cfb1bb -Author: hasufell -Date: Thu Sep 5 12:36:53 2013 +0200 - - Use system pnglite. Based on Gentoo Bugzilla - - From: Azamat H. Hackimov - - https://bugs.gentoo.org/show_bug.cgi?id=363395 - -diff --git a/bam.lua b/bam.lua -index 35c1d8d..7902a2c 100644 ---- a/bam.lua -+++ b/bam.lua -@@ -11,6 +11,7 @@ config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-p - config:Add(OptTestCompileC("minmacosxsdk", "int main(){return 0;}", "-mmacosx-version-min=10.5 -isysroot /Developer/SDKs/MacOSX10.5.sdk")) - config:Add(OptTestCompileC("macosxppc", "int main(){return 0;}", "-arch ppc")) - config:Add(OptLibrary("zlib", "zlib.h", false)) -+config:Add(OptLibrary("pnglite", "pnglite.h", false)) - config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false)) - config:Add(SDL.OptFind("sdl", true)) - config:Add(FreeType.OptFind("freetype", true)) -@@ -199,26 +200,34 @@ function build(settings) - settings.cc.includes:Add("src/engine/external/zlib") - end - -+ -- build game components -+ engine_settings = settings:Copy() -+ server_settings = engine_settings:Copy() -+ client_settings = engine_settings:Copy() -+ launcher_settings = engine_settings:Copy() -+ -+ if config.pnglite.value == true then -+ client_settings.link.libs:Add("pnglite") -+ if config.pnglite.include_path then -+ client_settings.cc.includes:Add(config.pnglite.include_path) -+ end -+ pnglite = {} -+ else -+ pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) -+ client_settings.cc.includes:Add("src/engine/external/pnglite") -+ end -+ - if config.wavpack.value == true then -- settings.link.libs:Add("wavpack") -+ client_settings.link.libs:Add("wavpack") - if config.wavpack.include_path then -- settings.cc.includes:Add(config.wavpack.include_path) -+ client_settings.cc.includes:Add(config.wavpack.include_path) - end - wavpack = {} - else - wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) -- settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder -+ client_settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder - end - -- -- build the small libraries -- pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) -- -- -- build game components -- engine_settings = settings:Copy() -- server_settings = engine_settings:Copy() -- client_settings = engine_settings:Copy() -- launcher_settings = engine_settings:Copy() -- - if family == "unix" then - if platform == "macosx" then - client_settings.link.frameworks:Add("OpenGL") -diff --git a/src/engine/client/graphics.cpp b/src/engine/client/graphics.cpp -index 2e8a855..97e4fd7 100644 ---- a/src/engine/client/graphics.cpp -+++ b/src/engine/client/graphics.cpp -@@ -9,7 +9,7 @@ - #include "SDL_opengl.h" - - #include --#include -+#include - - #include - #include -diff --git a/src/engine/client/graphics_threaded.cpp b/src/engine/client/graphics_threaded.cpp -index e34b725..60246d1 100644 ---- a/src/engine/client/graphics_threaded.cpp -+++ b/src/engine/client/graphics_threaded.cpp -@@ -6,7 +6,7 @@ - #include - - #include --#include -+#include - - #include - #include -diff --git a/src/tools/dilate.cpp b/src/tools/dilate.cpp -index 55094a5..42a5b83 100644 ---- a/src/tools/dilate.cpp -+++ b/src/tools/dilate.cpp -@@ -2,7 +2,7 @@ - /* If you are missing that file, acquire a complete release at teeworlds.com. */ - #include - #include --#include -+#include - - typedef struct - { -diff --git a/src/tools/tileset_borderadd.cpp b/src/tools/tileset_borderadd.cpp -index 25e2fa5..88f760a 100644 ---- a/src/tools/tileset_borderadd.cpp -+++ b/src/tools/tileset_borderadd.cpp -@@ -2,7 +2,7 @@ - /* If you are missing that file, acquire a complete release at teeworlds.com. */ - #include - #include --#include -+#include - - typedef struct - { -diff --git a/src/tools/tileset_borderfix.cpp b/src/tools/tileset_borderfix.cpp -index 0facb9a..ab36292 100644 ---- a/src/tools/tileset_borderfix.cpp -+++ b/src/tools/tileset_borderfix.cpp -@@ -1,7 +1,7 @@ - /* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */ - /* If you are missing that file, acquire a complete release at teeworlds.com. */ - #include --#include -+#include - - typedef struct - { -diff --git a/src/tools/tileset_borderrem.cpp b/src/tools/tileset_borderrem.cpp -index d604ecb..8673e41 100644 ---- a/src/tools/tileset_borderrem.cpp -+++ b/src/tools/tileset_borderrem.cpp -@@ -2,7 +2,7 @@ - /* If you are missing that file, acquire a complete release at teeworlds.com. */ - #include - #include --#include -+#include - - typedef struct - { -diff --git a/src/tools/tileset_borderset.cpp b/src/tools/tileset_borderset.cpp -index 8b3e299..c762ee2 100644 ---- a/src/tools/tileset_borderset.cpp -+++ b/src/tools/tileset_borderset.cpp -@@ -2,7 +2,7 @@ - /* If you are missing that file, acquire a complete release at teeworlds.com. */ - #include - #include --#include -+#include - - typedef struct - { diff --git a/games-action/teeworlds/files/0.6.2/04-dedicated.patch b/games-action/teeworlds/files/0.6.2/04-dedicated.patch deleted file mode 100644 index fc61b71283b6..000000000000 --- a/games-action/teeworlds/files/0.6.2/04-dedicated.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: Julian Ospald -Date: Sun Sep 8 11:05:26 UTC 2013 -Subject: fix DATADIR detection for minimal setups - ---- a/src/engine/shared/storage.cpp -+++ b/src/engine/shared/storage.cpp -@@ -208,7 +208,7 @@ - for (i = 0; i < DirsCount; i++) - { - char aBuf[128]; -- str_format(aBuf, sizeof(aBuf), "%s/mapres", aDirs[i]); -+ str_format(aBuf, sizeof(aBuf), "%s/maps", aDirs[i]); - if(fs_is_dir(aBuf)) - { - str_copy(m_aDatadir, aDirs[i], sizeof(m_aDatadir)); diff --git a/games-action/teeworlds/files/0.6.2/05-cc-cflags.patch b/games-action/teeworlds/files/0.6.2/05-cc-cflags.patch deleted file mode 100644 index dec6b8d306fc..000000000000 --- a/games-action/teeworlds/files/0.6.2/05-cc-cflags.patch +++ /dev/null @@ -1,18 +0,0 @@ -From: Julian Ospald -Date: Sun Sep 8 12:25:19 UTC 2013 -Subject: respect our gentoo settings - - this has to be at this place or later - otherwise some of our settings would be overwritten - ---- a/bam.lua -+++ b/bam.lua -@@ -168,6 +168,8 @@ - -- set some platform specific settings - settings.cc.includes:Add("src") - -+ dofile("gentoo.lua") addSettings(settings) -+ - if family == "unix" then - if platform == "macosx" then - settings.link.frameworks:Add("Carbon")