diff options
author | Robby Workman <rworkman@slackbuilds.org> | 2010-05-19 13:45:42 -0500 |
---|---|---|
committer | Robby Workman <rworkman@slackbuilds.org> | 2010-05-21 01:20:29 -0500 |
commit | 4ac674fecf9e081d154b2b7885b9e01684d78ab3 (patch) | |
tree | 885c263c24d0f9e2b3fe9b32615567fd2afa6f52 | |
parent | d35e099bc209bfae2fabcf309b007c9c7b62589f (diff) |
desktop/xfce4-volumed: Miscellaneous cleanups.
-rw-r--r-- | desktop/xfce4-volumed/README | 2 | ||||
-rw-r--r-- | desktop/xfce4-volumed/xfce4-volumed.SlackBuild | 17 |
2 files changed, 14 insertions, 5 deletions
diff --git a/desktop/xfce4-volumed/README b/desktop/xfce4-volumed/README index e236de3d569a4..a653d5f54bffb 100644 --- a/desktop/xfce4-volumed/README +++ b/desktop/xfce4-volumed/README @@ -4,5 +4,3 @@ This daemon is responsible of making the volume up/down and mute keys of the keyboard work automatically, and uses the XFCE 4 mixer's defined card and track for choosing which track to act on. It also provides volume change and mute toggle notifications if the notification daemon is running. - -This requires libnotify. diff --git a/desktop/xfce4-volumed/xfce4-volumed.SlackBuild b/desktop/xfce4-volumed/xfce4-volumed.SlackBuild index 8b10650a7fedd..18366f87db457 100644 --- a/desktop/xfce4-volumed/xfce4-volumed.SlackBuild +++ b/desktop/xfce4-volumed/xfce4-volumed.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for xfce4-volumed -# Copyright 2006-2009 Robby Workman Northport, Alabama, USA +# Copyright 2006,2007,2008,2009,2010 Robby Workman Northport, Alabama, USA # Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -26,10 +26,19 @@ PRGNAM=xfce4-volumed VERSION=0.1.8 -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 @@ -44,6 +53,9 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -88,4 +100,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} - |