[Pkg-mpd-commits] [pkg-mpd] 06/10: configure a defined Debian feature set

[Florian Schlichting]

This is an automated email from the git hooks/post-receive script.

fsfs pushed a commit to branch master
in repository pkg-mpd.

commit cd2294209a9af413b1c7dcaa6e657596590c67a7
Author: Florian Schlichting <fsfs at debian.org>
Date:   Sun Dec 29 01:25:03 2013 +0100

    configure a defined Debian feature set
    
    This effectively reverts "remove configure options enabled automatically
    or by default" (c2c5ecb) and more; thanks to cirrus for pointing out
    that a stable, defined feature set is more important for Debian than a
    minimal debian/rules
---
 debian/rules | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 91 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 8c913e5..28c6b4d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,23 @@
 #!/usr/bin/make -f
 include /usr/share/dpkg/architecture.mk
 
-WITH_TREMOR=
+WITH_TREMOR=--without-tremor --enable-vorbis
 ifeq ($(DEB_HOST_ARCH), arm)
-WITH_TREMOR=--with-tremor
+WITH_TREMOR=--with-tremor --disable-vorbis
 endif
 ifeq ($(DEB_HOST_ARCH), armel)
-WITH_TREMOR=--with-tremor
+WITH_TREMOR=--with-tremor --disable-vorbis
 endif
 ifeq ($(DEB_HOST_ARCH), armeb)
-WITH_TREMOR=--with-tremor
+WITH_TREMOR=--with-tremor --disable-vorbis
 endif
 
 # no systemd and no alsa on non-linux arches
 ifeq ($(DEB_HOST_ARCH_OS), linux)
-WITH_SYSTEMD=--enable-systemd-daemon --with-systemdsystemunitdir=/lib/systemd/system
+WITH_SYSTEMD=--enable-systemd-daemon --with-systemdsystemunitdir=/lib/systemd/system --enable-alsa
 CP_SYSTEMD_UNIT=mkdir -p debian/mpd/lib/systemd && cp -a debian/tmp/lib/systemd/system debian/mpd/lib/systemd/
 else
-WITH_SYSTEMD=--disable-alsa
+WITH_SYSTEMD=--disable-systemd-daemon --disable-alsa
 CP_SYSTEMD_UNIT=echo "no systemd, not copying systemd .service file"
 endif
 
@@ -27,6 +27,81 @@ ifeq ($(DEB_HOST_ARCH), s390x)
     RUN_TESTS=
 endif
 
+
+###############################################################
+## Define Debian feature set (in configure summary order)
+
+# Archive support
+ENABLE_ARCHIVES=--enable-bzip2 \
+	        --enable-iso9660
+
+# Autodiscovery support
+ENABLE_AUTODISCOVERY=--with-zeroconf=avahi
+
+# Client support
+ENABLE_CLIENTS=--enable-ipv6 \
+	       --enable-tcp \
+	       --enable-un
+
+# File format support
+# Note: OggTremor / OggVorbis are in WITH_TREMOR
+ENABLE_FILEFORMATS=--enable-aac \
+		   --enable-adplug \
+		   --enable-sidplay \
+		   --enable-ffmpeg \
+		   --enable-flac \
+		   --enable-fluidsynth \
+		   --enable-gme \
+		   --enable-sndfile \
+		   --enable-mikmod \
+		   --enable-modplug \
+		   --enable-mad \
+		   --enable-mpg123 \
+		   --enable-mpc \
+		   --enable-opus \
+		   --enable-audiofile \
+		   --enable-wavpack \
+		   --enable-wildmidi
+
+# Other features
+ENABLE_OTHER=--enable-lsr \
+	     --enable-libmpdclient \
+	     --enable-inotify \
+	     --enable-sqlite
+
+# Metadata support
+ENABLE_METADATA=--enable-id3
+
+# Playback support
+# Note: ALSA is in WITH_SYSTEMD
+ENABLE_PLAYBACKS=--enable-fifo \
+		 --enable-recorder-output \
+		 --enable-httpd-output \
+		 --enable-jack \
+		 --enable-ao \
+		 --enable-oss \
+		 --enable-openal \
+		 --enable-pipe-output \
+		 --enable-pulse \
+		 --enable-roar \
+		 --enable-shout
+
+# Streaming encoder support
+# Note: Opus enabled under file formats
+ENABLE_ENCODERS=--enable-flac-encoder \
+		--enable-lame-encoder \
+		--enable-vorbis-encoder \
+		--enable-wave-encoder
+
+# Streaming support
+ENABLE_STREAMING=--enable-cdio-paranoia \
+		 --enable-curl \
+		 --enable-soundcloud \
+		 --enable-mms
+
+###############################################################
+
+
 LDFLAGS += -Wl,--as-needed
 
 %:
@@ -34,11 +109,17 @@ LDFLAGS += -Wl,--as-needed
 
 override_dh_auto_configure:
 	./configure $(WITH_TREMOR) $(WITH_SYSTEMD) $(RUN_TESTS) \
-		--enable-pipe-output \
-		--enable-mikmod \
-		--enable-iso9660 \
 		--prefix=/usr \
-		--sysconfdir=/etc
+		--sysconfdir=/etc \
+		$(ENABLE_ARCHIVES) \
+		$(ENABLE_AUTODISCOVERY) \
+		$(ENABLE_CLIENTS) \
+		$(ENABLE_FILEFORMATS) \
+		$(ENABLE_OTHER) \
+		$(ENABLE_METADATA) \
+		$(ENABLE_PLAYBACKS) \
+		$(ENABLE_ENCODERS) \
+		$(ENABLE_STREAMING)
 
 override_dh_auto_build:
 	dh_auto_build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mpd/pkg-mpd.git