[Pkg-sdl-commits] [libsdl2-mixer] 03/04: Update and refresh the patch (whitespace changes)

[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 libsdl2-mixer.

commit e5fb0b485b5b6c7f11d318c1956f4d70aca1f372
Author: Manuel A. Fernandez Montecelo <mafm at debian.org>
Date:   Sat Oct 25 00:40:28 2014 +0100

    Update and refresh the patch (whitespace changes)
---
 debian/patches/bug-715461-soundfont_paths.patch | 58 ++++++++++++-------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/debian/patches/bug-715461-soundfont_paths.patch b/debian/patches/bug-715461-soundfont_paths.patch
index c871aab..aa41ff6 100644
--- a/debian/patches/bug-715461-soundfont_paths.patch
+++ b/debian/patches/bug-715461-soundfont_paths.patch
@@ -1,49 +1,49 @@
 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-10-09
+Last-Update: 2014-10-24
 Bug-Debian: http://bugs.debian.org/715461
 --- a/mixer.c
 +++ b/mixer.c
-@@ -148,6 +148,11 @@
+@@ -149,6 +149,11 @@
  {
- 	int result = 0;
+     int result = 0;
  
 +#ifdef MIX_INIT_SOUNDFONT_PATHS
-+	if (!soundfont_paths)
-+		soundfont_paths = SDL_strdup(MIX_INIT_SOUNDFONT_PATHS);
++    if (!soundfont_paths)
++        soundfont_paths = SDL_strdup(MIX_INIT_SOUNDFONT_PATHS);
 +#endif
 +
- 	if (flags & MIX_INIT_FLUIDSYNTH) {
+     if (flags & MIX_INIT_FLUIDSYNTH) {
  #ifdef USE_FLUIDSYNTH_MIDI
- 		if ((initialized & MIX_INIT_FLUIDSYNTH) || Mix_InitFluidSynth() == 0) {
+         if ((initialized & MIX_INIT_FLUIDSYNTH) || Mix_InitFluidSynth() == 0) {
 --- a/music.c
 +++ b/music.c
-@@ -1567,6 +1567,7 @@
+@@ -1579,6 +1579,7 @@
  {
- 	char *context, *path, *paths;
- 	const char* cpaths = Mix_GetSoundFonts();
-+	int soundfonts_found = 0;
+     char *context, *path, *paths;
+     const char* cpaths = Mix_GetSoundFonts();
++    int soundfonts_found = 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)) {
+     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++;
- 		}
- 	}
+         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;
+     SDL_free(paths);
+-    return 1;
++    if (soundfonts_found > 0)
++        return 1;
++    else
++        return 0;
  }
  #endif

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