summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2011-08-02 08:19:26 +0000
committer Eric Hameleers <alien@slackware.com>2011-08-02 08:19:26 +0000
commit5ef23a15931ae5af42105a7998381bce9d56cf0d (patch)
treeafe07a75a9f9b2c12721fd55d078372a65ad6275
parentf5d1f00917be3bbf308efbd45691c4bad5080bf9 (diff)
downloadasb-5ef23a15931ae5af42105a7998381bce9d56cf0d.tar.gz
asb-5ef23a15931ae5af42105a7998381bce9d56cf0d.tar.xz
Updated with working download URLs for ggi and xulrunner
-rwxr-xr-xvlc/build/vlc.SlackBuild25
1 files changed, 20 insertions, 5 deletions
diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index d9a810fa..dc2294ec 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -296,7 +296,11 @@
# * New release.
# 1.1.10-1: 06/jun/2011 by Eric Hameleers <alien@slackware.com>
# * New release.
-# Also updated live555, libebml, libmatroska and x264 libraries.
+# 1.1.11-1: 24/jul/2011 by Eric Hameleers <alien@slackware.com>
+# * Critical bugfix release (fixes CVE-2011-2587 and CVE-2588).
+# 1.1.11-2: 30/jul/2011 by Eric Hameleers <alien@slackware.com>
+# * Quickfix for the broken youtube support (after the youtube guys
+# updated their web site).
#
# Run 'sh vlc.SlackBuild' to build a Slackware package.
# The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -320,7 +324,7 @@
PRGNAM=vlc
PRGNAM2=mozplugin
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-"alien"}
PKGTYPE=${PKGTYPE:-"txz"}
@@ -343,7 +347,7 @@ PKGTYPE=${PKGTYPE:-"txz"}
#VERSION=${VERSION:-"@1.1.0-bugfix#20100414"}
#VERSION=${VERSION:-"master@git://git.videolan.org/vlc/vlc-1.1.git#20100523"}
-VERSION=${VERSION:-"1.1.10"}
+VERSION=${VERSION:-"1.1.11"}
# At some point, the 1.1 development branched off the master tree:
DEFGITURI=${GITURI:-"git://git.videolan.org/vlc.git"}
@@ -719,7 +723,7 @@ USE[25]="YES"
# GGI, output plugin
SOURCE[26]="$SRCDIR/ggi-${GGI}-bundle.src.tar.bz2"
-SRCURL[26]="http://www.ggi-project.org/ftp/ggi/v2.2/ggi-${GGI}-bundle.src.tar.bz2"
+SRCURL[26]="http://sourceforge.net/projects/ggi/files/bundle/GGI-${GGI}/ggi-${GGI}-bundle.src.tar.gz/download"
SRCPAT[26]="NO"
USE[26]="YES"
@@ -821,7 +825,7 @@ USE[42]="YES"
# Mozilla xulrunner is used to build the browser plugin:
SOURCE[43]="$SRCDIR/xulrunner-${XUL}.source.tar.bz2"
-SRCURL[43]="http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/${XUL}/source/xulrunner-${XUL}.source.tar.bz2"
+SRCURL[43]="http://ftp.mozilla.org/pub/mozilla.org/mozilla.org/xulrunner/releases/${XUL}/source/xulrunner-${XUL}.source.tar.bz2"
SRCPAT[43]="NO"
USE[43]="YES"
@@ -2886,6 +2890,17 @@ if [ "$(echo $VERSION |cut -d. -f1-2)" = "1.0" ]; then
2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
fi
+# Fix youtube support in 1.1.11
+if [ "$VERSION" = "1.1.11" ]; then
+ cat $SRCDIR/vlc-1.1.11_youtube.patch | patch -p1 --verbose \
+ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+fi
+
+# Patch the dc1394 plugin (vlc 1.0.x) to use the new libdc1394 2.x API:
+# Allow older taglib versions (like the one in Slackware 13.0):
+cat $SRCDIR/vlc_oldtaglib.diff | patch -p1 --verbose \
+ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+
# Only enable DLL loader on ELF ix86 platforms:
if [ "$ARCH" == "i486" -o "$ARCH" == "i686" ]; then
DO_LOADER="--enable-loader"