aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-19 22:00:46 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-21 01:35:17 -0500
commit4f724c31b564caed41857384fb8a84f911560772 (patch)
tree6742863b51673da07578419b949cc3685dd7fbb2
parentfeff537d3147abe0782fc6798a7a09082a70df2d (diff)
multimedia/farsight2: Miscellaneous cleanups
-rw-r--r--multimedia/farsight2/README12
-rw-r--r--multimedia/farsight2/farsight2.SlackBuild28
-rw-r--r--multimedia/farsight2/slack-desc1
3 files changed, 22 insertions, 19 deletions
diff --git a/multimedia/farsight2/README b/multimedia/farsight2/README
index b9a9aad719c3..2c65d1fc2fe1 100644
--- a/multimedia/farsight2/README
+++ b/multimedia/farsight2/README
@@ -1,10 +1,8 @@
Farsight - Audio/Video Communications Framework
-The Farsight project is an effort to create a framework to deal
-with all known audio/video conferencing protocols. On one side
-it offers a generic API that makes it possible to write plugins
-for different streaming protocols, on the other side it offers
-an API for clients to use those plugins.
+The Farsight project is an effort to create a framework to deal with all
+known audio/video conferencing protocols. On one side it offers a generic
+API that makes it possible to write plugins for different streaming protocols
+and on the other side it offers an API for clients to use those plugins.
-Build Requirements: libnice, gst-python
-Runtime Requirements: gst-plugins-good, gst-plugins-bad
+This requires libnice and gst-python to build, and gst-plugins-ugly to run.
diff --git a/multimedia/farsight2/farsight2.SlackBuild b/multimedia/farsight2/farsight2.SlackBuild
index df86ae0fc5e4..47814fa663db 100644
--- a/multimedia/farsight2/farsight2.SlackBuild
+++ b/multimedia/farsight2/farsight2.SlackBuild
@@ -28,10 +28,19 @@
PRGNAM=farsight2
VERSION=${VERSION:-0.0.17}
-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
@@ -46,6 +55,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
set -e
@@ -80,14 +92,10 @@ make install DESTDIR=$PKG
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-( cd $PKG
- # Remove 'special' files
- find . -name perllocal.pod \
- -o -name ".packlist" \
- -o -name "*.bs" \
- | xargs rm -f
-)
+find $PKG -name perllocal.pod \
+ -o -name ".packlist" \
+ -o -name "*.bs" \
+ | xargs rm -f
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
@@ -100,5 +108,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}
-
-
diff --git a/multimedia/farsight2/slack-desc b/multimedia/farsight2/slack-desc
index c87afcab5e9b..efe865a90bba 100644
--- a/multimedia/farsight2/slack-desc
+++ b/multimedia/farsight2/slack-desc
@@ -17,4 +17,3 @@ farsight2:
farsight2: Homepage: http://farsight.freedesktop.org/wiki/
farsight2:
farsight2:
-