From 7bd4a9827f605dda5a9924be4d5133ab934014b3 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Wed, 19 May 2010 21:37:34 -0500
Subject: [PATCH] audio/ardour: Miscellaneous cleanups.

---
 audio/ardour/README            |  4 ++--
 audio/ardour/ardour.SlackBuild | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/audio/ardour/README b/audio/ardour/README
index f0fed83078..2d42bc934f 100644
--- a/audio/ardour/README
+++ b/audio/ardour/README
@@ -2,8 +2,8 @@ Ardour is an application to fit the needs of musicians under Linux.
 It is designed to be a fully functional professional audio application,
 that uses the professional sound server jack for sound i/o.
 
-Ardour requires liblo, liblrdf, scons, fftw, libsamplerate, libgnomecanvas,
-jack-audio-connection-kit, and aubio.
+Ardour requires liblo, liblrdf, scons, libsamplerate, libgnomecanvas, aubio,
+and jack-audio-connection-kit.
 
 If you want ardour with lv2 support pass LV2=yes to the script. This will
 additionally need slv2.
diff --git a/audio/ardour/ardour.SlackBuild b/audio/ardour/ardour.SlackBuild
index 206ce2f6f0..50aa34bcdb 100644
--- a/audio/ardour/ardour.SlackBuild
+++ b/audio/ardour/ardour.SlackBuild
@@ -24,10 +24,19 @@
 
 PRGNAM=ardour
 VERSION=2.8.1
-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
@@ -64,6 +73,11 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
   TARGET="x86_64"
   vstopt="VST=0"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+  TARGET="$ARCH"
+  vstopt="VST=0"
 fi
 
 set -e