Upgrade to 0.9.9, fix ffmpeg decoding as well as x264 encoding

1 files changed, 28 insertions, 13 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 9c1619c1..0b0f7e31 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -148,6 +148,9 @@
 #             * Building the first release candidate.
 # 0.9.9.rc2-2:27/mar/2009 by Eric Hameleers <alien@slackware.com>
 #             * Fix AAC decoding by removing "--with-drm"
+# 0.9.9-1:    27/mar/2009 by Eric Hameleers <alien@slackware.com>
+#             * Try to fix ffmeg video decoding as well as upgrade to 0.9.9;
+#               apply several fixes taken from 1.0.0-git to fix x264 encoding.
 # 
 # Run 'sh vlc.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -172,13 +175,13 @@
 PRGNAM=vlc
 PRGNAM2=mozplugin
 ARCH=${ARCH:-"i486"}
-BUILD=${BUILD:-"2"}
+BUILD=${BUILD:-"1"}
 TAG=${TAG:-"alien"}
 
 # SRCVER and VERSION values may be modified later!
 # If SRCVER is set to "HEAD" then you get a git snapshot, else we look
 # for the tarball in vlc's releases directory.
-SRCVER=${SRCVER:-"0.9.9-rc2"}
+SRCVER=${SRCVER:-"0.9.9"}
 #SRCVER=${SRCVER:-"20090114"}
 #SRCVER=${SRCVER:-"HEAD"}
 VERSION=${VERSION:-$(echo $SRCVER | tr '-' '.')}
@@ -317,7 +320,7 @@ VCD=0.7.23
 X264_SAFE=20080301-2245 # In later versions nasm complains
                         #   about 'function hidden'
 #X264=20090113-2245      # Needs yasm installed
-X264=20090316-2245      # Needs yasm installed
+X264=20090329-2245      # Needs yasm installed
 
 # Determine what X we're running (the modular X returns the prefix
 # in the next command, while older versions stay silent):
@@ -1023,7 +1026,6 @@ PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib/pkgconfig" \
             --enable-gpl \
             --enable-swscale \
             --enable-libtheora \
-            --enable-libx264 \
             --enable-avfilter \
             --enable-postproc \
             --enable-pthreads \
@@ -1862,9 +1864,10 @@ make -j${JOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_x264.log
 make install DESTDIR=$VLCDEPSDIR \
   2>&1 | tee -a $OUTPUT/make-${PRGNAM}_x264.log
 # Need this to link vlc successfully on x86_64:
-#strip $VLCDEPSDIR/usr/lib/libx264.a
-find . -name libx264.a -exec strip {} \;
-find $VLCDEPSDIR -name libx264.a -exec strip {} \;
+if [ "$ARCH" == "x86_64" ]; then
+  find . -name libx264.a -exec strip {} \;
+  find $VLCDEPSDIR -name libx264.a -exec strip {} \;
+fi
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/x264/
 cp AUTHORS COPYING \
@@ -2173,6 +2176,18 @@ cat $SRCDIR/vlc-0.9.0_libdvdread_configure.patch | patch -p1 \
 #cat $SRCDIR/vlc-1.0.0_embedded_video.patch | patch -p1 \
 #  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
+# Make vlc link against a static libx264 (fixed in 1.0.0-git)
+cat $SRCDIR/vlc_x264_static.diff | patch -p1 \
+  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+
+# Allow the use of a recent x264 (fixed in 1.0.0-git)
+if [ "$X264" != "$X264_SAFE" ]; then
+  cat $SRCDIR/vlc-0.9.9_x264_remove_pre_scenecut.diff | patch -p1 \
+    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+  cat $SRCDIR/vlc-0.9.9_x264_obsolete_pre_scenecut.diff | patch -p1 \
+    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+fi
+
 # Preparations for building a separate vlc mozilla plugin :
 if [ "$MOZPLUGIN" == "YES" ]; then
   echo "+++ Building mozilla plugin using $MOZBROWSER sdk +++"
@@ -2203,10 +2218,10 @@ else
   DO_FFMPEG_LIBS_PAT=""
 fi
 
-## VLC 0.9.6 needs to regenerate libtool (known bug)
-#if ls m4/lt*.m4 1>/dev/null 2>/dev/null ; then
-#  rm -f m4/{lt,lib}*.m4; autoreconf -svif
-#fi
+# VLC 0.9.6 but also 0.9.9 needs to regenerate libtool (known bug)
+if ls m4/lt*.m4 1>/dev/null 2>/dev/null ; then
+  rm -f m4/{lt,lib}*.m4; autoreconf -svif
+fi
 
 # vlc checks eventfd availability in glibc rather awkwardly. Our glibc 2.7
 # implements the function but does not export it in a header. Still vlc thinks
@@ -2269,6 +2284,7 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             --enable-speex \
             --with-speex-tree=$TMP/tmp-$PRGNAM/speex-$SPEEX \
             --enable-x264 \
+            --with-x264-tree=$TMP/tmp-$PRGNAM/x264-snapshot-$X264 \
             --enable-a52 \
             --with-a52-tree=$TMP/tmp-$PRGNAM/a52dec-$A52 \
             --enable-faad \
@@ -2317,7 +2333,6 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             #--disable-musicbrainz \
             #--disable-arts \
             #--enable-esd \
-            #--with-x264-tree=$TMP/tmp-$PRGNAM/x264-snapshot-$X264 \
 
 # At some time, I needed to remove access_mmap from vlc-config because that
 # caused my vlc to die after only a few seconds of playtime...
@@ -2497,7 +2512,6 @@ else
   if [ "$STATIC_FFMPEG" == "YES" ]; then
     # Needed before ffmpeg:
     make_theora
-    make_x264
     # Only use patented code if we are allowing it:
     if [ "${USE_PATENTS}" == "YES" ]; then
       make_lame
@@ -2523,6 +2537,7 @@ else
   make_dca
   make_ebml
   make_matroska
+  make_x264
   make_libmpeg2
   make_mpcdec
   make_twolame