[Pkg-sdl-commits] [libsdl2-mixer] 02/07: Remove bug-715461-soundfont_paths.patch, applied upstream

[Fabian Greffrath]

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

fabian pushed a commit to branch master
in repository libsdl2-mixer.

commit 7095805fd2736ad96e1412ced8177bf25504dbf8
Author: Fabian Greffrath <fabian at debian.org>
Date:   Tue Nov 7 22:35:27 2017 +0100

    Remove bug-715461-soundfont_paths.patch, applied upstream
---
 debian/patches/bug-715461-soundfont_paths.patch | 49 -------------------------
 debian/patches/series                           |  2 -
 2 files changed, 51 deletions(-)

diff --git a/debian/patches/bug-715461-soundfont_paths.patch b/debian/patches/bug-715461-soundfont_paths.patch
deleted file mode 100644
index aa41ff6..0000000
--- a/debian/patches/bug-715461-soundfont_paths.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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: 2014-10-24
-Bug-Debian: http://bugs.debian.org/715461
---- a/mixer.c
-+++ b/mixer.c
-@@ -149,6 +149,11 @@
- {
-     int result = 0;
- 
-+#ifdef MIX_INIT_SOUNDFONT_PATHS
-+    if (!soundfont_paths)
-+        soundfont_paths = SDL_strdup(MIX_INIT_SOUNDFONT_PATHS);
-+#endif
-+
-     if (flags & MIX_INIT_FLUIDSYNTH) {
- #ifdef USE_FLUIDSYNTH_MIDI
-         if ((initialized & MIX_INIT_FLUIDSYNTH) || Mix_InitFluidSynth() == 0) {
---- a/music.c
-+++ b/music.c
-@@ -1579,6 +1579,7 @@
- {
-     char *context, *path, *paths;
-     const char* cpaths = Mix_GetSoundFonts();
-+    int soundfonts_found = 0;
- 
-     if (!cpaths) {
-         Mix_SetError("No SoundFonts have been requested");
-@@ -1598,12 +1599,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 {
-+            soundfonts_found++;
-         }
-     }
- 
-     SDL_free(paths);
--    return 1;
-+    if (soundfonts_found > 0)
-+        return 1;
-+    else
-+        return 0;
- }
- #endif
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 96dbe08..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-bug-715461-soundfont_paths.patch
-

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