3 files changed, 19 insertions, 39 deletions
diff --git a/source/xap/audacious-plugins/amidi-plug.fix-drct.diff b/source/xap/audacious-plugins/amidi-plug.fix-drct.diff
deleted file mode 100644
index 432b955d..00000000
--- a/source/xap/audacious-plugins/amidi-plug.fix-drct.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur ./src/amidi-plug/i_configure.c ../audacious-plugins-1.5.1/src/amidi-plug/i_configure.c
---- ./src/amidi-plug/i_configure.c	2008-05-24 00:44:19.000000000 +0200
-+++ ./src/amidi-plug/i_configure.c	2008-11-13 15:08:57.000000000 +0100
-@@ -28,6 +28,7 @@
- #include "i_configure-fluidsynth.h"
- #include "i_configure-dummy.h"
- #include "i_utils.h"
-+#include <audacious/plugin.h>
- #include <audacious/auddrct.h>
- 
- 
diff --git a/source/xap/audacious-plugins/audacious-plugins.SlackBuild b/source/xap/audacious-plugins/audacious-plugins.SlackBuild
index 47bc40f9..84417ccb 100755
--- a/source/xap/audacious-plugins/audacious-plugins.SlackBuild
+++ b/source/xap/audacious-plugins/audacious-plugins.SlackBuild
@@ -22,18 +22,24 @@
 
 
 PKGNAM=audacious-plugins
-VERSION=${VERSION:-1.5.1}
-ARCH=${ARCH:-x86_64}
-BUILD=${BUILD:-4}
+VERSION=${VERSION:-2.3}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-${PKGNAM}
-rm -rf $PKG
-mkdir -p $TMP $PKG
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -47,16 +53,19 @@ elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX="64"
   ARCHOPTS=""
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+  ARCHOPTS=""
 fi
 
+rm -rf $PKG
+mkdir -p $TMP $PKG
 cd $TMP
 rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
-zcat $CWD/audacious-plugins.libmtp8.diff.gz | patch -p1 || exit 1
-zcat $CWD/amidi-plug.fix-drct.diff.gz | patch -p1 || exit 1
-
 # Make sure ownerships and permissions are sane:
 chown -R root:root .
 find . \
@@ -75,7 +84,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --enable-chardet \
   --enable-amidiplug \
-  --enable-timidity \
   --disable-altivec \
   --program-prefix= \
   --program-suffix= \
@@ -116,11 +124,10 @@ fi
 # Add a documentation directory:
 mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
 cp -a \
-  AUTHORS COPYING INSTALL Mercurial-Access \
+  AUTHORS COPYING INSTALL Mercurial-Access README* \
   $PKG/usr/doc/${PKGNAM}-$VERSION
 
 mkdir -p $PKG/install
-#zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
diff --git a/source/xap/audacious-plugins/audacious-plugins.libmtp8.diff b/source/xap/audacious-plugins/audacious-plugins.libmtp8.diff
deleted file mode 100644
index 6c224fa5..00000000
--- a/source/xap/audacious-plugins/audacious-plugins.libmtp8.diff
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./src/mtp_up/mtp.c.orig	2008-05-23 17:44:20.000000000 -0500
-+++ ./src/mtp_up/mtp.c	2008-09-14 14:28:44.000000000 -0500
-@@ -193,11 +193,12 @@
-     g_free(from_path);
-     g_free(tmp);
-     parent_id = mtp_device->default_music_folder;
-+    gentrack->parent_id = parent_id;
- 
- #if DEBUG
-     g_print("Uploading track '%s'\n",filename);
- #endif
--    ret = LIBMTP_Send_Track_From_File(mtp_device, filename , gentrack, NULL , NULL, parent_id);
-+    ret = LIBMTP_Send_Track_From_File(mtp_device, filename , gentrack, NULL , NULL);
-     LIBMTP_destroy_track_t(gentrack);
-     if (ret == 0) 
-         g_print("Track upload finished!\n");