summaryrefslogtreecommitdiffstats
path: root/vlc
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2018-02-09 15:17:56 +0000
committer Eric Hameleers <alien@slackware.com>2018-02-09 15:17:56 +0000
commitceef63a9e46a6e5401d5cc65d704cbf616c94732 (patch)
tree2a356f6bb4d1db562bb8c87a2aa05c126cee62d9 /vlc
parentf4f7527da6d9f7c1f496d132823de2ab22ed1c11 (diff)
downloadasb-ceef63a9e46a6e5401d5cc65d704cbf616c94732.tar.gz
asb-ceef63a9e46a6e5401d5cc65d704cbf616c94732.tar.xz
vlc: updated to 3.0.0 stable
Diffstat (limited to 'vlc')
-rwxr-xr-xvlc/build/vlc.SlackBuild28
1 files changed, 19 insertions, 9 deletions
diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index d8986c6e..28b76174 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -458,6 +458,10 @@
# - Incorporating static Qt libraries into the package is
# no longer supported by the SlackBuild. You need to install
# libxkbcommon, qt5, qt5-webkit packages separately.
+# 20180120-1 21/jan/2018 by Eric Hameleers <alien@slackware.com>
+# * VLC 3.0.0 RC7 testing.
+# 3.0.0-1 09/feb/2018 by Eric Hameleers <alien@slackware.com>
+# * VLC 3.0.0 released!
#
# Run 'sh vlc.SlackBuild' to build a Slackware package.
# The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -504,7 +508,7 @@ SLACKVER=${SLACKVER:-$(cat /etc/slackware-version| cut -d' ' -f2)}
#VERSION=${VERSION:-"20180103"}
#VERSION=${VERSION:-"HEAD"}
#VERSION=${VERSION:-"master#20180103"}
-#VERSION=${VERSION:-"@3.0.0-rc4#20180102"}
+#VERSION=${VERSION:-"@3.0.0#20180102"}
#VERSION=${VERSION:-"master@git://git.videolan.org/vlc/vlc-3.0.git#20180102"}
#
# And then you can specify a package version explicitly if you want to
@@ -513,11 +517,11 @@ SLACKVER=${SLACKVER:-$(cat /etc/slackware-version| cut -d' ' -f2)}
# -----------------------------------------------------------------------------
VLCBRANCH=${VLCBRANCH:-"3.0"}
-VLCMINOR=${VLCMINOR:-"0.rc6"}
+VLCMINOR=${VLCMINOR:-"0"}
DEFGITURI=${GITURI:-"git://git.videolan.org/vlc/vlc-${VLCBRANCH}.git"}
-VERSION=${VERSION:-"20180119"}
-#PKGVERSION=${VERSION}
-PKGVERSION=${PKGVERSION:-"${VLCBRANCH}.${VLCMINOR}"}
+VERSION=${VERSION:-"3.0.0"}
+PKGVERSION=${VERSION}
+#PKGVERSION=${PKGVERSION:-"${VLCBRANCH}.${VLCMINOR}"}
DOCS="ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS README THANKS"
@@ -618,7 +622,7 @@ DCA=0.0.5
DSM=0.2.8
DV=1.0.0
DVBPSI=1.3.1
-DVDNAV=5.0.3
+DVDNAV=6.0.0
DVDREAD=6.0.0
DVDCSS=1.4.1
EBML=1.3.5
@@ -639,7 +643,7 @@ MATROSKA=1.4.8
MDNS=0.0.8
MPCDEC=r481
MPEG2DEC=0.5.1
-NPAPI=20180119
+NPAPI=20180209
OPUS=1.2.1
PROJECTM=2.0.1
QT4=4.8.7
@@ -656,8 +660,8 @@ TWOLAME=0.3.13
UPNP=1.6.19
VDPAU=1.1.1
VPX=1.6.1
-X262=20180119
-X264=20180118-2245
+X262=20180204
+X264=20180203-2245
X265=2.5
# Where do we look for sources?
@@ -1540,6 +1544,9 @@ touch $OUTPUT/patch-${PRGNAM}_ffmpeg.log
# Prevent a crash in DVXA in interlaced VC-1:
cat $SRCDIR/patches/ffmpeg_dxva_vc1_crash.patch | patch -p1 --verbose \
2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log
+# Fix SAR not set early enough when starting the decoder:
+cat $SRCDIR/patches/ffmpeg_h264_early_SAR.patch | patch -p1 --verbose \
+ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log
if pkg-config --exists libopenjp2 1>/dev/null 2>/dev/null ; then
USE_OPENJPEG="--enable-libopenjpeg"
@@ -2149,6 +2156,9 @@ cat $SRCDIR/patches/libupnp_dont_use_down_intf.patch \
| patch -p1 --verbose --ignore-whitespace \
2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_upnp.log
+autoreconf -vif \
+ 2>&1 | tee $OUTPUT/autoreconf-${PRGNAM}_upnp.log
+
CFLAGS="$SLKCFLAGS -DUPNP_STATIC_LIB" \
CXXFLAGS="$SLKCFLAGS -DUPNP_STATIC_LIB" \
LDFLAGS="$SLKLDFLAGS" \