Fixes for x86_64, updates to faad/faac/schroedinger

1 files changed, 20 insertions, 14 deletions

diff --git a/ffmpeg/build/ffmpeg.SlackBuild b/ffmpeg/build/ffmpeg.SlackBuild
index 896801ef..e8796201 100755
--- a/ffmpeg/build/ffmpeg.SlackBuild
+++ b/ffmpeg/build/ffmpeg.SlackBuild
@@ -73,6 +73,8 @@
 # 0.5-1:      20/mar/2009 by Eric Hameleers <alien@slackware.com>
 #             * First new official release in ages. Add x264 presets to the
 #               package (idea borrowed from the script at slackbuilds.org).
+# 0.5-2:      13/may/2009 by Eric Hameleers <alien@slackware.com>
+#             * Updates to faac/faad/schro
 #               
 # Run 'sh ffmpeg.SlackBuild' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -106,7 +108,7 @@ PRGNAM=ffmpeg
 #VERSION=${VERSION:-r16043}
 VERSION=${VERSION:-0.5}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 NUMJOBS=${NUMJOBS:--j7}
 TAG=${TAG:-"alien"}
 
@@ -129,18 +131,18 @@ DOCS_X264="AUTHORS COPYING"
 AMRNB=7.0.0.2
 AMRWB=7.0.0.3
 DC1394=2.0.2
-FAAC=1.26
-FAAD2=2.6.1
+FAAC=1.28
+FAAD2=2.7
 FFMPEG=$VERSION
 GSM=1.0.12
 LAME=398-2
-OIL=0.3.15
+OIL=0.3.16
 RAW1394=2.0.0
-SCHROEDINGER=1.0.5
+SCHROEDINGER=1.0.7
 SPEEX=1.2rc1
 X264_SAFE=20080301-2245 # In later versions nasm complains
                         # about 'function hidden'
-X264=20090316-2245      # Needs yasm installed
+X264=20090512-2245      # Needs yasm installed
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -565,9 +567,9 @@ cd $OLDDIR
 make_faac()
 {
 echo -e "**\n**  faac ...\n**"
-mv $TMP/tmp-$PRGNAM/faac $TMP/tmp-$PRGNAM/faac-${FAAC}
+#mv $TMP/tmp-$PRGNAM/faac $TMP/tmp-$PRGNAM/faac-${FAAC}
 cd $TMP/tmp-$PRGNAM/faac-${FAAC}
-sh bootstrap
+#sh bootstrap
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
@@ -595,15 +597,13 @@ cd -
 make_faad2()
 {
 echo -e "**\n**  faad2 ...\n**"
-mv $TMP/tmp-$PRGNAM/faad2 $TMP/tmp-$PRGNAM/faad2-${FAAD2}
+#mv $TMP/tmp-$PRGNAM/faad2 $TMP/tmp-$PRGNAM/faad2-${FAAD2}
 cd $TMP/tmp-$PRGNAM/faad2-${FAAD2}
-autoreconf -vif
+#autoreconf -vif
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 ./configure --prefix=/usr \
-            --with-drm \
-            --with-mp4v2 \
             --without-xmms \
             --enable-static \
             --disable-shared \
@@ -611,6 +611,10 @@ LDFLAGS="$SLKLDFLAGS" \
             --program-suffix="" \
             --build=$ARCH-slackware-linux \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}_faad2.log
+            # No longer available:
+            #--with-mp4v2 \
+            # Gives errors "faad bitstream value not allowed by specification":
+            #--with-drm \
 make ${NUMJOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_faad2.log
 # Install faad2 into a temp location so ffmpeg can pickup the library
 make install DESTDIR=$FFMPEGDEPSDIR \
@@ -794,7 +798,7 @@ fi
 cd $TMP/tmp-$PRGNAM/ffmpeg-${FFMPEG}
 
 # Stamp the version into the source:
-sed -i -e "s/UNKNOWN/$FFMPEG/" version.sh
+[ -f version.sh ] && sed -i -e "s/UNKNOWN/$VERSION/" version.sh
 
 TMPDIR="$TMP" \
 CFLAGS="$SLKCFLAGS" \
@@ -802,6 +806,8 @@ CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
 PKG_CONFIG_PATH="$FFMPEGDEPSDIR/usr/lib/pkgconfig" \
 ./configure --prefix=/usr \
+            --libdir=/usr/lib${LIBDIRSUFFIX} \
+            --shlibdir=/usr/lib${LIBDIRSUFFIX} \
             --mandir=/usr/man \
             ${USE_PATENTED} \
             --enable-gpl \
@@ -878,7 +884,7 @@ cp -a ffpresets/*.ffpreset $PKG/usr/share/ffmpeg/
 # The pkg-config files are full of library dependencies which we built
 # statically, so we need to edit those out so that programs that try to link
 # against our ffmpeg will not get confused:
-for PCFILE in $(ls $PKG/usr/lib/pkgconfig/*.pc) ; do
+for PCFILE in $(ls $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/*.pc) ; do
   sed -i -e 's/libraw1394//' -e 's/-lspeex//' -e 's/-lamrnb//' \
          -e 's/-lamrwb//' -e 's/-lfaac//' -e 's/-lfaad//' -e 's/-lgsm//' \
          -e 's/-lmp3lame//' -e 's/-lschroedinger-[^ ]*//' -e 's/-loil-[^ ]*//' \