[Pkg-sdl-commits] [libsdl2-mixer] 01/02: Issue extra -I/usr/include/libmodplug during compilation to avoid a FTBFS due to recent changes in libmodplug (Closes: #725564) Clean-up of debian/rules

[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 894383b97ebd3be64dbdb10132a509983985b073
Author: Manuel A. Fernandez Montecelo <mafm at debian.org>
Date:   Sat Oct 19 15:58:50 2013 +0100

    Issue extra -I/usr/include/libmodplug during compilation to avoid a FTBFS due to recent changes in libmodplug (Closes: #725564)
    Clean-up of debian/rules
---
 debian/changelog |    3 +++
 debian/rules     |   55 ++++++++++++++++++++++++++++--------------------------
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 52dde25..3dfb205 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 libsdl2-mixer (2.0.0+dfsg1-2) UNRELEASED; urgency=low
 
+  * Issue extra -I/usr/include/libmodplug during compilation to avoid a
+    FTBFS due to recent changes in libmodplug (Closes: #725564)
   * Build-Depends on pkg-config
+  * Clean-up of debian/rules
 
  -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Fri, 18 Oct 2013 22:04:05 +0100
 
diff --git a/debian/rules b/debian/rules
index fe358d6..f5db182 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,45 +2,48 @@
 
 #export DH_VERBOSE=1
 
-export DEB_CFLAGS_MAINT_APPEND  = -pipe -Wall
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+# fix for #725564
+MODPLUG_INCLUDE_DIR := -I/usr/include/libmodplug
+
+export DEB_CFLAGS_MAINT_APPEND  := -pipe -Wall $(MODPLUG_INCLUDE_DIR)
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-SHLIBVER = 2.0.0
+SHLIBVER := 2.0.0
 
 
+# explicitly enable/disable all supported sound
+#
+# issue "disable-*-shared" flags for 'configure', otherwise SDL_mixer library
+# opens those libraries in a plugin-like way (with SDL_LoadObject), and
+# dpkg-shlibdeps doesn't seem to generate the needed dependencies in the binary
+# library package
+#
 # enable external music player
-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 := --enable-music-cmd
+# flac
+confflags += --enable-music-flac
+confflags += --disable-music-flac-shared
+# MIDI
+confflags += --enable-music-midi-fluidsynth
+confflags += --disable-music-fluidsynth-shared
+confflags += --enable-music-midi-timidity
+confflags += --enable-music-midi-native
+# MOD
 confflags += --enable-music-mod
 confflags += --enable-music-mod-modplug
 confflags += --disable-music-mod-mikmod
+confflags += --disable-music-mod-modplug-shared
+# using libmad instead of libsmpeg for mp3 (it's much more popular)
 confflags += --enable-music-mp3
 confflags += --disable-music-mp3-smpeg
 confflags += --enable-music-mp3-mad-gpl
+# ogg
 confflags += --enable-music-ogg
-confflags += --enable-music-wave
-
-# MIDI: Explicitly state what we use
-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
-#
-# mafm 20111204: issue "disable-*-shared" flags for 'configure' again, otherwise
-# SDL_mixer library opens those libraries in a plugin-like way (with
-# 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-modplug-shared
-#confflags += --disable-music-mp3-shared
 confflags += --disable-music-ogg-shared
+# wav
+confflags += --enable-music-wave
 
 
 %:
@@ -59,7 +62,7 @@ override_dh_installchangelogs:
 	dh_installchangelogs -- CHANGES.txt
 
 override_dh_link:
-	# fix lintian warning dev-pkg-without-shlib-symlink
+        # fix lintian warning dev-pkg-without-shlib-symlink
 	dh_link -plibsdl2-mixer-dev usr/lib/$(DEB_HOST_MULTIARCH)/libSDL2_mixer-2.0.so.0.0.0 usr/lib/$(DEB_HOST_MULTIARCH)/libSDL2_mixer-2.0.so
 	dh_link --remaining-packages
 

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