[Pkg-sdl-commits] [SCM] Debian packaging of SDL_mixer project branch, master, updated. debian/1.2.12-4-6-g7ad1ce9

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 06b5b0ea8a1417ca356e5055ce5855df8dbfcbd6
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Thu Jul 11 12:43:31 2013 +0100

    Fix for bug #715461, depend on MIDI "sf2" fonts by default and try to use them first

diff --git a/debian/changelog b/debian/changelog
index f428710..66ec469 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ sdl-mixer1.2 (1.2.12-6) UNRELEASED; urgency=low
     - Add the "--disable-music-fluidsynth-shared" parameter to ./configure so
       the library is linked to libfluidsynth instead of loaded through dlopen()
       at runtime (Closes: #715447).
+    - Add patch bug-715461-soundfont_paths.patch and depend on "sf2" sound fonts
+      to have good MIDI sounds by default (Closes: #715461).
 
  -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Thu, 11 Jul 2013 12:17:15 +0100
 
diff --git a/debian/control b/debian/control
index d9a2d01..784aecb 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Recommends: freepats
+Recommends: musescore-soundfont-gm | fluid-soundfont-gm | freepats
 Description: Mixer library for Simple DirectMedia Layer 1.2, libraries
  SDL_mixer is a sample multi-channel audio mixer library.  It supports any
  number of simultaneously playing channels of 16 bit stereo audio, plus a single
diff --git a/debian/patches/bug-715461-soundfont_paths.patch b/debian/patches/bug-715461-soundfont_paths.patch
new file mode 100644
index 0000000..71faacc
--- /dev/null
+++ b/debian/patches/bug-715461-soundfont_paths.patch
@@ -0,0 +1,39 @@
+--- a/music.c
++++ b/music.c
+@@ -145,7 +145,7 @@ static int num_decoders = 0;
+ 
+ /* Semicolon-separated SoundFont paths */
+ #ifdef MID_MUSIC
+-char* soundfont_paths = NULL;
++char* soundfont_paths = "/usr/share/sounds/sf2/TimGM6mb.sf2:/usr/share/sounds/sf2/FluidR3_GM.sf2";
+ #endif
+ 
+ int Mix_GetNumMusicDecoders(void)
+@@ -1567,6 +1567,7 @@ int Mix_EachSoundFont(int (*function)(co
+ {
+ 	char *context, *path, *paths;
+ 	const char* cpaths = Mix_GetSoundFonts();
++	int atleastone = 0;
+ 
+ 	if (!cpaths) {
+ 		Mix_SetError("No SoundFonts have been requested");
+@@ -1586,12 +1587,16 @@ int Mix_EachSoundFont(int (*function)(co
+ 	for (path = strtok_r(paths, ":;", &context); path; path = strtok_r(NULL, ":;", &context)) {
+ #endif
+ 		if (!function(path, data)) {
+-			SDL_free(paths);
+-			return 0;
++			continue;
++		} else {
++			atleastone++;
+ 		}
+ 	}
+ 
+ 	SDL_free(paths);
+-	return 1;
++	if (atleastone > 0)
++		return 1;
++	else
++		return 0;
+ }
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index bd59058..774e153 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ bug-694260-freedink_stack_corruption.patch
 04_timidity_cfg_opts.patch
 05_fallback_to_freepats.patch
 bug-688369-double_free_crash.patch
+bug-715461-soundfont_paths.patch

-- 
Debian packaging of SDL_mixer project