r7813 - in packages/trunk/prboom/debian: . patches

[Jon Dowland]

Author: jmtd-guest
Date: 2008-07-21 17:08:02 +0000 (Mon, 21 Jul 2008)
New Revision: 7813

Added:
   packages/trunk/prboom/debian/patches/default_music_off.patch
Modified:
   packages/trunk/prboom/debian/changelog
Log:
default music off

Modified: packages/trunk/prboom/debian/changelog
===================================================================
--- packages/trunk/prboom/debian/changelog	2008-07-21 16:23:37 UTC (rev 7812)
+++ packages/trunk/prboom/debian/changelog	2008-07-21 17:08:02 UTC (rev 7813)
@@ -4,8 +4,10 @@
   * remove .desktop file: these are provided by the data
     packages (freedoom and those generated by
     game-data-packager)
+  * turn music off by default. This mitigates the effect of #472087,
+    since we haven't fixed it yet.
 
- -- Jon Dowland <jon at alcopop.org>  Mon, 21 Jul 2008 09:56:38 +0100
+ -- Jon Dowland <jon at alcopop.org>  Mon, 21 Jul 2008 18:07:43 +0100
 
 prboom (2:2.4.7+dfsg-3) unstable; urgency=low
 

Added: packages/trunk/prboom/debian/patches/default_music_off.patch
===================================================================
--- packages/trunk/prboom/debian/patches/default_music_off.patch	                        (rev 0)
+++ packages/trunk/prboom/debian/patches/default_music_off.patch	2008-07-21 17:08:02 UTC (rev 7813)
@@ -0,0 +1,17 @@
+This disables music by default. There's a long-standing
+bug with hardware music playback that hasn't yet been
+fixed: see <http://bugs.debian.org/472087>.
+
+                            -- Jon Dowland <jon at alcopop.org>
+
+--- src/m_misc.c~	2006-11-19 17:44:42.000000000 +0000
++++ src/m_misc.c	2008-07-21 17:56:54.000000000 +0100
+@@ -290,7 +290,7 @@
+   {"Sound settings",{NULL},{0},UL,UL,def_none,ss_none},
+   {"sound_card",{&snd_card},{-1},-1,7,       // jff 1/18/98 allow Allegro drivers
+    def_int,ss_none}, // select sounds driver (DOS), -1 is autodetect, 0 is none; in Linux, non-zero enables sound
+-  {"music_card",{&mus_card},{-1},-1,9,       //  to be set,  -1 = autodetect
++  {"music_card",{&mus_card},{0},-1,9,       //  to be set,  -1 = autodetect
+    def_int,ss_none}, // select music driver (DOS), -1 is autodetect, 0 is none"; in Linux, non-zero enables music
+   {"pitched_sounds",{&pitched_sounds},{0},0,1, // killough 2/21/98
+    def_bool,ss_none}, // enables variable pitch in sound effects (from id's original code)