switch to Debian patch for wavpack support (bug #351952); always build server

Package-Manager: portage-2.1.9.42/cvs/Linux i686

5 files changed, 33 insertions, 29 deletions

diff --git a/games-action/teeworlds/ChangeLog b/games-action/teeworlds/ChangeLog
index ae1fe6d50c5a..1c840dd92693 100644
--- a/games-action/teeworlds/ChangeLog
+++ b/games-action/teeworlds/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/teeworlds
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/ChangeLog,v 1.2 2010/04/04 13:51:12 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/ChangeLog,v 1.3 2011/04/09 16:39:16 mr_bones_ Exp $
+
+  09 Apr 2011; Michael Sterrett <mr_bones_@gentoo.org>
+  teeworlds-0.5.2.ebuild, files/teeworlds-0.5.2-wavpack.patch, metadata.xml:
+  switch to Debian patch for wavpack support (bug #351952); always build server
 
   04 Apr 2010; Markos Chandras <hwoarang@gentoo.org> teeworlds-0.5.2.ebuild:
   ~amd64 added wrt bug #311593
diff --git a/games-action/teeworlds/Manifest b/games-action/teeworlds/Manifest
index e46ae56c1a6a..f56ab9776057 100644
--- a/games-action/teeworlds/Manifest
+++ b/games-action/teeworlds/Manifest
@@ -1,7 +1,7 @@
 AUX teeworlds-0.5.2-system-libs.patch 1861 RMD160 8d60b4506440fad9907501a340e016e7f68f4385 SHA1 e8113d7f30a7e0866b6e87934f63a2e1bb2dbff7 SHA256 a748535f57b62d056c302c290dd47e29cc7a2e4d5bc345527c5ce70b97ce607b
-AUX teeworlds-0.5.2-wavpack.patch 1181 RMD160 3770042ef2670c1453e5096f64d4acfa7e0b66b1 SHA1 f4f140aff81ee6ac9709a6ff5aa42a2af55f786c SHA256 343e77a8c22315a2c7303dfa29181966bd17316d8ee5e5cad9d08c258a76ff37
+AUX teeworlds-0.5.2-wavpack.patch 1347 RMD160 b1f86935b5781306f7adc8a78736d60de2dce848 SHA1 d8ffad789c27b6627a59201904e980aaa2c8f6d4 SHA256 efa498dafb12fb646fc6678592b47eaab8497ecefb2cdc5a0ace663d49eebb3d
 AUX teeworlds.xpm 2785 RMD160 f45531cd48dc897b02c73fee5870f703877620da SHA1 1a00d39a748ea006f71f4b7c0ed73015e34a18a0 SHA256 0b31cc3e65ca26676324a7b66de29cb91df90221e28f9e4b5adfec0e37729284
 DIST teeworlds-0.5.2-src.tar.gz 6393472 RMD160 12b3384b3059d5ec0ebb437686f613f8d9430e61 SHA1 26d8059b1ad81ca6959b96fd3ff881f9db7550ef SHA256 1811a71bf9a1470c7a69308035744492f3e850aefdd12f1bc223fb85d98cf4c0
-EBUILD teeworlds-0.5.2.ebuild 2458 RMD160 4943ce75055a1f1fa7b43532ff0c621fbf891593 SHA1 2be488bee8a20f8fa64a35d5dde8314bd6a6c339 SHA256 f915a6d4d398ca0e1374652ea2502a600d6f5c5b0fc9de8924f4504f78b4372e
-MISC ChangeLog 843 RMD160 2ae7587e3560a778212c78070e8228cff719ab2e SHA1 4b3fa448f71fd3542f1d7a311e101ed8024f2fcd SHA256 58977424b4ed681c7079f14c281375aa714a3271f1e9857e7c575a7b4a2bea54
-MISC metadata.xml 328 RMD160 407d842ca99912275e7cc3aed2f6a2a307b8d0c3 SHA1 4a5afab24063a9ee2e86e7c97c5b546009a95daa SHA256 c1e6f853966bca5440f8f5e887bcf4129b2f271829248cb74cbb52bba44abb7b
+EBUILD teeworlds-0.5.2.ebuild 2357 RMD160 ed75e11c7c2ec6d1e005e9f3c6a6bb8222ddf008 SHA1 5f2d9e4f40f965ec105374fe9778ed2f512c6961 SHA256 66f2f226af79aa280bcf5ac0356991d25687e7c41ceac7807397994a6e4e6152
+MISC ChangeLog 1057 RMD160 1901c6c9d233c6f970a177ca2f7d4febc2fd61c8 SHA1 c333f335d6ebd81a3812a294896fd89b22a90ae7 SHA256 feabcb0039a6be9c306fd724fde0ee59e9115f71ed97c418bf975a43396cd7ee
+MISC metadata.xml 255 RMD160 c534666350ba923d5ec1f6833d1eec58849c0092 SHA1 f0ea347f50152d21d690708e2797e5854991ebed SHA256 3e4c75c20223029ef8a69349f4f027dbb1ff312d8a157b0a25ccb08153cd64ca
diff --git a/games-action/teeworlds/files/teeworlds-0.5.2-wavpack.patch b/games-action/teeworlds/files/teeworlds-0.5.2-wavpack.patch
index 4cb1e5b7174f..76a2b6a504cd 100644
--- a/games-action/teeworlds/files/teeworlds-0.5.2-wavpack.patch
+++ b/games-action/teeworlds/files/teeworlds-0.5.2-wavpack.patch
@@ -2,7 +2,7 @@ diff --git a/src/engine/client/ec_snd.c b/src/engine/client/ec_snd.c
 index 034dfb2..67e819c 100644
 --- a/src/engine/client/ec_snd.c
 +++ b/src/engine/client/ec_snd.c
-@@ -359,13 +359,6 @@ static void rate_convert(int sid)
+@@ -359,19 +359,13 @@
  }
  
  
@@ -16,7 +16,14 @@ index 034dfb2..67e819c 100644
  int snd_load_wv(const char *filename)
  {
  	SAMPLE *snd;
-@@ -381,19 +374,12 @@ int snd_load_wv(const char *filename)
+ 	int sid = -1;
+ 	char error[100];
+ 	WavpackContext *context;
++	char completefilename[512];
+ 	
+ 	/* don't waste memory on sound when we are stress testing */
+ 	if(config.dbg_stress)
+@@ -381,19 +375,13 @@
  	if(!sound_enabled)
  		return 1;
  
@@ -33,11 +40,12 @@ index 034dfb2..67e819c 100644
  	snd = &samples[sid];
  
 -	context = WavpackOpenFileInput(read_data, error);
-+	context = WavpackOpenFileInput(filename, error, OPEN_2CH_MAX, 0);
++	engine_getpath(completefilename, sizeof(completefilename), filename, IOFLAG_READ);
++	context = WavpackOpenFileInput(completefilename, error, OPEN_2CH_MAX, 0);
  	if (context)
  	{
  		int samples = WavpackGetNumSamples(context);
-@@ -448,9 +434,6 @@ int snd_load_wv(const char *filename)
+@@ -448,9 +436,6 @@
  		dbg_msg("sound/wv", "failed to open %s: %s", filename, error);
  	}
  
diff --git a/games-action/teeworlds/metadata.xml b/games-action/teeworlds/metadata.xml
index 52f6d5ef544d..2a208a3088fe 100644
--- a/games-action/teeworlds/metadata.xml
+++ b/games-action/teeworlds/metadata.xml
@@ -6,8 +6,5 @@
 		<email>volkmar@gentoo.org</email>
 		<name>Mounir Lamouri</name>
 	</maintainer>
-	<use>
-		<flag name="server">Enable compilation of server</flag>
-	</use>
 </pkgmetadata>
 
diff --git a/games-action/teeworlds/teeworlds-0.5.2.ebuild b/games-action/teeworlds/teeworlds-0.5.2.ebuild
index fafb63c3c896..c074b0118928 100644
--- a/games-action/teeworlds/teeworlds-0.5.2.ebuild
+++ b/games-action/teeworlds/teeworlds-0.5.2.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/teeworlds-0.5.2.ebuild,v 1.2 2010/04/04 13:51:12 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/teeworlds/teeworlds-0.5.2.ebuild,v 1.3 2011/04/09 16:39:16 mr_bones_ Exp $
 
 EAPI=2
-
 inherit eutils python games
 
 DESCRIPTION="Online multi-player platform 2D shooter"
@@ -13,7 +12,7 @@ SRC_URI="http://www.teeworlds.com/files/${P}-src.tar.gz"
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug dedicated server"
+IUSE="debug dedicated"
 
 RDEPEND="
 	!dedicated? ( media-libs/pnglite
@@ -59,12 +58,10 @@ src_configure() {
 src_compile() {
 	local myopt
 
-	if use dedicated || use server; then
-		if use debug; then
-			myopt=" server_debug"
-		else
-			myopt=" server_release"
-		fi
+	if use debug; then
+		myopt=" server_debug"
+	else
+		myopt=" server_release"
 	fi
 	if ! use dedicated; then
 		if use debug; then
@@ -78,12 +75,10 @@ src_compile() {
 }
 
 src_install() {
-	if use dedicated || use server; then
-		if use debug; then
-			newgamesbin ${PN}_srv_d ${PN}_srv || die "newgamesbin failed"
-		else
-			dogamesbin ${PN}_srv || die "dogamesbin failed"
-		fi
+	if use debug; then
+		newgamesbin ${PN}_srv_d ${PN}_srv || die "newgamesbin failed"
+	else
+		dogamesbin ${PN}_srv || die "dogamesbin failed"
 	fi
 	if ! use dedicated; then
 		if use debug; then