[Pkg-sdl-commits] [sdl-mixer1.2] 01/01: Modify bug-715461-soundfont_paths.patch to add a string as dynamic memory, and so bug-718129-rm-bad-free.patch is unnecessary (removed).

[Manuel A. Fernandez Montecelo]

This is an automated email from the git hooks/post-receive script.

mafm pushed a commit to branch master
in repository sdl-mixer1.2.

commit ef1b4991e313ea2ef840af3291e6e8b77f9e60be
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Mon Aug 12 00:09:54 2013 +0100

    Modify bug-715461-soundfont_paths.patch to add a string as dynamic memory, and so bug-718129-rm-bad-free.patch is unnecessary (removed).
---
 debian/changelog                                |    7 ++
 debian/patches/bug-715461-soundfont_paths.patch |   85 ++++++++++++-----------
 debian/patches/bug-718129-rm-bad-free.patch     |   18 -----
 debian/patches/series                           |    1 -
 4 files changed, 53 insertions(+), 58 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d195ed2..8ec9806 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sdl-mixer1.2 (1.2.12-8) unstable; urgency=low
+
+  * Modify bug-715461-soundfont_paths.patch to add a string as dynamic memory,
+    and so bug-718129-rm-bad-free.patch is unnecessary (removed).
+
+ -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Mon, 12 Aug 2013 00:08:29 +0100
+
 sdl-mixer1.2 (1.2.12-7) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/patches/bug-715461-soundfont_paths.patch b/debian/patches/bug-715461-soundfont_paths.patch
index 71faacc..bf2fe63 100644
--- a/debian/patches/bug-715461-soundfont_paths.patch
+++ b/debian/patches/bug-715461-soundfont_paths.patch
@@ -1,39 +1,46 @@
---- 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
+Description: no sf2 sound fonts loaded by default
+ Introduced in 1.2.12-6 (Thu, 11 Jul 2013 12:17:15 +0100)
+Author: Fabian Greffrath <fabian at greffrath.com>
+Last-Update: 2013-08-11
+Bug-Debian: http://bugs.debian.org/715461
+--- a/mixer.c
++++ b/mixer.c
+@@ -148,6 +148,8 @@
+ {
+ 	int result = 0;
+ 
++	soundfont_paths = SDL_strdup("/usr/share/sounds/sf2/TimGM6mb.sf2:/usr/share/sounds/sf2/FluidR3_GM.sf2");
++
+ 	if (flags & MIX_INIT_FLUIDSYNTH) {
+ #ifdef USE_FLUIDSYNTH_MIDI
+ 		if ((initialized & MIX_INIT_FLUIDSYNTH) || Mix_InitFluidSynth() == 0) {
+--- a/music.c
++++ b/music.c
+@@ -1567,6 +1567,7 @@
+ {
+ 	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 @@
+ 	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/bug-718129-rm-bad-free.patch b/debian/patches/bug-718129-rm-bad-free.patch
deleted file mode 100644
index b640c16..0000000
--- a/debian/patches/bug-718129-rm-bad-free.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: dod
-Synopsis: remove bad call to SDL_free()
-Debian-Bug: 718129
-
---- a/mixer.c
-+++ b/mixer.c
-@@ -225,11 +225,6 @@
- 		Mix_QuitOgg();
- 	}
- #endif
--#ifdef MID_MUSIC
--	if (soundfont_paths) {
--		SDL_free(soundfont_paths);
--	}
--#endif
- 	initialized = 0;
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 9fa935e..774e153 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@ bug-694260-freedink_stack_corruption.patch
 05_fallback_to_freepats.patch
 bug-688369-double_free_crash.patch
 bug-715461-soundfont_paths.patch
-bug-718129-rm-bad-free.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/sdl-mixer1.2.git