summaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
author David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:11:33 -0400
committer David Somero <xgizzmo@slackbuilds.org>2010-06-04 01:11:33 -0400
commit16c2d53a907cb45134027aef6ca6d530d5f78c14 (patch)
tree8436d82ebca43b2367395a10831b6b3a37bf50e1 /multimedia
parent3c1c37a2eb1adfbf3a584952c133cf4202021af5 (diff)
downloadslackbuilds-16c2d53a907cb45134027aef6ca6d530d5f78c14.tar.gz
slackbuilds-16c2d53a907cb45134027aef6ca6d530d5f78c14.tar.xz
multimedia/ffmpeg: Misc automated cleanups.
Signed-off-by: David Somero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/ffmpeg/ffmpeg.SlackBuild14
1 files changed, 13 insertions, 1 deletions
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
index a2b5ea7d7d..8ace294419 100644
--- a/multimedia/ffmpeg/ffmpeg.SlackBuild
+++ b/multimedia/ffmpeg/ffmpeg.SlackBuild
@@ -8,10 +8,19 @@
PRGNAM=ffmpeg
VERSION=${VERSION:-0.5.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) ARCH=i486 ;;
+ arm*) ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$( uname -m ) ;;
+ esac
+fi
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -26,6 +35,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
# Configure ffmpeg features not autodetected by default