[gentoo-commits] repo/gentoo:master commit in: games-action/teeworlds/files/

2020-07-20 Thread Sam James
commit: 146baa3b961a0b5f95cb0350c0f9b826dead2c7f
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Jul 20 16:15:13 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 20 23:30:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=146baa3b

games-action/teeworlds: remove unused file

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16753
Signed-off-by: Sam James  gentoo.org>

 games-action/teeworlds/files/teeworlds.xpm | 66 --
 1 file changed, 66 deletions(-)

diff --git a/games-action/teeworlds/files/teeworlds.xpm 
b/games-action/teeworlds/files/teeworlds.xpm
deleted file mode 100644
index 76e30166dd3..000
--- a/games-action/teeworlds/files/teeworlds.xpm
+++ /dev/null
@@ -1,66 +0,0 @@
-/* XPM */
-static char *teeworlds__[] = {
-/* columns rows colors chars-per-pixel */
-"48 48 12 1",
-"  c #00",
-". c #80",
-"X c #FF",
-"o c #008000",
-"O c #808000",
-"+ c #00",
-"@ c #80",
-"# c #800080",
-"$ c #008080",
-"% c #808080",
-"& c #C0C0C0",
-"* c None",
-/* pixels */
-"*%%.%%%*",
-"*%%*",
-"*** .%O%OOO. ***",
-"*   ..%+&   @*",
-"***%   O&&++%   ",
-"**O  .+&&+O  %**",
-"*@  O&&&+++%  %*",
-"  .O&+++%  %",
-"***%  O+&%  ",
-"***  O+&&+%  ***",
-"**  O+X&+++O .**",
-"*% .OX++  **",
-"*  .   +O@ ++  *",
-"%  ++X+ +++O  . +  *",
-"  O+X++ +++ +O %",
-"  X++X+ +++ ++  ",
-"  ++X+& +++ ++  ",
-"***% .+X+O+ +++ ++O ",
-"***% O++X+& +++ ++% %***",
-"***  O+X+++ +++O++O %***",
-"***  OX+X+X+   +   +++& .***",
-"***  X+&++O $***",
-"***  OX+X++%++% .***",
-"***  O+O++X+++% %***",
-"***  O+X+X+++ %***",
-"***% .+O++X+X+  ",
-"  +X+X+++%+++&  ",
-"  O++O+OX+&++%  ",
-"% .+X+X&+. %",
-"*  O+O+X+OX+&+++%  *",
-"*  O+X++X+++@ %*",
-"**  OO+X++X+X++%  **",
-"**%  ++O+X++O+&  %**",
-"***  .O o   .O.O+&+++&. %***",
-"**%O.OOO#o.  OO+&+++&.  ",
-"*%  .O+X+X+X%+.  OX++&+&++X+ ***",
-"*  .%OX+O+%O+&+X&+O oO+X+XO .OO   **",
-"% .OO+%++&+X+%+X .+O++X+O. #%+X+.  *",
-"  O+X+X+X+%+X&++%+O+% O+X+OO .O+X+ *",
-"  OX+%+O%+%+%+++XO OO  .O%+%+%X+%O $",
-"  +OOX+X+X+X+X+%+X+%+.  ..O%X+X+X+%+X% .",
-"  OX+%+%+%+%+%+%+%+X+. O+%+O+%+%+%+X+O  ",
-"  OOX+X+X+X+OX+X+X+OO.OX+X+XOX+X+X+OO  %",
-"%  OOO+XO+O.  OO+OO.   %",
-"* %*",
-"***.%***",
-"***%%%**",
-""
-};



[gentoo-commits] repo/gentoo:master commit in: games-action/teeworlds/files/0.6/, games-action/teeworlds/

2020-07-17 Thread Sam James
commit: a9e74fa9c10625e66021aa729889d6b418754c9d
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 17 21:31:24 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 17 23:59:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9e74fa9

games-action/teeworlds: security cleanup

Bug: https://bugs.gentoo.org/683000
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 games-action/teeworlds/Manifest|   1 -
 .../files/0.6/01-use-system-wavpack.patch  | 101 -
 .../files/0.6/02-fixed-wavpack-sound-loading.patch | 109 --
 .../files/0.6/03-use-system-pnglite.patch  | 160 -
 .../teeworlds/files/0.6/04-dedicated.patch |  15 --
 .../teeworlds/files/0.6/05-cc-cflags.patch |  18 ---
 games-action/teeworlds/teeworlds-0.6.4.ebuild  | 118 ---
 7 files changed, 522 deletions(-)

diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest
index 6b9d796adb2..08b8c1c89d4 100644
--- a/games-action/teeworlds/Manifest
+++ b/games-action/teeworlds/Manifest
@@ -1,4 +1,3 @@
-DIST teeworlds-0.6.4-src.tar.gz 8771622 BLAKE2B 
14493fcad458b0e1c749e40bdd6a5a858704bf971d53d11782d52fbe9b5fe2a09235dcac25340e51a3330001d46ee512f2971e8db06eb9f51eec5e6b3cd2a328
 SHA512 
7546ee358a2126339f6c727bb7b5f49009a8fad0b5e77a796202cba4d8fc5dfcaf79b7e65151d85fead2a70ad61ef3e1888b8c07fe0206f87575d5dd8c9f91ce
 DIST teeworlds-0.7.5-maps.tar.gz 151689 BLAKE2B 
f8ffbb6a024755bb972955a8c7d277709e17021c0554be0e2803e8c1b4848f5dca6d91b9f7f4e0731766745878c1143d27be3fa8aede01ff9cc69ac557ca70a8
 SHA512 
74084e169c1870cd541f5bb719c209210227055d304b3ce22fbad3d32d24b3356fbdec8d948edf3aa582270a8b0db7dec41e4924401f8398f7d5feba5ded49b3
 DIST teeworlds-0.7.5-translation.tar.gz 169121 BLAKE2B 
1c649392385abf8e00d8c9e64ca7eaaa5af5848878566081cda83c7d78c417652137e7285d16038f302a6fdf94eb3993c506886d4cc1359694d534c7be5ea925
 SHA512 
41c69cd9e9290857b44be18f89ab9f3a7ccd6804757332966b973aec3a9e6fd5a40d323696a044a724228b2bb67b097311fa8c24fdec226eecb7a27c2da559dc
 DIST teeworlds-0.7.5.tar.gz 8654985 BLAKE2B 
ebeb9aa1119950e4d78d8c0d6c7be5711894c3212755a6db3b8b8c1f1803dba1e0d2e1a0e294e1a1fffe84a28beab8fac0e55fa0e94c68ed97e8764ac3b742d3
 SHA512 
673410a5fb5e488229ddc4ea4a1ac9cd8143a6e9499bde9f5535d7f0be5b6c85163065da9580c3de0d240f1cad63e0bc12c10caf1d893c324edb301bc150653b

diff --git a/games-action/teeworlds/files/0.6/01-use-system-wavpack.patch 
b/games-action/teeworlds/files/0.6/01-use-system-wavpack.patch
deleted file mode 100644
index 4a11a866511..000
--- a/games-action/teeworlds/files/0.6/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