aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-05-21 01:41:23 -0500
committerRobby Workman <rworkman@slackbuilds.org>2010-05-21 01:41:23 -0500
commit69051d5b38fa6e8866ae98ca62f96e6834442788 (patch)
tree1e2473ebf06dd70b302d09105e0b70ba40f548f5
parent25687e4932b3a9c37dd9cd1ca0e9cdbc05e123eb (diff)
multimedia/kino: Miscellaneous cleanups.
-rw-r--r--multimedia/kino/README5
-rw-r--r--multimedia/kino/kino.SlackBuild19
-rw-r--r--multimedia/kino/slack-desc2
3 files changed, 17 insertions, 9 deletions
diff --git a/multimedia/kino/README b/multimedia/kino/README
index 116fbf782a189..091d683859c6d 100644
--- a/multimedia/kino/README
+++ b/multimedia/kino/README
@@ -8,7 +8,6 @@ audio stream) encodings.
Kino does not support other video file formats or encodings, but it
can import them by transcoding with FFmpeg and optionally MEncoder.
-This requires libavc1394, libiec61883, libdv, libsamplerate and ffmpeg.
+This requires libavc1394, libiec61883, libdv, and ffmpeg.
If you want support for quicktime, you'll have to pass QUICKTIME=yes
-to the script. This will additionally require liquicktime.
-All dependencies are available from SlackBuilds.org.
+to the script, and this will additionally require liquicktime.
diff --git a/multimedia/kino/kino.SlackBuild b/multimedia/kino/kino.SlackBuild
index 4679bd1c73bbd..dc514c8037ab8 100644
--- a/multimedia/kino/kino.SlackBuild
+++ b/multimedia/kino/kino.SlackBuild
@@ -21,10 +21,19 @@
PRGNAM=kino
VERSION=1.3.2
-ARCH=${ARCH:-i486}
BUILD=${BUILD:-2}
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
@@ -39,6 +48,9 @@ elif [ "$ARCH" = "i686" ]; then
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
fi
if [ "${QUICKTIME:-no}" = "no" ]; then
@@ -74,10 +86,7 @@ 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/usr/man
- find . -type f -exec gzip -9 {} \;
- for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
# Give the udev rules a number prefix to be consistent with other rules files
# and move to the new location for 12.2; then remove $PKG/etc directory
diff --git a/multimedia/kino/slack-desc b/multimedia/kino/slack-desc
index 59da4612167f9..f0a6e2a56d431 100644
--- a/multimedia/kino/slack-desc
+++ b/multimedia/kino/slack-desc
@@ -16,4 +16,4 @@ kino: Kino does not support other video file formats or encodings, but it
kino: can import them by transcoding with FFmpeg and optionally MEncoder.
kino:
kino: http://www.kinodv.org/
-kino:
+kino: