Start working on 1.0.0.pre2

1 files changed, 32 insertions, 10 deletions

diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index 0b0f7e31..5f66f26a 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -151,6 +151,9 @@
 # 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.
+# 20090417-1: 17/apr/2009 by Eric Hameleers <alien@slackware.com>
+#             * This is actually 1.0.0-pre2. I like it much more than the
+#               'stable' 0.9.x
 # 
 # Run 'sh vlc.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -181,7 +184,7 @@ 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"}
+SRCVER=${SRCVER:-"1.0.0-pre2"}
 #SRCVER=${SRCVER:-"20090114"}
 #SRCVER=${SRCVER:-"HEAD"}
 VERSION=${VERSION:-$(echo $SRCVER | tr '-' '.')}
@@ -307,10 +310,10 @@ LIVE=latest
 MATROSKA=0.8.1
 MPCDEC=1.2.6
 MPEG2DEC=0.5.1
-OIL=0.3.15
+OIL=0.3.16
 QT4=4.4.3
 RAW1394=1.3.0
-SCHROEDINGER=1.0.5
+SCHROEDINGER=1.0.6
 SHOUT=2.2.2
 SPEEX=1.2rc1
 THEORA=1.0
@@ -320,7 +323,7 @@ VCD=0.7.23
 X264_SAFE=20080301-2245 # In later versions nasm complains
                         #   about 'function hidden'
 #X264=20090113-2245      # Needs yasm installed
-X264=20090329-2245      # Needs yasm installed
+X264=20090416-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):
@@ -1630,6 +1633,8 @@ make_oil()
 {
 echo -e "**\n**  oil ...\n**"
 cd $TMP/tmp-$PRGNAM/liboil-$OIL
+cat $SRCDIR/liboil-noshared.patch | patch -p1 --verbose \
+  2>&1 | tee $OUTPUT/patch_${PRGNAM}_oil.log
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 LDFLAGS="$SLKLDFLAGS" \
@@ -2177,17 +2182,30 @@ cat $SRCDIR/vlc-0.9.0_libdvdread_configure.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
+if [ "$(echo $VERSION|cut -d. -f1-2)" == "0.9" ]; then
+  cat $SRCDIR/vlc_x264_static.diff | patch -p1 \
+    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+fi
 
-# 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 \
+# Allow the use of a 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 \
+  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
+  cat $SRCDIR/vlc-1.0.0_fixmkv.diff | patch -p1 --verbose \
+    2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+fi
+
+# Revert two commits to be able to compile VLC on Slackware 12.2 (glibc 2.7):
+cat $SRCDIR/vlc-1.0.0_allow_older_glibc.diff | patch -p1 -R --verbose \
+  2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+
 # Preparations for building a separate vlc mozilla plugin :
 if [ "$MOZPLUGIN" == "YES" ]; then
   echo "+++ Building mozilla plugin using $MOZBROWSER sdk +++"
@@ -2421,6 +2439,10 @@ done
 mkdir -p $PKG/usr/man/man1
 gzip -9c doc/vlc.1 > $PKG/usr/man/man1/vlc.1.gz
 
+# Add a vlc log syntax definition file for vim:
+mkdir -p $PKG/$(cd /usr/share/vim/vim*/syntax ; pwd)
+cp extras/analyser/vlc.vim $PKG/$(cd /usr/share/vim/vim*/syntax ; pwd)/
+
 # Add package documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 mv $PKG/usr/share/doc/vlc/* $PKG/usr/doc/$PRGNAM-$VERSION || true