summaryrefslogtreecommitdiffstats
path: root/vlc
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2010-06-16 08:43:29 +0000
committer Eric Hameleers <alien@slackware.com>2010-06-16 08:43:29 +0000
commitc26b08c0fb9dd16950876d5c20707fac45b5e69d (patch)
tree5d435409cc8a12eccbdbce139a23ea6ba45e6367 /vlc
parent9ff9eb391b0f9b00fb18b8934542eecd3a33d1af (diff)
downloadasb-c26b08c0fb9dd16950876d5c20707fac45b5e69d.tar.gz
asb-c26b08c0fb9dd16950876d5c20707fac45b5e69d.tar.xz
Updated to 1.1.0-rc4
Diffstat (limited to 'vlc')
-rwxr-xr-xvlc/build/vlc.SlackBuild15
1 files changed, 5 insertions, 10 deletions
diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index f5c73ef9..4822374e 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -253,6 +253,8 @@
# 1.1.0.rc3-2:13/jun/2010 by Eric Hameleers <alien@slackware.com>
# * Add a patch to fix the VAAPI segfaults. My debugger backtrace
# allowed fenrir to spot and repair the bug.
+# 1.1.0.rc4-1:16/jun/2010 by Eric Hameleers <alien@slackware.com>
+# * Update to RC4 for the upcoming 1.1.0 release.
#
# Run 'sh vlc.SlackBuild' to build a Slackware package.
# The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -276,7 +278,7 @@
PRGNAM=vlc
PRGNAM2=mozplugin
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
TAG=${TAG:-"alien"}
PKGTYPE=${PKGTYPE:-"txz"}
@@ -299,7 +301,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.0-rc3"}
+VERSION=${VERSION:-"1.1.0-rc4"}
# At some point, the 1.1 development branched off the master tree:
DEFGITURI=${GITURI:-"git://git.videolan.org/vlc.git"}
@@ -2855,12 +2857,6 @@ if [ -d $VLCDEPSDIR/usr/share/vlc/projectM ]; then
$(grep -lr 'usr/share/fonts/truetype/ttf-dejavu' .)
fi
-# Fix our VAAPI crash (happens when you have libva installed and play a video
-# type that has GPU hardware-acceleration through vaapi)
-# - fixed in 1.1.0:
-cat $SRCDIR/vlc-1.1.0.vaapi.patch | patch -p1 --verbose \
- 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
-
# VLC 0.9.6 but also 0.9.9 needs to regenerate libtool (known bug)
if ls m4/lt*.m4 1>/dev/null 2>/dev/null ; then
rm -f m4/{lt,lib}*.m4; autoreconf -svif
@@ -3293,7 +3289,6 @@ else
build_mozplugin
fi
- # Pack all this stuff into a Slackware package (this routine also will execute
- # the '--cleanup' functionality if requested):
+ # Pack all this stuff into a Slackware package:
build_slackpkg "$*"
fi