summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2020-09-16 20:57:00 +0000
committer Eric Hameleers <alien@slackware.com>2020-09-16 20:57:00 +0000
commit6ecd3b688f1432e9b191bf6a2c7d754cd44e997e (patch)
tree8837ae3d6b58b91fe7cf0f5afc52849c13fccb5a
parent4388173e41f4c8f157d83e60b1ab0978e736eafe (diff)
downloadasb-6ecd3b688f1432e9b191bf6a2c7d754cd44e997e.tar.gz
asb-6ecd3b688f1432e9b191bf6a2c7d754cd44e997e.tar.xz
vlc: updated to 3.0.11.1.
Updated internal libraries: dav1d, ebml, matroska, vpx
-rwxr-xr-xvlc/build/vlc.SlackBuild17
1 files changed, 11 insertions, 6 deletions
diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index 5fb77f84..c0d954b0 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -540,10 +540,10 @@ SLACKVER=${SLACKVER:-$(cat /etc/slackware-version| cut -d' ' -f2)}
# -----------------------------------------------------------------------------
VLCBRANCH=${VLCBRANCH:-"3.0"}
-VLCMINOR=${VLCMINOR:-"10"}
DEFGITURI=${GITURI:-"git://git.videolan.org/vlc/vlc-${VLCBRANCH}.git"}
-VERSION=${VERSION:-"3.0.10"}
+VERSION=${VERSION:-"3.0.11.1"}
PKGVERSION=${VERSION}
+#VLCMINOR=${VLCMINOR:-"11.1"}
#PKGVERSION=${PKGVERSION:-"${VLCBRANCH}.${VLCMINOR}"}
DOCS="ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS README THANKS"
@@ -645,7 +645,7 @@ AVC1394=0.5.4
BLURAY=1.2.0
CDDB=1.3.2
CDIO=0.90
-DAV1D=0.6.0
+DAV1D=0.7.1
DC1394=2.2.1
DCA=0.0.7
DSM=0.3.2
@@ -654,7 +654,7 @@ DVBPSI=1.3.2
DVDNAV=6.1.0
DVDREAD=6.1.1
DVDCSS=1.4.2
-EBML=1.3.10
+EBML=1.4.0
FAAC=1.28
FFMPEG=eaff5fc # ffmpeg3 git snapshot 06 dec 2017
FLUID=1.1.6
@@ -668,7 +668,7 @@ LAME=3.100
LIBVA=2.0.0
LIVE=2016.11.28
LUA=5.1.5
-MATROSKA=1.5.2
+MATROSKA=1.6.0
MDNS=0.1.2
MPCDEC=r481
MPEG2DEC=0.5.1
@@ -689,7 +689,7 @@ TIGER=0.3.4
TWOLAME=0.3.13
UPNP=1.6.19
VDPAU=1.1.1
-VPX=1.8.2
+VPX=1.9.0
X262=20180907
X264=20180907-2245
X265=2.7
@@ -3433,6 +3433,7 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
LDFLAGS="$SLKLDFLAGS" \
meson build \
+ -Dauto_features=disabled \
--default-library=static \
--prefix=$VLCDEPSDIR/usr \
--libdir=$VLCDEPSDIR/usr/lib${LIBDIRSUFFIX} \
@@ -4041,6 +4042,10 @@ echo "" >$OUTPUT/patch-${PRGNAM}.log
cat $SRCDIR/patches/vlc_qt5static.patch | patch -p1 --verbose \
2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+# Add an extra include to support Qt 5.15 (fixed post VLC 3.0.11.1):
+cat $SRCDIR/patches/vlc_qt515.patch | patch -p1 --verbose \
+ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
+
# Make x264 module compatible with x264 versions (X264_BUILD) newer than 153
# (no longer needed for vlc > 3.0.4):
#cat $SRCDIR/patches/vlc_x264_153api.patch | patch -p1 --verbose \