3 files changed, 21 insertions, 11 deletions
diff --git a/audio/audacious-aac/audacious-aac.SlackBuild b/audio/audacious-aac/audacious-aac.SlackBuild
index fa61144a3d..00b875035d 100644
--- a/audio/audacious-aac/audacious-aac.SlackBuild
+++ b/audio/audacious-aac/audacious-aac.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for audacious-aac
 
@@ -22,28 +22,38 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=audacious-aac
-VERSION=${VERSION:-3.7.2}
+VERSION=${VERSION:-4.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 SRCNAM=audacious-plugins
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 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=""
   ARCHOPTS="--disable-sse2"
 elif [ "$ARCH" = "i686" ]; then
@@ -104,4 +114,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/audio/audacious-aac/audacious-aac.info b/audio/audacious-aac/audacious-aac.info
index 6b6130fe82..146c3480f2 100644
--- a/audio/audacious-aac/audacious-aac.info
+++ b/audio/audacious-aac/audacious-aac.info
@@ -1,8 +1,8 @@
 PRGNAM="audacious-aac"
-VERSION="3.7.2"
+VERSION="4.1"
 HOMEPAGE="https://audacious-media-player.org/"
-DOWNLOAD="https://distfiles.audacious-media-player.org/audacious-plugins-3.7.2.tar.bz2"
-MD5SUM="6ae2f17885897e717b8bbafc32858e2f"
+DOWNLOAD="https://distfiles.audacious-media-player.org/audacious-plugins-4.1.tar.bz2"
+MD5SUM="740d83757b49b82bc75e256c96b09bfd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="faad2"
diff --git a/audio/audacious-aac/patches/enable_only_aac_plugin.diff b/audio/audacious-aac/patches/enable_only_aac_plugin.diff
index eb0d46801c..94692f2f26 100644
--- a/audio/audacious-aac/patches/enable_only_aac_plugin.diff
+++ b/audio/audacious-aac/patches/enable_only_aac_plugin.diff
@@ -2,7 +2,7 @@
 +++ audacious-plugins-3.6.1/Makefile	2015-04-23 19:59:48.072721987 +0200
 @@ -1,4 +1,4 @@
 -SUBDIRS = src po
-+SUBDIRS = src/aac-raw
++SUBDIRS = src/aac
  
  DISTCLEAN = buildsys.mk config.h config.log config.status extra.mk