summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2009-05-11 20:43:06 +0000
committer Eric Hameleers <alien@slackware.com>2009-05-11 20:43:06 +0000
commitf7efd0bf0f204155d5fdd3bc000f80f1dc0b808b (patch)
treebc663abcfa5f121e7d86c0b1ff4797d682a8dd11
parent22afbbf1da7df7fe1315e961431c5fce84abefb2 (diff)
downloadasb-f7efd0bf0f204155d5fdd3bc000f80f1dc0b808b.tar.gz
asb-f7efd0bf0f204155d5fdd3bc000f80f1dc0b808b.tar.xz
Update to 1.0.0 RC1
-rwxr-xr-xvlc/build/vlc-1.0.SlackBuild14
1 files changed, 8 insertions, 6 deletions
diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index bbc12ece..a28bc95b 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -155,6 +155,8 @@
# * This is 1.0.0-pre2. I like it much more than the
# 'stable' 0.9.x. Furthermore, DVD playback was broken in
# my 0.9.9 package, so I needed to release an update.
+# 1.0.0.rc1-1: 11/may/2009 by Eric Hameleers <alien@slackware.com>
+# * The first release candidate for 1.0.0
#
# Run 'sh vlc.SlackBuild --cleanup' to build a Slackware package.
# The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -185,7 +187,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:-"1.0.0-pre2"}
+SRCVER=${SRCVER:-"1.0.0-rc1"}
#SRCVER=${SRCVER:-"20090114"}
#SRCVER=${SRCVER:-"HEAD"}
VERSION=${VERSION:-$(echo $SRCVER | tr '-' '.')}
@@ -2174,9 +2176,9 @@ cat $SRCDIR/vlc-0.9.0_upnp.patch | patch -p1 --verbose \
#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 post 1.0.0-pre2)
-cat $SRCDIR/vlc_x264_static.diff | patch -p1 --verbose \
- 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+## 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 (fixed in 1.0.0-git)
if [ "$(echo $VERSION|cut -d. -f1-2)" == "0.9" -a "$X264" != "$X264_SAFE" ];
@@ -2192,8 +2194,8 @@ fi
cat $SRCDIR/vlc-1.0.0_fixgettext.diff | patch -p1 --verbose \
2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-# 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 \
+# I want 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 --verbose \
2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
# Preparations for building a separate vlc mozilla plugin :