[Pkg-mpd-commits] [pkg-mpd] 07/09: Update configure options, not enabling sndio for now

[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 e2295779ca369f199e8d270f85a21d29b4f096e8
Author: Florian Schlichting <fsfs at debian.org>
Date:   Tue Feb 14 20:36:37 2017 +0100

    Update configure options, not enabling sndio for now
---
 debian/control |  2 --
 debian/rules   | 23 ++++++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 3e0ab50..8fe3a50 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 9),
                libasound2-dev  [linux-any],
                libaudiofile-dev (>= 0.3),
                libavahi-client-dev,
-               libavahi-glib-dev,
                libavcodec-dev,
                libavformat-dev,
                libboost-dev,
@@ -24,7 +23,6 @@ Build-Depends: debhelper (>= 9),
                libfaad-dev,
                libflac-dev,
                libfluidsynth-dev,
-               libglib2.0-dev,
                libgme-dev,
                libicu-dev,
                libid3tag0-dev,
diff --git a/debian/rules b/debian/rules
index 4bafe16..0e1edc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,9 +14,9 @@ endif
 
 # no systemd and no alsa on non-linux arches
 ifeq ($(DEB_HOST_ARCH_OS), linux)
-WITH_SYSTEMD=--enable-systemd --with-systemdsystemunitdir=/lib/systemd/system --with-systemduserunitdir=/usr/lib/systemd/user --enable-alsa
+WITH_SYSTEMD=--enable-systemd-daemon --with-systemdsystemunitdir=/lib/systemd/system --with-systemduserunitdir=/usr/lib/systemd/user --enable-alsa
 else
-WITH_SYSTEMD=--disable-systemd --disable-alsa
+WITH_SYSTEMD=--disable-systemd-daemon --disable-alsa
 endif
 
 # no smbclient on hurd-i386 (#815441)
@@ -38,8 +38,6 @@ ENABLE_ARCHIVES=--enable-bzip2 \
 
 # Autodiscovery support
 ENABLE_AUTODISCOVERY=--enable-neighbor-plugins \
-		     --enable-nfs \
-		     ${ENABLE_SMBCLIENT} \
 		     --enable-upnp \
 		     --with-zeroconf=avahi
 
@@ -48,6 +46,11 @@ ENABLE_CLIENTS=--enable-ipv6 \
 	       --enable-tcp \
 	       --enable-un
 
+# Storage support
+ENABLE_STORAGE=--enable-nfs \
+	       ${ENABLE_SMBCLIENT} \
+	       --enable-webdav
+
 # File format support
 # Note: OggTremor / OggVorbis are in WITH_TREMOR
 ENABLE_FILEFORMATS=--enable-aac \
@@ -70,15 +73,17 @@ ENABLE_FILEFORMATS=--enable-aac \
 
 # Other features
 ENABLE_OTHER=--with-boost \
+	     --enable-cue \
 	     --enable-database \
 	     --enable-expat \
-	     --enable-glib \
 	     --enable-icu \
 	     --enable-lsr \
 	     --enable-libmpdclient \
+	     --enable-libwrap \
 	     --enable-inotify \
 	     --enable-soxr \
-	     --enable-sqlite
+	     --enable-sqlite \
+	     --enable-syslog
 
 # Metadata support
 ENABLE_METADATA=--enable-id3
@@ -86,7 +91,9 @@ ENABLE_METADATA=--enable-id3
 # Playback support
 # Note: ALSA is in WITH_SYSTEMD
 ENABLE_PLAYBACKS=--enable-fifo \
+		 --disable-sndio \
 		 --enable-recorder-output \
+		 --disable-haiku \
 		 --enable-httpd-output \
 		 --enable-jack \
 		 --enable-ao \
@@ -99,8 +106,9 @@ ENABLE_PLAYBACKS=--enable-fifo \
 
 # Streaming encoder support
 # Note: FLAC and Opus enabled under file formats
-ENABLE_ENCODERS= --enable-lame-encoder \
+ENABLE_ENCODERS=--enable-lame-encoder \
 		--enable-vorbis-encoder \
+		--disable-twolame-encoder \
 		--enable-wave-encoder
 
 # Streaming support
@@ -124,6 +132,7 @@ override_dh_auto_configure:
 		$(ENABLE_ARCHIVES) \
 		$(ENABLE_AUTODISCOVERY) \
 		$(ENABLE_CLIENTS) \
+		$(ENABLE_STORAGE) \
 		$(ENABLE_FILEFORMATS) \
 		$(ENABLE_OTHER) \
 		$(ENABLE_METADATA) \

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