[Pkg-sdl-commits] [libsdl2-mixer] 08/10: Change options for supported formats at compilation time, and remove mikmod

[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 d7ce922acc879786ed647d825b4b1f7613202087
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Tue Aug 13 19:04:27 2013 +0100

    Change options for supported formats at compilation time, and remove mikmod
    
    Basically same options, but upstream changed names), disabling mikmod (modplug seems to be the default)
---
 debian/changelog |    2 +-
 debian/control   |   13 ++++++-------
 debian/rules     |   17 ++++++++++-------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index def47d5..67a7b41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ libsdl2-mixer (2.0.0+dfsg1-1) UNRELEASED; urgency=low
     upstream (4) or had been backported (1)
   * Recommend MIDI patch set "freepats"
 
- -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Mon, 12 Aug 2013 21:12:04 +0100
+ -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Tue, 13 Aug 2013 19:04:01 +0100
 
 libsdl2-mixer (2.0.0~rc1-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 35592ea..1e0c4f3 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 9~),
                libfluidsynth-dev (>= 1.1.1),
                libmad0-dev (>= 0.15.1b),
                libmodplug-dev (>= 1:0.8.8),
-               libmikmod2-dev (>= 3.1.11),
                libogg-dev (>= 1.2.0),
                libsdl2-dev (>= 2.0.0),
                libtool,
@@ -29,8 +28,8 @@ Recommends: freepats
 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
- channel of music, mixed by the popular FLAC, MikMod MOD, Timidity MIDI, Ogg
- Vorbis, and SMPEG MP3 libraries.
+ channel of music, mixed by the popular FLAC, modplug MOD, FluidSynth and
+ Timidity MIDI, Ogg Vorbis, and MAD or SMPEG MP3 libraries.
  .
  This package contains the shared library.
 
@@ -44,8 +43,8 @@ Depends: ${misc:Depends},
 Description: Mixer library for Simple DirectMedia Layer 2, debugging
  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
- channel of music, mixed by the popular FLAC, MikMod MOD, Timidity MIDI, Ogg
- Vorbis, and SMPEG MP3 libraries.
+ channel of music, mixed by the popular FLAC, modplug MOD, FluidSynth and
+ Timidity MIDI, Ogg Vorbis, and MAD or SMPEG MP3 libraries.
  .
  This package contains the debugging information for the shared library.
 
@@ -59,7 +58,7 @@ Depends: ${misc:Depends},
 Description: Mixer library for Simple DirectMedia Layer 2, development files
  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
- channel of music, mixed by the popular FLAC, MikMod MOD, Timidity MIDI, Ogg
- Vorbis, and SMPEG MP3 libraries.
+ channel of music, mixed by the popular FLAC, modplug MOD, FluidSynth and
+ Timidity MIDI, Ogg Vorbis, and MAD or SMPEG MP3 libraries.
  .
  This package contains the development files.
diff --git a/debian/rules b/debian/rules
index f9784b0..7dbcd41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,16 +15,19 @@ confflags = --enable-music-cmd
 
 # explicitly enable/disable all supported sound, using libmad instead of
 # libsmpeg for mp3 (it's much more popular, and smpeg is unmaintained)
-confflags += --disable-music-mp3
 confflags += --enable-music-mod
+confflags += --enable-music-mod-modplug
+confflags += --disable-music-mod-mikmod
+confflags += --enable-music-mp3
+confflags += --disable-music-mp3-smpeg
 confflags += --enable-music-mp3-mad-gpl
 confflags += --enable-music-ogg
 confflags += --enable-music-wave
 
 # MIDI: Explicitly state what we use
-confflags += --enable-music-fluidsynth-midi
-confflags += --enable-music-timidity-midi
-confflags += --enable-music-native-midi
+confflags += --enable-music-midi-fluidsynth
+confflags += --enable-music-midi-timidity
+confflags += --enable-music-midi-native
 
 # mafm 20111203: removed the "disable shared" support from previous versions, I
 # couldn't find any reason for it in the changelog
@@ -34,9 +37,9 @@ confflags += --enable-music-native-midi
 # SDL_LoadObject), and dpkg-shlibdeps doesn't seem to generate the needed
 # dependencies in the binary library package
 confflags += --disable-music-flac-shared
-confflags += --disable-music-fluidsynth-shared
-confflags += --disable-music-mod-shared
-confflags += --disable-music-mp3-shared
+confflags += --disable-music-midi-fluidsynth-shared
+confflags += --disable-music-mod-modplug-shared
+#confflags += --disable-music-mp3-shared
 confflags += --disable-music-ogg-shared
 
 

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