Update to 0.6.1

1 files changed, 33 insertions, 25 deletions

diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index cbc4771b..23ff3962 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 # $Id$
-# Copyright (c) 2007-2010  Eric Hameleers, Eindhoven, NL
+# Copyright (c) 2007-2011  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -27,7 +27,7 @@
 # By:         Eric Hameleers <alien@slackware.com>
 # For:        ffmpeg
 # Descr:      software to record, convert and stream audio and video
-# URL:        http://ffmpeg.mplayerhq.hu/
+# URL:        http://ffmpeg.org/
 # Needs:      yasm (only compile-time)
 # Changelog:
 # 20070519-1: 19/May/2007 by Eric Hameleers <alien@slackware.com>
@@ -95,6 +95,9 @@
 #               I also added VAAPI hardware acceleration support. Look further
 #               down in this script (in the header of the "make_libva" function)
 #               how you can benefit from GPU-accelerated encoding/decoding.
+# 0.6.1-1:    02/feb/2011 by Eric Hameleers <alien@slackware.com>
+#             * I forgot to update to a newer stable release.
+#               Updated internal codecs where available.
 #               
 # Run 'sh ffmpeg.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -116,10 +119,12 @@
 # with "USE_PATENTS=NO" i.e. without using the lame mp3 and aac libs.
 #USE_PATENTS="NO"
 USE_PATENTS=${USE_PATENTS:-"YES"}
+
+# I don't care if the user says "no" or "NO":
 USE_PATENTS=$(echo $USE_PATENTS | tr 'a-z' 'A-Z')
 
 PRGNAM=ffmpeg
-VERSION=${VERSION:-0.6}
+VERSION=${VERSION:-0.6.1}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:--j7}
 TAG=${TAG:-"alien"}
@@ -149,16 +154,16 @@ FAAD2=2.7
 FFMPEG=$VERSION
 GSM=1.0.13
 LAME=3.98.4
-LIBVA="0.31.0-1+sds13"
-ORC=0.4.5
+LIBVA="0.31.1-1+sds4"
+ORC=0.4.11
 RAW1394=2.0.5
 RTMP=2.2e
-SCHROEDINGER=1.0.9
+SCHROEDINGER=1.0.10
 SPEEX=1.2rc1
 SWSCALE=""       # Set SWSCALE="" to checkout a version of ffmpeg's swscale
                  # that matches the date of the FFMPEG snapshot.
-VPX=0.9.1
-X264=20100617-2245      # Needs yasm installed
+VPX=v0.9.5
+X264=20110201-2245      # Needs yasm installed
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -187,7 +192,7 @@ fi
 
 SOURCE[0]="$SRCDIR/ffmpeg-${FFMPEG}.tar.bz2"
 # We can get ffmpeg sources directly from SVN, see below.
-SRCURL[0]="http://ffmpeg.mplayerhq.hu/releases/ffmpeg-${VERSION}.tar.bz2"
+SRCURL[0]="http://ffmpeg.org/releases/ffmpeg-${VERSION}.tar.bz2"
 #SRCURL[0]=""
 SRCPAT[0]="NO"
 
@@ -763,6 +768,11 @@ cd -
 make_schroedinger()
 {
 echo -e "**\n**  schroedinger ...\n**"
+if [ "$ARCH" = "x86_64" ]; then
+  ARCHOPTS="--with-pic"
+else
+  ARCHOPTS=""
+fi
 cd $TMP/tmp-$PRGNAM/schroedinger-$SCHROEDINGER
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -771,11 +781,11 @@ PKG_CONFIG_PATH="$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --enable-static \
   --disable-shared \
-  --disable-debug \
+  --with-thread=none \
   --program-prefix= \
   --program-suffix= \
+  $ARCHOPTS \
   --build=$ARCH-slackware-linux \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_schroedinger.log
 make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_schroedinger.log
@@ -784,6 +794,10 @@ echo -e "\n**\n**\n"
 make install DESTDIR=$FFMPEGDEPSDIR \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_schroedinger.log
 # Or else the ffmpeg build wil fail:
+cp schroedinger.pc \
+  $FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig/schroedinger.pc
+cp schroedinger.pc \
+  $FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig/schroedinger-1.0.pc
 ( cd $FFMPEGDEPSDIR/usr/include
   ln -sf schroedinger-1.0/schroedinger
 )
@@ -839,14 +853,13 @@ LDFLAGS="$SLKLDFLAGS" \
   --disable-install-libs \
   --disable-debug-libs \
   --enable-postproc \
-  --enable-runtime-cpu-detect \
   $ARCHOPTS \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_vpx.log
   #--disable-examples \ causes errors
 make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_vpx.log
 # Install libvpx into a temp location so ffmpeg can pickup the library
 make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_vpx.log
-# The build system vor libvpx is not yet mature:
+# The build system for libvpx is not yet mature:
 cp -a --parents vpx/*.h ${FFMPEGDEPSDIR}/usr/include/
 cp -a libvpx.a ${FFMPEGDEPSDIR}/usr/lib${LIBDIRSUFFIX}
 cp -a libvpx_g.a ${FFMPEGDEPSDIR}/usr/lib${LIBDIRSUFFIX}
@@ -954,15 +967,16 @@ if [ "$ARCH" = "x86_64" ]; then
   fi
   # Assembler patch enables MMX/SSE:
   cat $SRCDIR/${FFMPEGASM}.patch | patch -p1 --verbose \
-    2>&1 | tee $OUTPUT/patch-${PRGNAM}_asm.log
+    2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
   ARCHOPTS="--arch=x86_64 --enable-pic"
 else
   ARCHOPTS=""
 fi
 
-# Add presets for vp8 encoder, which are not (yet) present in ffmpeg or libvpx:
-cat $SRCDIR/ffpresets-libvpx.diff | patch -p0 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_asm.log
+# Patch the internal VP8 code so that it is aligned with the newew libvpx
+# (adds presets as well):
+cat $SRCDIR/ffmpeg-0.6.1_libvpx-0.9.2-3.diff | patch -p1 --verbose \
+  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 # Stamp the version into the source:
 [ -f version.sh ] && sed -i -e "s/UNKNOWN/$VERSION/" version.sh
@@ -991,8 +1005,8 @@ PKG_CONFIG_PATH="$FFMPEGDEPSDIR/usr/lib${LIBDIRSUFFIX}/pkgconfig" \
   --enable-libschroedinger \
   --enable-libspeex \
   --enable-libtheora \
-  --enable-libx264 \
   --enable-libvpx \
+  --enable-libx264 \
   --enable-runtime-cpudetect \
   --enable-vaapi \
   --disable-vdpau \
@@ -1048,13 +1062,7 @@ make_ffmpeg
 cd $TMP/tmp-${PRGNAM}/ffmpeg-${FFMPEG}
 
 # Install all the needed stuff to the package dir
-# Use installwatch if available, to produce a logfile of the installation
-# process that is more easily readable:
-if $(which installwatch > /dev/null 2>&1); then
-  installwatch -o $OUTPUT/install-${PRGNAM}.log make DESTDIR=$PKG install
-else
-  make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
-fi
+make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 
 # Add x264 & vpx presets.  See 'Preset files' in the man pages.
 echo "** Adding ffmpeg presets:"