r14229 - in packages/trunk/pathological/debian: . patches

[Barry deFreese]

Author: bdefreese
Date: 2013-06-07 02:30:12 +0000 (Fri, 07 Jun 2013)
New Revision: 14229

Added:
   packages/trunk/pathological/debian/patches/60_use_ogg_music.patch
Modified:
   packages/trunk/pathological/debian/changelog
   packages/trunk/pathological/debian/control
   packages/trunk/pathological/debian/patches/series
Log:
Convert .xm files to .ogg at build time and use in the binary

Modified: packages/trunk/pathological/debian/changelog
===================================================================
--- packages/trunk/pathological/debian/changelog	2013-06-05 23:42:56 UTC (rev 14228)
+++ packages/trunk/pathological/debian/changelog	2013-06-07 02:30:12 UTC (rev 14229)
@@ -1,3 +1,11 @@
+pathological (1.1.3-12) unstable; urgency=low
+
+  * Convert .xm files to .ogg at build time. (Closes: #705415).
+    + Add xmp and vorbis-tools build-deps.
+    + Add patch to load .ogg files instead of .xm.
+
+ -- Barry deFreese <bdefreese at debian.org>  Wed, 05 Jun 2013 18:19:07 -0400
+
 pathological (1.1.3-11) unstable; urgency=low
 
   * Team upload.

Modified: packages/trunk/pathological/debian/control
===================================================================
--- packages/trunk/pathological/debian/control	2013-06-05 23:42:56 UTC (rev 14228)
+++ packages/trunk/pathological/debian/control	2013-06-07 02:30:12 UTC (rev 14229)
@@ -6,7 +6,7 @@
  Alexander Reichle-Schmehl <tolimar at debian.org>,
  Barry deFreese <bdefreese at debian.org>
 Build-Depends:
- debhelper (>= 9)
+ debhelper (>= 9), xmp, vorbis-tools
 Build-Depends-Indep:
  netpbm,
  python,

Added: packages/trunk/pathological/debian/patches/60_use_ogg_music.patch
===================================================================
--- packages/trunk/pathological/debian/patches/60_use_ogg_music.patch	                        (rev 0)
+++ packages/trunk/pathological/debian/patches/60_use_ogg_music.patch	2013-06-07 02:30:12 UTC (rev 14229)
@@ -0,0 +1,31 @@
+Description: Newer versions of pygame.mixer having issues with .xm files.
+ The .xm files included seem to have varying sample rates so we convert 
+ them to .ogg files at build time and patched the source to load them 
+ instead of the .xm files.
+ The .xm files have been removed from the binary packages in favor of the 
+ .ogg files.
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=705415
+Bug-Debian: http://bugs.debian.org/705415
+Author: Barry deFreese <bdefreese at debian.org>
+Index: pathological-1.1.3/pathological.py
+===================================================================
+--- pathological-1.1.3.orig/pathological.py	2013-06-04 11:27:18.000000000 -0400
++++ pathological-1.1.3/pathological.py	2013-06-05 18:38:13.000000000 -0400
+@@ -1614,7 +1614,7 @@
+ 
+ 		popup("Please wait...\n", (150, 50))
+ 
+-		start_music("background.xm", ingame_music_volume)
++		start_music("background.ogg", ingame_music_volume)
+ 
+ 		self.highscores.current_score = -1
+ 
+@@ -1998,7 +1998,7 @@
+ 
+ 		self.draw()
+ 
+-		start_music("intro.xm", intro_music_volume)
++		start_music("intro.ogg", intro_music_volume)
+ 
+ 		while 1:
+ 			# Wait for the next frame

Modified: packages/trunk/pathological/debian/patches/series
===================================================================
--- packages/trunk/pathological/debian/patches/series	2013-06-05 23:42:56 UTC (rev 14228)
+++ packages/trunk/pathological/debian/patches/series	2013-06-07 02:30:12 UTC (rev 14229)
@@ -3,3 +3,4 @@
 30_no_soundcard.patch
 40_pygame_181.patch
 define-music_pending_song.patch
+60_use_ogg_music.patch