From ca177716889eccd34f14e1b1de2cf5cdbb5cc8ca Mon Sep 17 00:00:00 2001
From: Robby Workman
Date: Wed, 19 May 2010 14:21:47 -0500
Subject: audio/gmpc-plugins: Miscellaneous cleanups.

---
 audio/gmpc-plugins/README                  | 10 +++++-----
 audio/gmpc-plugins/gmpc-plugins.SlackBuild | 20 +++++++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'audio/gmpc-plugins')

diff --git a/audio/gmpc-plugins/README b/audio/gmpc-plugins/README
index 852789415a..829a8a8dff 100644
--- a/audio/gmpc-plugins/README
+++ b/audio/gmpc-plugins/README
@@ -1,10 +1,10 @@
 Additional plugins for GMPC.
 
 Requires gmpc, gob2, json-glib, and optionally several others:
-avahi, awn, lastfm, libnotify, lirc, microhttpd, and webkitgtk.
+avahi, awn, lirc, microhttpd, and webkitgtk.
 Some of these are available at SlackBuilds.org. If you have any
-of these and would like to enable the plugin, the variable are
-as follows: AVAHI AWN LASTFM LIBNOTIFY LIRC MSERVER WIKIPEDIA
+of these and would like to enable the plugin, the variables are
+as follows: AVAHI AWN LIRC MSERVER WIKIPEDIA
 
-For example, if you have avahi and libnotify, you would do this:
-	AVAHI=yes LIBNOTIFY=yes ./gmpc-plugins.SlackBuild
+For example, if you have avahi and lirc, you would do this:
+	AVAHI=yes LIRC=yes ./gmpc-plugins.SlackBuild
diff --git a/audio/gmpc-plugins/gmpc-plugins.SlackBuild b/audio/gmpc-plugins/gmpc-plugins.SlackBuild
index 6262f3501b..6cd537e9c0 100644
--- a/audio/gmpc-plugins/gmpc-plugins.SlackBuild
+++ b/audio/gmpc-plugins/gmpc-plugins.SlackBuild
@@ -24,18 +24,25 @@
 
 PRGNAM=gmpc-plugins
 VERSION=${VERSION:-0.20.0}
-ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 AVAHI=${AVAHI:-no}		# avahi
 AWN=${AWN:-no}			# AWN
-LASTFM=${LASTFM:-no}		# Last.FM
-LIBNOTIFY=${LIBNOTIFY:-no}	# libnotify
 LIRC=${LIRC:-no}		# lirc
 MSERVER=${MSERVER:-no}		# microhttpd
 WIKIPEDIA=${WIKIPEDIA:-no}	# WebKitGTK
 
+# 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
@@ -50,6 +57,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -eu
@@ -89,10 +99,10 @@ CFLAGS="$SLKCFLAGS" \
   --enable-playlistsort \
   --enable-shout \
   --enable-tagedit \
+  --enable-lastfm \
+  --enable-libnotify \
   --enable-avahi=$AVAHI \
   --enable-awn=$AWN \
-  --enable-lastfm=$LASTFM \
-  --enable-libnotify=$LIBNOTIFY \
   --enable-lirc=$LIRC \
   --enable-mserver=$MSERVER \
   --enable-wikipedia=$WIKIPEDIA \
-- 
cgit v1.2.3