[Pkg-sdl-commits] [libsdl2-mixer] 01/02: add support for fluidr3mono-gm-soundfont

[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 695a61b8e1d64bd7ffb34b637dee45cbc781865d
Author: Fabian Greffrath <fabian at debian.org>
Date:   Sat Oct 28 13:16:26 2017 +0200

    add support for fluidr3mono-gm-soundfont
    
    * add fluidr3mono-gm-soundfont to the list of alternative recommends
    * add Breaks: libfluidsynth1 (<< 1.1.7~) to make sure we have a
      version of that library available that supports the SF3 soundfont
      format
    * add the soundfont file to the MIX_INIT_SOUNDFONT_PATHS macro
---
 debian/control | 3 ++-
 debian/rules   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index dd728b8..38d6a21 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,8 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Recommends: timgm6mb-soundfont | fluid-soundfont-gm | freepats
+Recommends: fluidr3mono-gm-soundfont | timgm6mb-soundfont | fluid-soundfont-gm | freepats
+Breaks: libfluidsynth1 (<< 1.1.7~)
 Description: Mixer library for Simple DirectMedia Layer 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/rules b/debian/rules
index 592bc61..64e15b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ MODPLUG_INCLUDE_DIR := -I/usr/include/libmodplug
 
 export DEB_CFLAGS_MAINT_APPEND  := -pipe -Wall $(MODPLUG_INCLUDE_DIR)
 # bug #715461, provide default soundfont paths
-export DEB_CPPFLAGS_MAINT_APPEND := -DMIX_INIT_SOUNDFONT_PATHS=\"/usr/share/sounds/sf2/TimGM6mb.sf2:/usr/share/sounds/sf2/FluidR3_GM.sf2\"
+export DEB_CPPFLAGS_MAINT_APPEND := -DMIX_INIT_SOUNDFONT_PATHS=\"/usr/share/sounds/sf3/FluidR3Mono_GM.sf3:/usr/share/sounds/sf2/TimGM6mb.sf2:/usr/share/sounds/sf2/FluidR3_GM.sf2\"
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

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