1 files changed, 75 insertions, 13 deletions
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
index 8c22619ac3..9970c5b7f7 100644
--- a/multimedia/ffmpeg/ffmpeg.SlackBuild
+++ b/multimedia/ffmpeg/ffmpeg.SlackBuild
@@ -19,12 +19,17 @@ OUTPUT=${OUTPUT:-/tmp}
 
 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
 
+# Configure ffmpeg features not autodetected by default
+
 if [ "${AMRNB:-no}" = "no" ]; then
   amr_nb=""
 else
@@ -39,55 +44,112 @@ else
   amr_wb="--enable-libamr-wb"
 fi
 
+if [ "${DC1394:-no}" = "no" ]; then
+  libdc1394=""
+else
+  libdc1394="--enable-libdc1394"
+fi
+
 if [ "${DIRAC:-no}" = "no" ]; then
   dirac_slow=""
 else
   dirac_slow="--enable-libdirac"
 fi
 
+if [ "${FAAC:-yes}" = "yes" ]; then
+  libfaac="--enable-libfaac"
+else
+  libfaac=""
+fi
+
+if [ "${FAAD:-yes}" = "yes" ]; then
+  libfaad="--enable-libfaad"
+else
+  libfaad=""
+fi
+
+if [ "${LAME:-yes}" = "yes" ]; then
+  mp3lame="--enable-libmp3lame"
+else
+  mp3lame=""
+fi
+
+if [ "${JP2:-no}" = "no" ]; then
+  openjpeg=""
+else
+  openjpeg="--enable-libopenjpeg"
+  SLKCFLAGS="$SLKCFLAGS -I/usr/include/openjpeg"
+fi
+
+if [ "${SCHROEDINGER:-no}" = "no" ]; then
+  dirac_fast=""
+else
+  dirac_fast="--enable-libschroedinger"
+fi
+
+if [ "${SPEEX:-no}" = "no" ]; then
+  libspeex=""
+else
+  libspeex="--enable-libspeex"
+fi
+
 if [ "${VDPAU:-no}" = "no" ]; then
   vdpau_opt="--disable-vdpau"
 else
   vdpau_opt="--enable-vdpau"
 fi
 
+if [ "${X264:-yes}" = "yes" ]; then
+  libx264="--enable-libx264"
+else
+  libx264=""
+fi
+
+if [ "${XVID:-no}" = "no" ]; then
+  libxvid=""
+else
+  libxvid="--enable-libxvid"
+fi
+
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-CFLAGS="$SLKCFLAGS -I/usr/include/openjpeg" \
-CXXFLAGS="$SLKCFLAGS -I/usr/include/openjpeg" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --shlibdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --disable-debug \
   --enable-shared \
   --disable-static \
   --enable-pthreads \
   --enable-libtheora \
-  --enable-libvorbis \
   --enable-gpl \
   --enable-postproc \
   --enable-swscale \
   --enable-x11grab \
-  --enable-libmp3lame \
-  --enable-libfaac \
-  --enable-libfaad \
-  --enable-libxvid \
-  --enable-libx264 \
   --enable-avfilter \
   --enable-avfilter-lavf \
-  --enable-libschroedinger \
-  --enable-libspeex \
-  --enable-libopenjpeg \
+  $openjpeg \
+  $libdc1394 \
+  $mp3lame \
+  $libfaac \
+  $libfaad \
+  $libxvid \
+  $libx264 \
+  $libspeex \
   $dirac_slow \
+  $dirac_fast \
   $vdpau_opt \
   $non_free \
   $amr_nb \
@@ -117,4 +179,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}