summaryrefslogtreecommitdiffstats
path: root/vlc
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2009-05-27 17:51:25 +0000
committer Eric Hameleers <alien@slackware.com>2009-05-27 17:51:25 +0000
commite2295c453ab5bd0f00d1b4aa35dd3feb5a7eac9e (patch)
tree6d353e35893d8ddc69e4e290e28d20b5ecee03df /vlc
parentcf14c74f4faeb2527c62b8d2fa047e1a3e5b09b8 (diff)
downloadasb-e2295c453ab5bd0f00d1b4aa35dd3feb5a7eac9e.tar.gz
asb-e2295c453ab5bd0f00d1b4aa35dd3feb5a7eac9e.tar.xz
UPdated to 1.0.0-rc2
Diffstat (limited to 'vlc')
-rwxr-xr-xvlc/build/vlc-1.0.SlackBuild16
1 files changed, 6 insertions, 10 deletions
diff --git a/vlc/build/vlc-1.0.SlackBuild b/vlc/build/vlc-1.0.SlackBuild
index a28bc95b..5cf29ff6 100755
--- a/vlc/build/vlc-1.0.SlackBuild
+++ b/vlc/build/vlc-1.0.SlackBuild
@@ -157,8 +157,10 @@
# 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
+# 1.0.0.rc2-1: 26/may/2009 by Eric Hameleers <alien@slackware.com>
+# * The second release candidate for 1.0.0
#
-# Run 'sh vlc.SlackBuild --cleanup' to build a Slackware package.
+# Run 'sh vlc.SlackBuild' to build a Slackware package.
# The package (.tgz) plus descriptive .txt file are created in /tmp .
# Install using 'installpkg'.
#
@@ -187,7 +189,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-rc1"}
+SRCVER=${SRCVER:-"1.0.0-rc2"}
#SRCVER=${SRCVER:-"20090114"}
#SRCVER=${SRCVER:-"HEAD"}
VERSION=${VERSION:-$(echo $SRCVER | tr '-' '.')}
@@ -326,7 +328,7 @@ VCD=0.7.23
X264_SAFE=20080301-2245 # In later versions nasm complains
# about 'function hidden'
#X264=20090113-2245 # Needs yasm installed
-X264=20090419-2245 # Needs yasm installed
+X264=20090526-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):
@@ -2046,7 +2048,7 @@ cd $TMP/tmp-$PRGNAM/libdc1394-${DC1394}
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:
+# Make sure that the static libdc1394 is found in the vlcdeps:
CFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
CPPFLAGS="$SLKCFLAGS -I$VLCDEPSDIR/usr/include" \
LDFLAGS="$SLKLDFLAGS -L$VLCDEPSDIR/usr/lib" \
@@ -2482,12 +2484,6 @@ if [ -f $PKG/install/slack-required ]; then
cat $PKG/install/slack-required > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.dep
fi
-# Clean up the extra stuff:
-if [ "$P1" = "--cleanup" ]; then
- rm -rf $TMP/tmp-$PRGNAM
- rm -rf $PKG
- rm -rf $PKG2
-fi
}
# -----------------------------------------------------------------------------