3 files changed, 19 insertions, 7 deletions
diff --git a/multimedia/avidemux/README b/multimedia/avidemux/README
index 9f4ba8dc81..54d87cd041 100644
--- a/multimedia/avidemux/README
+++ b/multimedia/avidemux/README
@@ -3,8 +3,5 @@ encoding tasks. It supports many file types, including AVI, DVD compatible
 MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated 
 using projects, job queue and powerful scripting capabilities.
 
-Requirements (all available at SlackBuilds.org):
-  lame, faad2, faac, a52dec, libdca, xvidcore, and x264
-
-Optional Dependencies (also available at SlackBuilds.org):
-  aften, amrnb, jack-audio-connection-kit, libsamplerate
+This requires lame, faad2, faac, a52dec, libdca, xvidcore, and x264.
+Optional dependencies are aften, amrnb, and jack-audio-connection-kit.
diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild
index c9856ac30b..b05768d068 100644
--- a/multimedia/avidemux/avidemux.SlackBuild
+++ b/multimedia/avidemux/avidemux.SlackBuild
@@ -27,10 +27,19 @@
 
 PRGNAM=avidemux
 VERSION=${VERSION:-2.5.2}
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# 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/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -45,6 +54,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -136,4 +148,4 @@ cd $PKG
 
 if [ "$1" = "--cleanup" ]; then
 	 rm -rf $PKG $TMP/$PRGNAM-$VERSION
- fi
-\ No newline at end of file
+ fi
diff --git a/multimedia/avidemux/slack-desc b/multimedia/avidemux/slack-desc
index f3b936097d..ce0a0de301 100644
--- a/multimedia/avidemux/slack-desc
+++ b/multimedia/avidemux/slack-desc
@@ -14,3 +14,6 @@ avidemux: including AVI, DVD compatible MPEG files, MP4 and ASF, using
 avidemux: a variety of codecs. Tasks can be automated using projects, 
 avidemux: job queue and powerful scripting capabilities.
 avidemux:
+avidemux:
+avidemux:
+avidemux: