From d16c7637b8d35e466e1d57793bacea6cff536421 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 31 Oct 2018 11:50:50 -0700 Subject: [PATCH] Updated Debian package dependencies and configuration --- debian/control | 7 +++++-- debian/rules | 13 +++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index f2dc881b..11b76718 100644 --- a/debian/control +++ b/debian/control @@ -10,9 +10,12 @@ Build-Depends: debhelper (>= 8.9.0~), dpkg-dev (>= 1.16.1~), libflac-dev (>= 1.2.1), libfluidsynth-dev, - libmikmod2-dev (>= 3.1.11), + libmikmod-dev (>= 3.1.11), + libmodplug-dev, + libmpg123-dev (>= 1.20.1), libogg-dev (>= 1.2.0), - libsdl2-dev (>= 2.0.0), + libopusfile-dev, + libsdl2-dev (>= 2.0.7), libtool, libvorbis-dev (>= 1.2.0) Homepage: http://www.libsdl.org/projects/SDL_mixer/ diff --git a/debian/rules b/debian/rules index 9c1ad4db..caeb4775 100755 --- a/debian/rules +++ b/debian/rules @@ -12,12 +12,15 @@ confflags = --enable-music-cmd # explicitly enable/disable all supported sound # For mp3 support, libmad disabled by default because it is GPL and not allowed to link with commercial closed-source programs # For mod support, modplug is the default because it is in the public domain and used across all platforms. -confflags += --enable-music-mp3 -confflags += --disable-music-mp3-mad-gpl +confflags += --enable-music-flac confflags += --enable-music-mod confflags += --enable-music-mod-modplug confflags += --disable-music-mod-mikmod +confflags += --enable-music-mp3 +confflags += --enable-music-mp3-mpg123 +confflags += --disable-music-mp3-mad-gpl confflags += --enable-music-ogg +confflags += --enable-music-opus confflags += --enable-music-wave # MIDI: explicitly state that we use (an in-source copy of) timidity @@ -33,10 +36,12 @@ confflags += --enable-music-midi-timidity # 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-ogg-shared +confflags += --disable-music-midi-fluidsynth-shared confflags += --disable-music-mod-mikmod-shared confflags += --disable-music-mod-modplug-shared -confflags += --disable-music-fluidsynth-shared +confflags += --disable-music-mp3-mpg123-shared +confflags += --disable-music-ogg-shared +confflags += --disable-music-opus-shared %: dh $@ --with autoreconf --parallel