r10999 - in packages/trunk/teeworlds/debian: . patches

[Felix Geyer]

Author: debfx-guest
Date: 2010-05-31 20:39:28 +0000 (Mon, 31 May 2010)
New Revision: 10999

Added:
   packages/trunk/teeworlds/debian/teeworlds-data.install
Modified:
   packages/trunk/teeworlds/debian/changelog
   packages/trunk/teeworlds/debian/patches/new-wavpack.patch
   packages/trunk/teeworlds/debian/rules
Log:
Fix loading of sound files.


Modified: packages/trunk/teeworlds/debian/changelog
===================================================================
--- packages/trunk/teeworlds/debian/changelog	2010-05-31 15:50:55 UTC (rev 10998)
+++ packages/trunk/teeworlds/debian/changelog	2010-05-31 20:39:28 UTC (rev 10999)
@@ -2,8 +2,9 @@
 
   * New upstream release. (Closes: #559938, LP: #559922)
   * Add myself as uploader.
+  * Fix loading of sound files. (Closes: #551906)
 
- -- Felix Geyer <debfx-pkg at fobos.de>  Mon, 31 May 2010 17:50:05 +0200
+ -- Felix Geyer <debfx-pkg at fobos.de>  Mon, 31 May 2010 21:48:56 +0200
 
 teeworlds (0.5.1-4) unstable; urgency=low
 

Modified: packages/trunk/teeworlds/debian/patches/new-wavpack.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/new-wavpack.patch	2010-05-31 15:50:55 UTC (rev 10998)
+++ packages/trunk/teeworlds/debian/patches/new-wavpack.patch	2010-05-31 20:39:28 UTC (rev 10999)
@@ -2,7 +2,7 @@
 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 @@
  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 @@
  	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);
  	}
  

Modified: packages/trunk/teeworlds/debian/rules
===================================================================
--- packages/trunk/teeworlds/debian/rules	2010-05-31 15:50:55 UTC (rev 10998)
+++ packages/trunk/teeworlds/debian/rules	2010-05-31 20:39:28 UTC (rev 10999)
@@ -58,7 +58,7 @@
 	dh_clean -k -i
 	dh_installdirs -i
 	find data -type f -exec chmod 644 {} \;
-	dh_install -i -pteeworlds-data data /usr/share/games/teeworlds/
+	dh_install -i
 
 install-arch: build
 	dh_testdir

Added: packages/trunk/teeworlds/debian/teeworlds-data.install
===================================================================
--- packages/trunk/teeworlds/debian/teeworlds-data.install	                        (rev 0)
+++ packages/trunk/teeworlds/debian/teeworlds-data.install	2010-05-31 20:39:28 UTC (rev 10999)
@@ -0,0 +1 @@
+data usr/share/games/teeworlds