[gentoo-commits] proj/gamerlay:master commit in: games-action/teeworlds/files/, games-action/teeworlds/, ...

[Azamat H. Hackimov]

commit:     7763b8d40b41019dc32f1e8b638b73b56b792591
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Tue Aug  2 16:24:16 2011 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Tue Aug  2 16:24:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=7763b8d4

[games-action/teeworlds] Version bump to 0.6.1

(Portage version: 2.1.10.3/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 .../01-use-system-wavpack.patch}                   |   26 +++++++---------
 .../02-fixed-wavpack-sound-loading.patch}          |   25 +++++++--------
 .../03-use-system-pnglite.patch}                   |   31 +++++++++----------
 ...rlds-0.6.0-r1.ebuild => teeworlds-0.6.1.ebuild} |   14 ++++----
 4 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/games-action/teeworlds/files/teeworlds-0.6.0-001-use-system-wavpack.patch b/games-action/teeworlds/files/0.6.1/01-use-system-wavpack.patch
similarity index 85%
rename from games-action/teeworlds/files/teeworlds-0.6.0-001-use-system-wavpack.patch
rename to games-action/teeworlds/files/0.6.1/01-use-system-wavpack.patch
index 4391172..3a1944d 100644
--- a/games-action/teeworlds/files/teeworlds-0.6.0-001-use-system-wavpack.patch
+++ b/games-action/teeworlds/files/0.6.1/01-use-system-wavpack.patch
@@ -1,16 +1,17 @@
-From 5c5171d2de5f4d3b7926f16faa70b16ccf434c86 Mon Sep 17 00:00:00 2001
-From: xalduin <xalduin@×××××.com>
-Date: Sat, 12 Feb 2011 22:22:02 -0500
-Subject: [PATCH 1/3] Will now use system wavpack and zlib libraries if available when
- compiling
+Use system wavpack. Based on patch from Gentoo Bugzilla
 
+From: Azamat H. Hackimov <azamat.hackimov@×××××.com>
+
+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 0c953e8..ade4ae4 100644
+index 5699251..ce24cff 100644
 --- a/bam.lua
 +++ b/bam.lua
 @@ -9,6 +9,7 @@ config = NewConfig()
@@ -23,7 +24,7 @@ index 0c953e8..ade4ae4 100644
  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
@@ -48,10 +49,10 @@ index 0c953e8..ade4ae4 100644
  	-- 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 55ca293..e38ad32 100644
+index c2ca91f..f356e34 100644
 --- a/src/engine/client/sound.cpp
 +++ b/src/engine/client/sound.cpp
 @@ -10,7 +10,7 @@
@@ -63,7 +64,7 @@ index 55ca293..e38ad32 100644
  }
  #include <math.h>
  
-@@ -328,19 +328,25 @@ int CSound::LoadWV(const char *pFilename)
+@@ -333,19 +333,25 @@ int CSound::LoadWV(const char *pFilename)
  	if(!m_pStorage)
  		return -1;
  
@@ -89,7 +90,7 @@ index 55ca293..e38ad32 100644
  	if (pContext)
  	{
  		int m_aSamples = WavpackGetNumSamples(pContext);
-@@ -395,8 +401,10 @@ int CSound::LoadWV(const char *pFilename)
+@@ -401,8 +407,10 @@ int CSound::LoadWV(const char *pFilename)
  		dbg_msg("sound/wv", "failed to open %s: %s", pFilename, aError);
  	}
  
@@ -100,6 +101,3 @@ index 55ca293..e38ad32 100644
  
  	if(g_Config.m_Debug)
  		dbg_msg("sound/wv", "loaded %s", pFilename);
--- 
-1.7.3.4
-

diff --git a/games-action/teeworlds/files/teeworlds-0.6.0-002-fixed-wavpack-sound-loading.patch b/games-action/teeworlds/files/0.6.1/02-fixed-wavpack-sound-loading.patch
similarity index 84%
rename from games-action/teeworlds/files/teeworlds-0.6.0-002-fixed-wavpack-sound-loading.patch
rename to games-action/teeworlds/files/0.6.1/02-fixed-wavpack-sound-loading.patch
index 206bc6a..b129aaf 100644
--- a/games-action/teeworlds/files/teeworlds-0.6.0-002-fixed-wavpack-sound-loading.patch
+++ b/games-action/teeworlds/files/0.6.1/02-fixed-wavpack-sound-loading.patch
@@ -1,17 +1,19 @@
-From 5a5322491704c14f5aed72148db6b134484cedec Mon Sep 17 00:00:00 2001
-From: xalduin <xalduin@×××××.com>
-Date: Sat, 12 Feb 2011 23:58:55 -0500
-Subject: [PATCH 2/3] Fixed wavpack sound loading
+Fixing wavpack sound loading. Based on Gentoo Bugzilla
 
+From: Azamat H. Hackimov <azamat.hackimov@×××××.com>
+
+https://bugs.gentoo.org/show_bug.cgi?id=363395
 ---
- src/engine/client/sound.cpp |   56 ++++++++++++++++++++++++++++++++++++++----
+
+ 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 e38ad32..6101602 100644
+index f356e34..b55a798 100644
 --- a/src/engine/client/sound.cpp
 +++ b/src/engine/client/sound.cpp
-@@ -49,6 +49,54 @@ struct CVoice
+@@ -50,6 +50,54 @@ struct CVoice
  	int m_X, m_Y;
  } ;
  
@@ -66,7 +68,7 @@ index e38ad32..6101602 100644
  static CSample m_aSamples[NUM_SAMPLES] = { {0} };
  static CVoice m_aVoices[NUM_VOICES] = { {0} };
  static CChannel m_aChannels[NUM_CHANNELS] = { {255, 0} };
-@@ -328,14 +376,12 @@ int CSound::LoadWV(const char *pFilename)
+@@ -333,14 +381,12 @@ int CSound::LoadWV(const char *pFilename)
  	if(!m_pStorage)
  		return -1;
  
@@ -81,7 +83,7 @@ index e38ad32..6101602 100644
  
  	SampleID = AllocID();
  	if(SampleID < 0)
-@@ -345,7 +391,7 @@ int CSound::LoadWV(const char *pFilename)
+@@ -350,7 +396,7 @@ int CSound::LoadWV(const char *pFilename)
  	#ifndef WAVPACK_H
  	pContext = WavpackOpenFileInput(ReadData, aError);
  	#else
@@ -90,7 +92,7 @@ index e38ad32..6101602 100644
  	#endif
  	if (pContext)
  	{
-@@ -398,13 +444,11 @@ int CSound::LoadWV(const char *pFilename)
+@@ -404,13 +450,11 @@ int CSound::LoadWV(const char *pFilename)
  	}
  	else
  	{
@@ -105,6 +107,3 @@ index e38ad32..6101602 100644
  
  	if(g_Config.m_Debug)
  		dbg_msg("sound/wv", "loaded %s", pFilename);
--- 
-1.7.3.4
-

diff --git a/games-action/teeworlds/files/teeworlds-0.6.0-003-use-system-pnglite.patch b/games-action/teeworlds/files/0.6.1/03-use-system-pnglite.patch
similarity index 87%
rename from games-action/teeworlds/files/teeworlds-0.6.0-003-use-system-pnglite.patch
rename to games-action/teeworlds/files/0.6.1/03-use-system-pnglite.patch
index 5da5c50..998a086 100644
--- a/games-action/teeworlds/files/teeworlds-0.6.0-003-use-system-pnglite.patch
+++ b/games-action/teeworlds/files/0.6.1/03-use-system-pnglite.patch
@@ -1,17 +1,19 @@
-From f4d073f439d50f49055ab75f0f1242b124f9aba2 Mon Sep 17 00:00:00 2001
-From: Bruno Tarquini <btarquini@×××××.com>
-Date: Tue, 12 Apr 2011 22:53:30 +0200
-Subject: [PATCH 3/3] use system pnglite if available. link only the client with  pnglite and wavpack
+Use system pnglite. Based on Gentoo Bugzilla
 
+From: Azamat H. Hackimov <azamat.hackimov@×××××.com>
+
+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 ade4ae4..c0c2211 100644
+index ce24cff..46b8e42 100644
 --- a/bam.lua
 +++ b/bam.lua
 @@ -9,6 +9,7 @@ config = NewConfig()
@@ -59,7 +61,7 @@ index ade4ae4..c0c2211 100644
  
 -	-- 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()
@@ -67,13 +69,13 @@ index ade4ae4..c0c2211 100644
 -	launcher_settings = engine_settings:Copy()
 -
  	if family == "unix" then
-    		if platform == "macosx" 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 99f5e09..2c867ee 100644
+index d1f0b8a..f654e87 100644
 --- a/src/engine/client/graphics.cpp
 +++ b/src/engine/client/graphics.cpp
-@@ -19,7 +19,7 @@
+@@ -20,7 +20,7 @@
  #endif
  
  #include <base/system.h>
@@ -83,7 +85,7 @@ index 99f5e09..2c867ee 100644
  #include <engine/shared/config.h>
  #include <engine/graphics.h>
 diff --git a/src/tools/dilate.cpp b/src/tools/dilate.cpp
-index b1b60ac..b773ceb 100644
+index eb770a9..cbd7a3e 100644
 --- a/src/tools/dilate.cpp
 +++ b/src/tools/dilate.cpp
 @@ -2,7 +2,7 @@
@@ -96,18 +98,15 @@ index b1b60ac..b773ceb 100644
  typedef struct
  {
 diff --git a/src/tools/tileset_borderfix.cpp b/src/tools/tileset_borderfix.cpp
-index d28e307..b060f0d 100644
+index 0facb9a..ab36292 100644
 --- a/src/tools/tileset_borderfix.cpp
 +++ b/src/tools/tileset_borderfix.cpp
-@@ -2,7 +2,7 @@
+@@ -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 <stdlib.h>
  #include <base/system.h>
 -#include <engine/external/pnglite/pnglite.h>
 +#include <pnglite.h>
  
  typedef struct
  {
--- 
-1.7.3.4
-

diff --git a/games-action/teeworlds/teeworlds-0.6.0-r1.ebuild b/games-action/teeworlds/teeworlds-0.6.1.ebuild
similarity index 84%
rename from games-action/teeworlds/teeworlds-0.6.0-r1.ebuild
rename to games-action/teeworlds/teeworlds-0.6.1.ebuild
index 7f01b3d..bf1562e 100644
--- a/games-action/teeworlds/teeworlds-0.6.0-r1.ebuild
+++ b/games-action/teeworlds/teeworlds-0.6.1.ebuild
@@ -8,9 +8,11 @@ PYTHON_DEPEND="2"
 
 inherit eutils python games
 
+REVISION="b177-r50edfd37"
+
 DESCRIPTION="Online multi-player platform 2D shooter"
 HOMEPAGE="http://www.teeworlds.com/"
-SRC_URI="http://www.teeworlds.com/files/${P}-src.tar.gz"
+SRC_URI="http://www.teeworlds.com/files/teeworlds-0.6.1-source.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
@@ -29,7 +31,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	~dev-util/bam-0.4.0"
 
-S=${WORKDIR}/${P}-source
+S=${WORKDIR}/${PN}-${REVISION}-source
 
 pkg_setup() {
 	python_set_active_version 2
@@ -37,11 +39,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# 001 & 002 from pull request: https://github.com/oy/teeworlds/pull/493
-	epatch \
-		"${FILESDIR}"/${P}-001-use-system-wavpack.patch \
-		"${FILESDIR}"/${P}-002-fixed-wavpack-sound-loading.patch \
-		"${FILESDIR}"/${P}-003-use-system-pnglite.patch
+	# 01 & 02 from pull request: https://github.com/oy/teeworlds/pull/493
+	EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" \
+		epatch
 }
 
 src_configure() {