Updated to 2.2.1. Added libzvbi, for teletext subtitle decoding

1 files changed, 53 insertions, 12 deletions

diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index cdd56d62..0355812d 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -131,6 +131,8 @@
 #             * Update.
 # 2.1-1:      26/dec/2013 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 2.2.1-1:    02/may/2014 by Eric Hameleers <alien@slackware.com>
+#             * Update. Add teletext subtitle support.
 #               
 # Run 'sh ffmpeg.SlackBuild' to build a Slackware package.
 # The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -155,7 +157,7 @@ USE_PATENTS=${USE_PATENTS:-"YES"}
 USE_PATENTS=$(echo $USE_PATENTS | tr 'a-z' 'A-Z')
 
 PRGNAM=ffmpeg
-VERSION=${VERSION:-2.1}
+VERSION=${VERSION:-2.2.1}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j7}
 TAG=${TAG:-"alien"}
@@ -175,6 +177,7 @@ DOCS_FRIBIDI="AUTHORS COPYING ChangeLog NEWS README THANKS TODO"
 DOCS_GSM="COPYRIGHT ChangeLog* INSTALL MACHINES MANIFEST README"
 DOCS_LAME="API COPYING ChangeLog HACKING LICENSE README STYLEGUIDE TODO USAGE"
 DOCS_LIBVA="COPYING"
+DOCS_LIBZVBI="AUTHORS BUGS COPYING COPYING.LIB ChangeLog INSTALL NEWS README TODO"
 DOCS_OPUS="AUTHORS COPYING ChangeLog NEWS README"
 DOCS_ORC="COPYING README TODO"
 DOCS_RAW1394="AUTHORS COPYING ChangeLog INSTALL NEWS README"
@@ -187,11 +190,11 @@ DOCS_VPX="AUTHORS CHANGELOG LICENSE README"
 DOCS_X264="AUTHORS COPYING"
 
 # Support libraries:
-AACENC=0.1.2
+AACENC=0.1.3
 AACPLUS=2.0.2
 AMRWBENC=0.1.3
 AMR=0.1.3
-ASS=0.10.2
+ASS=0.11.2
 AVC1394=0.5.4
 DC1394=2.1.2
 FAAC=1.28
@@ -199,17 +202,18 @@ FAAD2=2.7
 FRIBIDI=0.19.6
 GSM=1.0.13
 LAME=3.99.5
-LIBVA=1.2.1
+LIBVA=1.3.0
+LIBZVBI=0.2.35
 OPUS=1.1
-ORC=0.4.17
+ORC=0.4.18
 RAW1394=2.0.5
 RTMP=2.3
 SCHROEDINGER=1.0.11
 SPEEX=1.2rc1
-V4L=0.9.5
+V4L=1.0.1
 VDPAU=0.7
-VPX=v1.1.0
-X264=20131225-2245
+VPX=v1.3.0
+X264=20140501-2245
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -349,8 +353,8 @@ SRCURL[18]="http://fribidi.org/download/fribidi-${FRIBIDI}.tar.bz2"
 SRCPAT[18]="NO"
 
 # Libass - portable library for SSA/ASS subtitles rendering
-SOURCE[19]="$SRCDIR/libass-$ASS.tar.gz"
-SRCURL[19]="http://libass.googlecode.com/files/libass-$ASS.tar.gz"
+SOURCE[19]="$SRCDIR/libass-$ASS.tar.xz"
+SRCURL[19]="https://github.com/libass/libass/releases/download/${ASS}/libass-$ASS.tar.xz"
 SRCPAT[19]="NO"
 
 # Collection of video4linux support libraries
@@ -368,6 +372,11 @@ SOURCE[22]="$SRCDIR/libvdpau-${VDPAU}.tar.gz"
 SRCURL[22]="http://people.freedesktop.org/~aplattner/vdpau/libvdpau-${VDPAU}.tar.gz"
 SRCPAT[22]="NO"
 
+# libzvbi for teletext subtitle processing:
+SOURCE[23]="$SRCDIR/zvbi-${LIBZVBI}.tar.bz2"
+SRCURL[23]="http://downloads.sourceforge.net/zapping/zvbi-${LIBZVBI}.tar.bz2"
+SRCPAT[23]="NO"
+
 ## HE-AAC+ v2 shared library:
 #SOURCE[XX]="$SRCDIR/libaacplus-$AACPLUS.tar.gz"
 #SRCURL[XX]="http://tipok.ath.cx/downloads/media/aac+/libaacplus/libaacplus-${AACPLUS}.tar.gz"
@@ -1419,6 +1428,36 @@ cd -
 }
 
 
+# ----------------------------------------------------------------------------
+# Compile libzvbi, a library that allows ffmpeg to process teletext subtitles
+# ----------------------------------------------------------------------------
+
+make_zvbi()
+{
+echo -e "**\n**  zvbi ...\n**"
+cd $TMP/tmp-$PRGNAM/zvbi-${LIBZVBI}
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+LDFLAGS="$SLKLDFLAGS" \
+./configure \
+  --prefix=$FFMPEGDEPSDIR/usr \
+  --libdir=$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} \
+  --enable-static \
+  --disable-shared \
+  --program-prefix= \
+  --program-suffix= \
+  --build=$TARGET \
+  2>&1 | tee $OUTPUT/configure-${PRGNAM}_zvbi.log
+make 2>&1 | tee $OUTPUT/make-${PRGNAM}_zvbi.log
+# Install zvbi into a temp location so ffmpeg can pickup the library
+make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_zvbi.log
+# Add DOCS to the ffmpegdeps to have it added to ffmpeg package later:
+mkdir -p $FFMPEGDEPSDIR/doc/zvbi/
+cp $DOCS_LIBZVBI $FFMPEGDEPSDIR/doc/zvbi/ || true
+cd -
+}
+
+
 # -----------------------------------------------------------------------------
 # Compile ffmpeg with additional support for -
 #   LAME (MP3), XVID, AAC (MP4), FAAD2 , SPEEX, X264, GSM, SCHROEDINGER
@@ -1464,7 +1503,7 @@ sed -i -e "s/pkg_config --libs/pkg_config --static --libs/" \
 TMPDIR="$TMP" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-LDFLAGS="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS" \
+LDFLAGS="-L$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX} $SLKLDFLAGS -lXext" \
 PKG_CONFIG_PATH="$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 PATH="$FFMPEGDEPSDIR/usr/bin:$PATH" \
 ./configure \
@@ -1491,6 +1530,7 @@ PATH="$FFMPEGDEPSDIR/usr/bin:$PATH" \
   --enable-libvorbis \
   --enable-libvpx \
   --enable-libx264 \
+  --enable-libzvbi \
   --enable-postproc \
   --enable-runtime-cpudetect \
   --enable-vaapi \
@@ -1547,6 +1587,7 @@ make_libva
 make_vdpau
 make_fribidi
 make_ass
+make_zvbi
 
 #fi # end of 'xy'
 
@@ -1577,7 +1618,7 @@ for PCFILE in $(ls $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/*.pc) ; do
          -e 's/-lmp3lame//g' \
          -e 's/-lopus//g' \
          -e 's/-lschroedinger-[^ ]*//g' -e 's/-lorc-[^ ]*//g' \
-         -e 's/-lx264//g' -e 's/-lvpx//g' \
+         -e 's/-lx264//g' -e 's/-lvpx//g' -e 's/-lzvbi//g' \
          -e "s#-L/tmp/build/tmp-ffmpeg/ffmpegdeps/usr/lib${LIBDIRSUFFIX}##" \
          $PCFILE 
 done