From e330bf1789b65874a1f3c79e079c771a557e4716 Mon Sep 17 00:00:00 2001
From: DhabyX <slack.dhabyx@gmail.com>
Date: Sun, 14 Aug 2016 21:52:06 +0100
Subject: audio/mpd: Updated for version 0.19.18.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 audio/mpd/README         | 25 +++++++++---------
 audio/mpd/mpd.SlackBuild | 67 +++++-------------------------------------------
 audio/mpd/mpd.info       |  6 ++---
 3 files changed, 22 insertions(+), 76 deletions(-)

diff --git a/audio/mpd/README b/audio/mpd/README
index 885d64560a..4ff9ef98d7 100644
--- a/audio/mpd/README
+++ b/audio/mpd/README
@@ -5,19 +5,20 @@ provides control for music playback over a local network. It also makes
 a great desktop music player, especially if you are a console junkie,
 like frontend options, or restart X often.
 
-Some optional dependencies, detected automatically: libshout, libmms,
-libmpdclient, musepack-tools, lame, faac, faad2, fluidsynth,
-twolame, avahi and jack.
+Some optional and important dependencies, detected automatically:
+* ffmpeg: is recommended for support a wide audio files variety
+* libshout: this enables the shoutcast streaming output
+* libmms: used for play mms:// and mmsh:// type network streams
+* id3lib: add support for edit ID3 tags
+* avahi: add support for discover services on network
+* yajl: add support for open soundcloud.com streams
 
-You can enable this optional features:
-FFMPEG=yes|no (default: no), requires ffmpeg
-ISO9660=yes|no (default: no), enable iso9660 archive support
-SOUNDCLOUD=yes|no (default: no), enable support for soundcloud.com
-RECORDEROUTPUT=yes|no (default:no), enables the recorder file output plugin
-ZZIPLIB=yes|no (default: no), requires zziplib
-ID3=yes|no (default: no), requires id3lib
-FLAC=yes|no (default: no)
-SQLITE=yes|no (default: no)
+Other optional dependencies:
+libmpdclient, musepack-tools, lame, faad2, fluidsynth, libsidplay2,
+twolame, libnfs and jack.
+
+You can enable this optional feature:
+ZZIPLIB=yes|no (default: no), enables open zip files, requires zziplib
 
 NOTE:  Be sure to edit the config file (/etc/mpd.conf  or ~/mpd.conf)
 before running the daemon.
diff --git a/audio/mpd/mpd.SlackBuild b/audio/mpd/mpd.SlackBuild
index ae32b91de5..d4eb6b41fa 100644
--- a/audio/mpd/mpd.SlackBuild
+++ b/audio/mpd/mpd.SlackBuild
@@ -24,13 +24,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mpd
-VERSION=${VERSION:-0.19.17}
+VERSION=${VERSION:-0.19.18}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -57,57 +57,8 @@ fi
 
 set -e
 
-# flac support
-if [ "${FFMPEG:-no}" != "no" ]; then
-    ffmpeg="enable"
-else
-    ffmpeg="disable"
-fi
-
-# flac support
-if [ "${FLAC:-no}" != "no" ]; then
-    flac="enable"
-else
-    flac="disable"
-fi
-
-# id3 support
-if [ "${ID3:-no}" != "no" ]; then
-    id3="enable"
-else
-    id3="disable"
-fi
-
-# iso9660 support
-if [ "${ISO9660:-no}" != "no" ]; then
-    iso9660="enable"
-else
-    iso9660="disable"
-fi
-
-# recorder file output support
-if [ "${RECORDEROUTPUT:-no}" != "no" ]; then
-    recorder="enable"
-else
-    recorder="disable"
-fi
-
-# Soundcloud.com support
-if [ "${SOUNDCLOUD:-no}" != "no" ]; then
-    soundcloud="enable"
-else
-    soundcloud="disable"
-fi
-
-# sqlite support
-if [ "${SQLITE:-no}" != "no" ]; then
-    sqlite="enable"
-else
-    sqlite="disable"
-fi
-
 # zziplib support
-if [ "${ZZIPLIB:-no}" != "no" ]; then
+if [ "${ZZIPLIB:-yes}" != "no" ]; then
     zziplib="enable"
 else
     zziplib="disable"
@@ -138,13 +89,7 @@ LDFLAGS="-L/usr/lib${LIBDIRSUFFIX} -lnsl" \
   --enable-documentation \
   --enable-database \
   --enable-pulse \
-  --${ffmpeg}-ffmpeg \
-  --${flac}-flac \
-  --${id3}-id3 \
-  --${iso9660}-iso9660 \
-  --${recorder}-recorder-output \
-  --${soundcloud}-soundcloud \
-  --${sqlite}-sqlite \
+  --enable-iso9660 \
   --${zziplib}-zzip \
   --enable-cdio-paranoia \
   --disable-dependency-tracking \
diff --git a/audio/mpd/mpd.info b/audio/mpd/mpd.info
index aa915669a7..5a924093ed 100644
--- a/audio/mpd/mpd.info
+++ b/audio/mpd/mpd.info
@@ -1,8 +1,8 @@
 PRGNAM="mpd"
-VERSION="0.19.17"
+VERSION="0.19.18"
 HOMEPAGE="http://www.musicpd.org/"
-DOWNLOAD="http://www.musicpd.org/download/mpd/0.19/mpd-0.19.17.tar.xz"
-MD5SUM="47e13f3f160bf94e7a897c5a48990f3d"
+DOWNLOAD="http://www.musicpd.org/download/mpd/0.19/mpd-0.19.18.tar.xz"
+MD5SUM="8fea789a76611feaf8aa7076b32d8c3b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3