# ChangeLog for games-action/teeworlds
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/ChangeLog,v 1.15 2014/05/15 16:25:24 ulm Exp $
+# 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 $
+
+*teeworlds-0.6.3 (06 Jan 2015)
+
+ 06 Jan 2015; Michael Sterrett <mr_bones_@gentoo.org>
+ +files/0.6.3/01-use-system-wavpack.patch,
+ +files/0.6.3/02-fixed-wavpack-sound-loading.patch,
+ +files/0.6.3/03-use-system-pnglite.patch, +files/0.6.3/04-dedicated.patch,
+ +files/0.6.3/05-cc-cflags.patch, +teeworlds-0.6.3.ebuild,
+ -teeworlds-0.6.2-r1.ebuild:
+ version bump
15 May 2014; Ulrich Müller <ulm@gentoo.org> teeworlds-0.6.2-r1.ebuild:
Fix USE dependency on media-libs/libsdl, "audio" USE flag was renamed to
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
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/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
+AUX 0.6.3/04-dedicated.patch 491 SHA256 2dcf3a886a5e22c308b041463d3e40ac1e6047f93c5022028ba915b0598e45ed SHA512 c292b638e58e69fcf6b273617fc43cc4c8d96ffe4c75ad7911c1b319a129de6c01255f988569a0532b8e6c29f775ececc679274f7f85c6a9933bf713620ab8fb WHIRLPOOL cd224d0f8897749c3bbca245ef93b5ddb2ba42cd743fbe3e4ce6a745ea08e25da7bd0419780a0fd153b76bd3654240ffe6ca69446607ce6ccd3d980a3677856e
+AUX 0.6.3/05-cc-cflags.patch 482 SHA256 ab634107cb694cf1030e3311c3c0bbc1c4bdc723a8840bb3656b56532479bb69 SHA512 92b74845413c20cf4626cb89b8b825bc5cb2f25e9af1d61d2ecabbda3acf024ee0c5e03abf8de2b57d6a8c739a8cf343fcb109a3a72d4baa016711e53368d0f8 WHIRLPOOL f38b40006b8978b82731cf2d422f9af98206057a493c49698138a7b75255306cf13a325803d6c40f4e551385a7a7d1a0a206e260ff623ecf0416ae6697da297e
AUX teeworlds-init.d 999 SHA256 8f60b3b2f68d9cfdb279ffbaefd2a6c611d74ce87fc306faaa438dc61732ca3b SHA512 a61b52a649764fc908c14cabfec3525393c9aba699475ec2f27a1d16265fc6e627f3f3adbe9bdf9303a28791c6e42be48f74083ed69435f742849ec24a82d27e WHIRLPOOL 883d2ef2d42fb499cd68ccf3f795b8630a66ace7a0eec0ab81e571989981adef44a0bed57e8cc610bc4d5cb6867474d9f8539205ca8227ba516a4ae5e5238eeb
AUX teeworlds.xpm 2785 SHA256 0b31cc3e65ca26676324a7b66de29cb91df90221e28f9e4b5adfec0e37729284 SHA512 f8a8a1c3a5675f12b13ddaf9b68bc2757698725d406356c871d58e62f735413b5f4f0bcb3dbf783e0aa6b3ecb0ec7f9eddbcef044506a6a07a374fe46d2616c0 WHIRLPOOL f7f70bf612b4d69bacc68b29c9ffd2fa194755285b389523df30ff53e190df821595dbc9381049c6a9443950b30fa3caa946445d336e86113d05ec195f8eff22
AUX teeworlds_srv.cfg 193 SHA256 9c00eca2c72d02893c288282793b81abb472ee0a7302847e472e964179339687 SHA512 d9a55f749f6974caddf96438eb38e490e0e507fbe07ebdac070fe91ab46eed93afb5dd6300a5b7a86b6282c6b97fdd178a00720483c3e71490be816b8c6a73b5 WHIRLPOOL 93726bef063d4d280f9058d3698c4f76492e2705d1f0c5506400c391fdb3c0feeb99374fbe814c0b3735e41f6d4a77f80b90baa206f1bac7dad6c740e115b6a2
-DIST teeworlds-0.6.2-source.tar.gz 9179568 SHA256 00061b30377597a61810eda3dc5de0caad439ca851cb8eebbe4152e4f861e2af SHA512 e08db7a8eabe2f04c543ecf1abc2f51b513a06812581cf8c396fc8bd7e038ce09c46f73bfea80e295affded96c511ef74d47a14dd03fd0aac05487a46f380839 WHIRLPOOL 4656378b51d3b06b268f228370d0ef8db03920a476652ebab6af37839636c91380c40c7ffc721fcdb2519b14b76ee848e40add01fb016cdd399bcd50d9e6bbf4
-EBUILD teeworlds-0.6.2-r1.ebuild 2543 SHA256 1f856b6fba13eed72330f9747f681abacac4e0eb502733e6ab3129a0a15d7377 SHA512 5987d4ae9e33977b2ee660a106b5bd418f8551a3a60b8162b61cfe0c24693da914d4c95aafa41d6958e0139ee8f3d6fd2cba3ae3ec5d6f9a61710294aa4abee8 WHIRLPOOL aec90d9fc1988f0e5ccdcf9d4f2f169118540d5ef3fc6a9c52fd24f74b93133bbf1c7765bccb00462394b4b6ef17dbd8d7504d9f67553216af30f6cbf824ecd3
-MISC ChangeLog 3130 SHA256 b9df5e989ca12df822f645025d731a89f5cdd802cce06fc28c9b19df8113b1a9 SHA512 b87c72e9e379cf73365f3008787df69321c797c7932787e20be52f922fae29c259b1f4d8ca6361b7108c9fde27f15efa1544233a7f7077658c67c1f49daa676a WHIRLPOOL 55b1bd9580d342f8668b989f78e08782fdfe433f7f226276da3d98fdfabe9a9a012ce1bf53c070871dd018e3dee323723d2eff43e0f3234d49b207d4bad93cb3
+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 metadata.xml 160 SHA256 03e34b6506e114bf8eee720498f15d09a5344e83b766a45c59ee7ea1d633b38b SHA512 80110e2b6ef0090c930e59a08f8fc233483a32660cc6017b0ce74d9a6fb56ff8b45f2548d68af5773f7f2d746bd1a910c8c6b9ab369f8e1ffcee5bd5741a6c63 WHIRLPOOL fb75ede00e701e3ce31b5f7638062b35fdf47e0cc59eca112c82273c366a4b2aa9ad4063812373713212617a73127c75daa1c545655e8021fd96322ad2aed809
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQGcBAEBCAAGBQJTdOqCAAoJEJQzkH1pP7W4uLIL/0LRCRG7E8C2O5otiBoIzDdI
-231hJzZ0cQ2trsrfWeK+wlgAC/MdZBLJ3s8+cNRMM5estiJbZF9+oeSxj+VcLg/y
-t0Lv1H+rlyvT7Xogio1xNNDaU77Fnk45nq9uBnvQXDfm2U6ksKMbCh2rZ/wn7qD4
-QC8XBsBHVSlQgHTQAkION6QGkTAPMWmNi3g387raWVPKvpgLTeinZ5PhdfCfPJa1
-hLU1ije6YpnU0RpXdObwYnA+n+RrIlMz75DRjhnfEB6IbcR9NekYue+beuotuMPF
-qKSUucWCzZVSt5J6Sr7JWBCONkYNrQcovzUEcp6HI/20Bs91P+T+8TdfEijJq/80
-8LiU7BzLfuRAi+3OLjOa5r045h6z9r67U/op+fGu87GOnFTmr6swI2jAS0AZ01eP
-LAGW9Fqdll45qxnM86pxBpf+og3lYQgGJJILflm4a5xj60ZMnG/FwOr+NX92F3Zf
-NvfxKo5KM9TZDIlSnjRF3mow7ISFGXqKRhDPtpIMAg==
-=ACLd
------END PGP SIGNATURE-----
--- /dev/null
+commit 7202b142891ee10771af9f1f3063664d75a38bbc
+Author: hasufell <hasufell@gentoo.org>
+Date: Thu Sep 5 12:28:30 2013 +0200
+
+ Use system wavpack. Based on patch from Gentoo Bugzilla
+
+ From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+
+ 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 <engine/external/wavpack/wavpack.h>
++ #include <wavpack/wavpack.h>
+ }
+ #include <math.h>
+
+@@ -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);
--- /dev/null
+commit b96981f5f23b4269108afb465f29a23abbd32ae2
+Author: hasufell <hasufell@gentoo.org>
+Date: Thu Sep 5 12:31:19 2013 +0200
+
+ Fixing wavpack sound loading. Based on Gentoo Bugzilla
+
+ From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+
+ 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);
--- /dev/null
+commit 291a375000ac8d9cd5548a863ea6b49c46cfb1bb
+Author: hasufell <hasufell@gentoo.org>
+Date: Thu Sep 5 12:36:53 2013 +0200
+
+ Use system pnglite. Based on Gentoo Bugzilla
+
+ From: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+
+ 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 <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+
+ #include <engine/shared/config.h>
+ #include <engine/graphics.h>
+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 <base/tl/threading.h>
+
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+
+ #include <engine/shared/config.h>
+ #include <engine/graphics.h>
+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 <base/system.h>
+ #include <base/math.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+
+ 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 <base/math.h>
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+
+ 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 <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+
+ 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 <base/math.h>
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+
+ 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 <base/math.h>
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+
+ typedef struct
+ {
--- /dev/null
+From: Julian Ospald <hasufell@gentoo.org>
+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));
--- /dev/null
+From: Julian Ospald <hasufell@gentoo.org>
+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")
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/teeworlds-0.6.2-r1.ebuild,v 1.2 2014/05/15 16:25:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/teeworlds-0.6.3.ebuild,v 1.1 2015/01/06 09:27:01 mr_bones_ Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
DESCRIPTION="Online multi-player platform 2D shooter"
HOMEPAGE="http://www.teeworlds.com/"
-SRC_URI="http://www.teeworlds.com/files/${P}-source.tar.gz"
+SRC_URI="https://downloads.teeworlds.com/${P}-src.tar.gz"
LICENSE="ZLIB"
SLOT="0"
${PYTHON_DEPS}
~dev-util/bam-0.4.0"
-S=${WORKDIR}/${P}-source
+S=${WORKDIR}/${P}-src
pkg_setup() {
python-any-r1_pkg_setup
projects / gentoo.git / commitdiff