From d69b52378f956431d7f0cdd6d66ec12bb1ff16da Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Wed, 19 May 2010 22:14:25 -0500
Subject: libraries/libflashsupport: Miscellaneous cleanups.

  The notes about pulseaudio support were removed from the README
    since we don't have pulseaudio in our repo any more.
---
 libraries/libflashsupport/README                     |  6 ------
 libraries/libflashsupport/libflashsupport.SlackBuild | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'libraries/libflashsupport')

diff --git a/libraries/libflashsupport/README b/libraries/libflashsupport/README
index 96c507c90b..0d08c5a011 100644
--- a/libraries/libflashsupport/README
+++ b/libraries/libflashsupport/README
@@ -2,9 +2,3 @@ libflashsupport is an additional library for Adobe Flash Player adding
 support for TLS, OSS and optionally PulseAudio.
 This library is known to solve problems about missing audio from Flash
 content, like videos embedded into web pages.
-
-To build with PulseAudio support, start the script with PULSE=yes, as
-in:
-  PULSE=yes ./libflashsupport.SlackBuild
-This requires that you have already installed pulseaudio, available
-from SlackBuilds.org.
diff --git a/libraries/libflashsupport/libflashsupport.SlackBuild b/libraries/libflashsupport/libflashsupport.SlackBuild
index 456fd1d246..fa5831da21 100644
--- a/libraries/libflashsupport/libflashsupport.SlackBuild
+++ b/libraries/libflashsupport/libflashsupport.SlackBuild
@@ -26,10 +26,19 @@
 
 PRGNAM=libflashsupport
 VERSION=${VERSION:-20080328}
-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
@@ -47,6 +56,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
-- 
cgit v1.2.3