3 files changed, 39 insertions, 32 deletions
diff --git a/multimedia/transcode/README b/multimedia/transcode/README
index 6f4799646833e..f5d324e507d39 100644
--- a/multimedia/transcode/README
+++ b/multimedia/transcode/README
@@ -5,7 +5,17 @@ the frames (export modules). It supports elementary video and audio frame
 transformations, including de-interlacing or fast resizing of video frames
 and loading of external filters.
 
-Requires ffmpeg, libmpeg2, lame, libdv, libdvdread and a52dec.
-If you don't want support for libquicktime you'll have to pass QUICKTIME=no
-to the script. Support for mjpegtools can be enabled by passing MJPEGTOOLS=yes
-to the script.  All dependencies are available from SlackBuilds.org.
+This requires ffmpeg and can optionally use lame.
+
+You can enable some optional (not-autodetected) features by
+passing variables to the script:
+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 5f28ad8911127..28820c2cee25a 100644
--- a/multimedia/transcode/transcode.SlackBuild
+++ b/multimedia/transcode/transcode.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for transcode
 
-# Copyright 2008-2009 Heinz Wiesinger <pprkut@liwjatan.at>
+# Copyright 2008-2009 Heinz Wiesinger, Amsterdam, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=transcode
-VERSION=1.1.2
+VERSION=1.1.5
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,24 +33,15 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "${QUICKTIME:-yes}" = "yes" ]; then
-  do_qt="en"
-else
-  do_qt="dis"
-fi
-
-if [ "${MJPEGTOOLS:-no}" = "no" ]; then
-  mjpeg="dis"
-else
-  mjpeg="en"
-fi
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -72,6 +63,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
@@ -79,20 +71,23 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-netstream \
   --enable-alsa \
   --enable-v4l \
+  --enable-libv4l2=${LIBV4L:-no} \
+  --enable-libv4lconvert=${LIBV4L:-no} \
+  --enable-libmpeg2=${LIBMPEG2:-no} \
+  --enable-libmpeg2convert=${LIBMPEG2:-no} \
   --enable-ogg \
   --enable-vorbis \
   --enable-theora \
-  --enable-x264 \
-  --enable-xvid \
-  --enable-faac \
+  --enable-x264=${X264:-no} \
+  --enable-xvid=${XVID:-no} \
+  --enable-faac=${FAAC:-no} \
   --enable-freetype2 \
   --enable-sdl \
   --enable-libxml2 \
-  --enable-libdv \
-  --${do_qt}able-libquicktime \
-  --${mjpeg}able-mjpegtools \
-  --enable-a52 \
-  --enable-a52-default-decoder \
+  --enable-libdv=${LIBDV:-no} \
+  --enable-libquicktime=${QUICKTIME:-no} \
+  --enable-mjpegtools=${MJPEGTOOLS:-no} \
+  --enable-a52=${A52DEC:-no} \
   --enable-nuv \
   --enable-lzo \
   --enable-libpostproc \
@@ -120,4 +115,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/multimedia/transcode/transcode.info b/multimedia/transcode/transcode.info
index 62c5d3d1bb437..126c9f82d0b39 100644
--- a/multimedia/transcode/transcode.info
+++ b/multimedia/transcode/transcode.info
@@ -1,8 +1,10 @@
 PRGNAM="transcode"
-VERSION="1.1.2"
+VERSION="1.1.5"
 HOMEPAGE="http://www.transcoding.org/"
-DOWNLOAD="http://download.berlios.de/tcforge/transcode-1.1.2.tar.bz2"
-MD5SUM="753f7ee4ae154aac1527ceda9d085e65"
-MAINTAINER="ppr:kut"
+DOWNLOAD="http://download.berlios.de/tcforge/transcode-1.1.5.tar.bz2"
+MD5SUM="41ac6b1c0fe30f3aab286e771fc31b9e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Heinz Wiesinger"
 EMAIL="pprkut@liwjatan.at"
-APPROVED="rworkman"
+APPROVED="dsomero"