Several updated to the build of vlc

1 files changed, 24 insertions, 20 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 6a22651b..cb515a6e 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -141,9 +141,9 @@
 # 0.9.8a-3:   28/dec/2008 by Eric Hameleers <alien@slackware.com>
 #             * Updated ffmpeg/x264 snapshots, made it build on x86_64 with the
 #               help of Attila Craciun.
-# 0.9.9-1:    28/jan/2009 by Eric Hameleers <alien@slackware.com>
-#             * Updated vlc/ffmpeg/x264 snapshots, fix default font for x86_64,
-#               fix DTS audio decoding on x86_64
+# 0.9.9-1:    06/mar/2009 by Eric Hameleers <alien@slackware.com>
+#             * Updated ffmpeg/x264/live55 snapshots, fix default font for
+#               x86_64, fix DTS audio decoding on x86_64
 # 
 # Run 'sh vlc.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -289,9 +289,8 @@ EBML=0.7.8
 FAAC=1.26
 FAAD2=2.6.1
 #FFMPEG=20080731
-#FFMPEG=r14080 # latest recommended version for 0.9.0 is r14080 (20080705)
-FFMPEG=r16849 # recommended version for 0.9.2 is r15261 (20080908)
-              # but I use 16849 (20090129)
+#FFMPEG=r14080  # latest recommended version for 0.9.0 is r14080 (20080705)
+FFMPEG=r17855   # 20090306
 FLUID=1.0.8
 GGI=2.2.2
 GII=1.0.2
@@ -313,7 +312,8 @@ UPNP=1.6.6
 VCD=0.7.23
 X264_SAFE=20080301-2245 # In later versions nasm complains
                         #   about 'function hidden'
-X264=20090113-2245      # Needs yasm installed
+#X264=20090113-2245      # Needs yasm installed
+X264=20090221-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):
@@ -1024,7 +1024,8 @@ PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib/pkgconfig" \
             --disable-ffserver \
             --disable-ffplay \
             --disable-ffmpeg \
-            --enable-swscale \
+            --enable-hardcoded-tables \
+            --enable-fastdiv \
             --disable-debug \
             --disable-shared \
             --enable-static \
@@ -1039,10 +1040,11 @@ PKG_CONFIG_PATH="${VLCDEPSDIR}/usr/lib/pkgconfig" \
             # --enable-libogg \ Newer ffmpeg no longer need this.
             # --enable-libxvid \ generates vlc linker errors, so we use ffmpeg's
             #   native xvid encoder implementation instead
-            #--enable-libvorbis \ # Use ffmpeg's native support
+            #--enable-libvorbis \  # Use ffmpeg's native support
             #--disable-vhook \
             #--disable-devices \
             #--disable-protocols \
+            #--enable-swscale \    # no longer an option
 
 make -j${JOBS} 2>&1 | tee $OUTPUT/make-${PRGNAM}_ffmpeg.log
 [ $? -ne 0 ] && return 1
@@ -1846,7 +1848,9 @@ 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
+#strip $VLCDEPSDIR/usr/lib/libx264.a
+find . -name libx264.a -exec strip {} \;
+find $VLCDEPSDIR -name libx264.a -exec strip {} \;
 # Add DOCS to the vlcdeps to have it added to vlc package later:
 mkdir -p $VLCDEPSDIR/doc/x264/
 cp AUTHORS COPYING \
@@ -2134,9 +2138,9 @@ cat $SRCDIR/vlc-0.9.0_deffont.patch \
   | sed -e "s#@@XPREFIX@@#$XPREF#" -e "s#@@LIB@@#lib${LIBDIRSUFFIX}#" \
   | patch -p1 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
-# Fix the errors caused by incorrect osd paths:
-cat $SRCDIR/vlc-0.8.6a_osdmenu_paths.patch | patch -p1 \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+## Fix the errors caused by incorrect osd paths:
+#cat $SRCDIR/vlc-0.8.6a_osdmenu_paths.patch | patch -p1 \
+#  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 # Fix PLUGIN_PATH path for lib64
 sed -i -e 's#/lib/vlc#/usr/lib${LIBDIRSUFFIX}/vlc#g' vlc-config.in.in configure* \
@@ -2239,7 +2243,7 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             --enable-v4l \
             --enable-caca \
             --enable-aa \
-            --enable-galaktos \
+            --disable-galaktos \
             --enable-upnp \
             --enable-flac \
             --enable-shout \
@@ -2251,6 +2255,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 \
@@ -2268,15 +2273,13 @@ PATH="$VLCDEPSDIR/usr/bin:$PATH" \
             --program-prefix= \
             --program-suffix= \
             --build=$ARCH-slackware-linux \
-            AVCODEC_LIBS="-lavcodec -lbz2 -lz ${DO_FFMPEG_LIBS_PAT} -ldl -ltheora -lvorbisenc -lavutil -lvorbis -lm -logg" \
+            AVCODEC_LIBS="-lavcodec -lbz2 -lz ${DO_FFMPEG_LIBS_PAT} -ldl -ltheora -lvorbisenc -lswscale -lavutil -lvorbis -lm -logg" \
             AVCODEC_CFLAGS="" \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
             # Enabled by default:
             #--enable-dca \
             #--with-dca-tree=$TMP/tmp-$PRGNAM/libdca-$DCA \
-            # Use installed vlcdeps library:
-            #--with-x264-tree=$TMP/tmp-$PRGNAM/x264-snapshot-$X264 \
 
             # Libdvdnav is now the default (which uses libdvdread in turn)
             #--enable-dvdread \
@@ -2455,7 +2458,7 @@ if echo "$*" | grep -qw -- --unwrapvlcdeps ; then
   cd $TMP/tmp-$PRGNAM
   echo "Extracting tarball with pre-compiled binary library code..."
   tar -xvf $SRCDIR/$PRGNAM-vlcdeps-$ARCH.tar.bz2
-  #find . -name "*.la" -exec sed -i -e "s#/usr/share/vlcdeps/#$TMP/tmp-$PRGNAM#g" {} \;
+  #find . -name "*.la" -exec sed -i -e "s#/usr/share/vlcdeps#$TMP/tmp-$PRGNAM#g" {} \;
   find . -name "*.la" -exec sed -i -e "s#/mnt/hd#$TMP#g" {} \;
   cd -
 
@@ -2543,8 +2546,9 @@ if echo "$*" | grep -qw -- --wrapvlcdeps ; then
     faad2 \
     twolame-$TWOLAME \
     libraw1394-${RAW1394} \
-    libavc1394-${AVC1394}
-  find . -name "*.la" -exec sed -i -e "s#$TMP/tmp-$PRGNAM#/usr/share/vlcdeps/#g" {} \;
+    libavc1394-${AVC1394} \
+    x264-snapshot-$X264
+  find . -name "*.la" -exec sed -i -e "s#$TMP/tmp-$PRGNAM#/usr/share/vlcdeps#g" {} \;
   echo "Created vlcdeps binary tarball in '$OUTPUT/$PRGNAM-vlcdeps-$ARCH.tar.bz2'..."
   cd -
 else