2 files changed, 15 insertions, 8 deletions
diff --git a/multimedia/transcode/README b/multimedia/transcode/README
index f5d324e507d3..9c51ce605e65 100644
--- a/multimedia/transcode/README
+++ b/multimedia/transcode/README
@@ -13,9 +13,7 @@ A52DEC=yes|no (default: no), requires a52dec
 FAAC=yes|no (default: no), requires faac
 LIBDV=yes|no (default: no), requires libdv
 LIBMPEG2=yes|no (default: no), requires libmpeg2
-LIBV4L=yes|no (default: no), requires libv4l
 MJPEGTOOLS=yes|no (default: no), requires mjpegtools
 QUICKTIME=yes|no (default: no), requires libquicktime
 X264=yes|no (default: no), requires x264
 XVID=yes|no (default: no), requires xvidcore
-
diff --git a/multimedia/transcode/transcode.SlackBuild b/multimedia/transcode/transcode.SlackBuild
index 28820c2cee25..b2ddd485497f 100644
--- a/multimedia/transcode/transcode.SlackBuild
+++ b/multimedia/transcode/transcode.SlackBuild
@@ -24,10 +24,19 @@
 
 PRGNAM=transcode
 VERSION=1.1.5
-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
@@ -42,6 +51,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -72,7 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-alsa \
   --enable-v4l \
   --enable-libv4l2=${LIBV4L:-no} \
-  --enable-libv4lconvert=${LIBV4L:-no} \
+  --enable-libv4lconvert=${LIBV4L:-yes} \
   --enable-libmpeg2=${LIBMPEG2:-no} \
   --enable-libmpeg2convert=${LIBMPEG2:-no} \
   --enable-ogg \
@@ -98,10 +110,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
-( 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 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog COPYING INSTALL README STYLE TODO \