Seems that two x264 patches were present in 1.0.0-pre2 after all

1 files changed, 23 insertions, 23 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 4bb0a7cd..6e9666fd 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -1004,7 +1004,7 @@ cd $TMP/tmp-$PRGNAM/ffmpeg-${FFMPEG}
 
 ## The ffmpeg HEAD of early sep 2008 needs this patch:
 #( cd libswscale
-#  cat $SRCDIR/ffmpeg_libswscale_head.patch | patch -p0 \
+#  cat $SRCDIR/ffmpeg_libswscale_head.patch | patch -p0 --verbose \
 #    2>&1 | tee $OUTPUT/patch-${PRGNAM}_ffmpeg.log
 #)
 
@@ -1385,7 +1385,7 @@ make_dvdread()
 {
 echo -e "**\n**  libdvdread  ...\n**"
 cd $TMP/tmp-$PRGNAM/libdvdread-$DVDREAD
-#cat $SRCDIR/libdvdread_autogen.patch | patch -p0 \
+#cat $SRCDIR/libdvdread_autogen.patch | patch -p0 --verbose \
 #  2>&1 | tee $OUTPUT/patch-${PRGNAM}_dvdread.log
 ./autogen.sh noconfig \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}_dvdread.log
@@ -1395,7 +1395,7 @@ DO_CSS=""
 #  # If we allow patented software, we also link libdvdcss statically into
 #  # libdvdread. Otherwise, you can just install libdvdcss additionally
 #  # and the dvdread library will find and load dvdcss support at runtime.
-#  cat $SRCDIR/libdvdread_static_dvdcss.patch | patch -p0 \
+#  cat $SRCDIR/libdvdread_static_dvdcss.patch | patch -p0 --verbose \
 #    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_dvdread.log
 #  DO_CSS="--with-libdvdcss=$VLCDEPSDIR/usr"
 #else
@@ -1462,7 +1462,7 @@ echo -e "**\n**  libcdio  ...\n**"
 DO_VCD=${1:-" "}
 cd $TMP/tmp-$PRGNAM/libcdio-$CDIO
 ## Patch that allows vlc to detect required libs for cdio:
-#cat $SRCDIR/libcdio-0.80_Makefile.patch | patch -p0 \
+#cat $SRCDIR/libcdio-0.80_Makefile.patch | patch -p0 --verbose \
 #  2>1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 ## Because of patching a .am file, need to reconf:
 #autoreconf -vif
@@ -1988,7 +1988,7 @@ OLDDIR=$(pwd)
 cd $TMP/tmp-$PRGNAM/libraw1394-${RAW1394}
 
 # Or else vlc compilation fails with "error: redefinition of typedef 'byte_t'"
-patch -p0 < $SRCDIR/libraw1394_typedef.patch \
+patch -p0 --verbose < $SRCDIR/libraw1394_typedef.patch \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_raw1394.log
 
 # Seems I need this ugly prefix or else I have to dig into the problem of vlc
@@ -2042,7 +2042,8 @@ echo -e "**\n**"
 cd $TMP/tmp-$PRGNAM/libdc1394-${DC1394}
 
 # Skip building the examples - those cause errors:
-cat $SRCDIR/libdc1394-noexamples.patch | patch -p1 2>&1 | tee $OUTPUT/patch-${PRGNAM}_dc1394.log
+cat $SRCDIR/libdc1394-noexamples.patch | patch -p1 --verbose \
+  2>&1 | tee $OUTPUT/patch-${PRGNAM}_dc1394.log
 
 # Make sure that the static libraw1394 is found in the vlcdeps:
 CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
@@ -2155,38 +2156,37 @@ echo "" >$OUTPUT/patch-${PRGNAM}.log
 # Configure a default Slackware TTF font:
 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
+  | patch -p1 --verbose 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* \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 # Detection of libupnp needs some extra libs:
-cat $SRCDIR/vlc-0.9.0_upnp.patch | patch -p1 \
+cat $SRCDIR/vlc-0.9.0_upnp.patch | patch -p1 --verbose \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
-# Detection of mplayer team's new libdvdread needs a temporary patch:
-cat $SRCDIR/vlc-0.9.0_libdvdread_configure.patch | patch -p1 \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+## Detection of mplayer team's new libdvdread needs a temporary patch:
+#cat $SRCDIR/vlc-0.9.0_libdvdread_configure.patch | patch -p1 --verbose \
+#  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
 # Now works without patching:
 ## Re-enable embedded video. With qt.4.4.3 this should work reliably:
-#cat $SRCDIR/vlc-1.0.0_embedded_video.patch | patch -p1 \
+#cat $SRCDIR/vlc-1.0.0_embedded_video.patch | patch -p1 --verbose \
 #  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 \
+# Make vlc link against a static libx264 (fixed post 1.0.0-pre2)
+cat $SRCDIR/vlc_x264_static.diff | patch -p1 --verbose \
   2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
-# Allow the use of recent x264 on vlc-0.9.x and 1.0.0-pre2 (fixed in 1.0.0-git)
-cat $SRCDIR/vlc-0.9.9_x264_remove_pre_scenecut.diff | patch -p1 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-cat $SRCDIR/vlc-0.9.9_x264_obsolete_pre_scenecut.diff | patch -p1 --verbose \
-  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+# Allow the use of recent x264 on vlc-0.9.x (fixed in 1.0.0-git)
+if [ "$(echo $VERSION|cut -d. -f1-2)" == "0.9" -a "$X264" != "$X264_SAFE" ];
+then
+  cat $SRCDIR/vlc-0.9.9_x264_remove_pre_scenecut.diff | patch -p1 --verbose \
+    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+  cat $SRCDIR/vlc-0.9.9_x264_obsolete_pre_scenecut.diff | patch -p1 --verbose \
+    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+fi
 
 # Fix compilation of mkv plugin on 1.0.0-pre2 (fixed in 1.0.0-git)
 if [ "$VERSION" == "1.0.0.pre2" ]; then