[Pkg-mpd-commits] [pkg-mpd] 05/10: Enable new features / plugins: MP4v2, soxr, nfs/smbclient/upnp, ...

[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 ea32e6db4ab0c105088cb4355050b121c480962b
Author: Florian Schlichting <fsfs at debian.org>
Date:   Sun Oct 12 22:23:29 2014 +0200

    Enable new features / plugins: MP4v2, soxr, nfs/smbclient/upnp, ...
---
 debian/control | 10 ++++++++++
 debian/rules   | 24 ++++++++++++++++++------
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 2bbfd5d..e0e8870 100644
--- a/debian/control
+++ b/debian/control
@@ -15,14 +15,18 @@ Build-Depends: debhelper (>= 9),
                libavahi-glib-dev,
                libavcodec-dev,
                libavformat-dev,
+               libboost-dev,
                libbz2-dev,
                libcdio-paranoia-dev,
                libcppunit-dev,
                libcurl4-gnutls-dev | libcurl-dev,
+               libexpat1-dev,
                libfaad-dev,
                libflac-dev,
                libfluidsynth-dev,
+               libglib2.0-dev,
                libgme-dev,
+               libicu-dev,
                libid3tag0-dev,
                libiso9660-dev,
                libjack-jackd2-dev,
@@ -31,9 +35,11 @@ Build-Depends: debhelper (>= 9),
                libmms-dev,
                libmodplug-dev,
                libmp3lame-dev,
+               libmp4v2-dev,
                libmpcdec-dev,
                libmpdclient-dev,
                libmpg123-dev,
+               libnfs-dev,
                libogg-dev,
                libopenal-dev,
                libopus-dev,
@@ -41,12 +47,16 @@ Build-Depends: debhelper (>= 9),
                libresid-builder-dev,
                libroar-dev (>= 0.4),
                libsamplerate0-dev,
+               libshine-dev [arm armel armeb],
                libshout3-dev,
                libsidplay2-dev,
                libsidutils-dev,
+               libsmbclient-dev,
                libsndfile1-dev,
+               libsoxr-dev,
                libsqlite3-dev,
                libsystemd-daemon-dev [linux-any],
+               libupnp-dev,
                libvorbis-dev [!arm !armel !armeb],
                libvorbisidec-dev [arm armel armeb],
                libwavpack-dev,
diff --git a/debian/rules b/debian/rules
index 15658ea..39f7c66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,15 @@
 #!/usr/bin/make -f
 include /usr/share/dpkg/architecture.mk
 
-WITH_TREMOR=--without-tremor --enable-vorbis
+WITH_TREMOR=--without-tremor --enable-vorbis --disable-shine-encoder
 ifeq ($(DEB_HOST_ARCH), arm)
-WITH_TREMOR=--with-tremor --disable-vorbis
+WITH_TREMOR=--with-tremor --disable-vorbis --enable-shine-encoder
 endif
 ifeq ($(DEB_HOST_ARCH), armel)
-WITH_TREMOR=--with-tremor --disable-vorbis
+WITH_TREMOR=--with-tremor --disable-vorbis --enable-shine-encoder
 endif
 ifeq ($(DEB_HOST_ARCH), armeb)
-WITH_TREMOR=--with-tremor --disable-vorbis
+WITH_TREMOR=--with-tremor --disable-vorbis --enable-shine-encoder
 endif
 
 # no systemd and no alsa on non-linux arches
@@ -28,10 +28,15 @@ endif
 # Archive support
 ENABLE_ARCHIVES=--enable-bzip2 \
 	        --enable-iso9660 \
+		--enable-zlib \
 		--enable-zzip
 
 # Autodiscovery support
-ENABLE_AUTODISCOVERY=--with-zeroconf=avahi
+ENABLE_AUTODISCOVERY=--enable-neighbor-plugins \
+		     --enable-nfs \
+		     --enable-smbclient \
+		     --enable-upnp \
+		     --with-zeroconf=avahi
 
 # Client support
 ENABLE_CLIENTS=--enable-ipv6 \
@@ -51,6 +56,7 @@ ENABLE_FILEFORMATS=--enable-aac \
 		   --enable-mikmod \
 		   --enable-modplug \
 		   --enable-mad \
+		   --enable-mp4v2 \
 		   --enable-mpg123 \
 		   --enable-mpc \
 		   --enable-opus \
@@ -59,9 +65,15 @@ ENABLE_FILEFORMATS=--enable-aac \
 		   --enable-wildmidi
 
 # Other features
-ENABLE_OTHER=--enable-lsr \
+ENABLE_OTHER=--with-boost \
+	     --enable-database \
+	     --enable-expat \
+	     --enable-glib \
+	     --enable-icu \
+	     --enable-lsr \
 	     --enable-libmpdclient \
 	     --enable-inotify \
+	     --enable-soxr \
 	     --enable-sqlite
 
 # Metadata support

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