1 files changed, 6 insertions, 61 deletions
diff --git a/audio/mpd/mpd.SlackBuild b/audio/mpd/mpd.SlackBuild
index ae32b91de565e..d4eb6b41fab3f 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 \