diff options
| author | Robby Workman <rworkman@slackbuilds.org> | 2010-05-19 21:56:58 -0500 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-21 01:34:45 -0500 |
| commit | c316bd5c2e509b068c28794f45e04c7422aefbe4 (patch) | |
| tree | 67d28f05c210c9700ce6e4bed99fef487f17d7db | |
| parent | e8a426ab1de624c54ab55ec513171ba569c2c7ef (diff) | |
multimedia/songbird: Miscellaneous cleanups.
| -rw-r--r-- | multimedia/Songbird/README | 5 | ||||
| -rw-r--r-- | multimedia/Songbird/Songbird.SlackBuild | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/multimedia/Songbird/README b/multimedia/Songbird/README index 5b7780eb7b3e7..a69e4fa5cd56f 100644 --- a/multimedia/Songbird/README +++ b/multimedia/Songbird/README @@ -19,7 +19,4 @@ upgrading, or refuses to scan for media, backup and delete both Songbird is patched to not require GConf. If you want to use GConf, supply GCONF=yes on the commandline. (eg GCONF=yes ./Songbird.SlackBuild) -Songbird requires gst-plugins-good, gst-plugins-bad, and gst-plugins-ugly, -to work and play files. The build scripts for all of these are available -at SlackBuilds.org. - +Songbird requires gst-plugins-bad and gst-plugins-ugly to work and play files. diff --git a/multimedia/Songbird/Songbird.SlackBuild b/multimedia/Songbird/Songbird.SlackBuild index d821a45af5f2f..ba51fa4dcf0a9 100644 --- a/multimedia/Songbird/Songbird.SlackBuild +++ b/multimedia/Songbird/Songbird.SlackBuild @@ -30,6 +30,16 @@ ARCH=${ARCH:-i686} # Precompiled binary. Leave this as it is or "x86_64" 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 @@ -48,6 +58,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SRC_ARCH="x86_64" LIBDIRSUFFIX="64" +else + printf "\n$ARCH is unsupported...\n\n" + exit 1 fi set -e # Exit on most errors |