summaryrefslogtreecommitdiffstats
path: root/vlc
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2021-12-03 18:06:18 +0000
committer Eric Hameleers <alien@slackware.com>2021-12-03 18:06:18 +0000
commitf2a4ce5e7a75dae9fc916d1e412793d7bb1d6240 (patch)
tree2c2c705cae27e5cf42738118b55879796a08dd7d /vlc
parenta525a97421bb4aec5156086c9c5ea4a6566a426d (diff)
downloadasb-f2a4ce5e7a75dae9fc916d1e412793d7bb1d6240.tar.gz
asb-f2a4ce5e7a75dae9fc916d1e412793d7bb1d6240.tar.xz
vlc: update to 3.0.16.
Also updated internal libraries: bluray, dav1d, dvdnav, dvdread, dvdcss, ebml, libva, matroska, opus, pcre2, speexdsp, ssh2, upnp, vpx. Added patches to internal ffmpeg.
Diffstat (limited to 'vlc')
-rwxr-xr-xvlc/build/vlc.SlackBuild53
1 files changed, 32 insertions, 21 deletions
diff --git a/vlc/build/vlc.SlackBuild b/vlc/build/vlc.SlackBuild
index e48bd24e..2db4f932 100755
--- a/vlc/build/vlc.SlackBuild
+++ b/vlc/build/vlc.SlackBuild
@@ -491,6 +491,10 @@
# dav1d, ebml, matroska, vpx
# 3.0.12-1 23/jan/2021 by Eric Hameleers <alien@slackware.com>
# * Update. Also updated internal libraries: bluray, dav1d.
+# 3.0.16-1 03/dec/2021 by Eric Hameleers <alien@slackware.com>
+# * Update. Also updated internal libraries: bluray, dav1d,
+# dvdnav, dvdread, dvdcss, ebml, libva, matroska, opus, pcre2,
+# speexdsp, ssh2, vpx. Added patches to internal ffmpeg.
#
# Run 'sh vlc.SlackBuild' to build a Slackware package.
# The package (.txz) plus descriptive .txt file are created in /tmp .
@@ -546,9 +550,9 @@ SLACKVER=${SLACKVER:-$(cat /etc/slackware-version| cut -d' ' -f2)}
VLCBRANCH=${VLCBRANCH:-"3.0"}
DEFGITURI=${GITURI:-"git://git.videolan.org/vlc/vlc-${VLCBRANCH}.git"}
-VERSION=${VERSION:-"3.0.12"}
+VERSION=${VERSION:-"3.0.16"}
PKGVERSION=${VERSION}
-#VLCMINOR=${VLCMINOR:-"12"}
+#VLCMINOR=${VLCMINOR:-"16"}
#PKGVERSION=${PKGVERSION:-"${VLCBRANCH}.${VLCMINOR}"}
DOCS="ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS README THANKS"
@@ -647,19 +651,19 @@ AMR=0.1.3
ASDCPLIB=2.7.19
ASS=0.14.0
AVC1394=0.5.4
-BLURAY=1.2.1
+BLURAY=1.3.0
CDDB=1.3.2
CDIO=0.90
-DAV1D=0.8.1
+DAV1D=0.9.0
DC1394=2.2.1
DCA=0.0.7
DSM=0.3.2
DV=1.0.0
DVBPSI=1.3.2
-DVDNAV=6.1.0
-DVDREAD=6.1.1
-DVDCSS=1.4.2
-EBML=1.4.0
+DVDNAV=6.1.1
+DVDREAD=6.1.2
+DVDCSS=1.4.3
+EBML=1.4.2
FAAC=1.28
FFMPEG=eaff5fc # ffmpeg3 git snapshot 06 dec 2017
FLUID=1.1.6
@@ -670,31 +674,31 @@ GOOM=2k4-0
GSM=1.0.16
KATE=0.4.1
LAME=3.100
-LIBVA=2.0.0
+LIBVA=2.13.0
LIVE=2016.11.28
LUA=5.1.5
-MATROSKA=1.6.0
+MATROSKA=1.6.3
MDNS=0.1.2
MPCDEC=r481
MPEG2DEC=0.5.1
-OPUS=1.2.1
-PCRE2=10.31
+OPUS=1.3
+PCRE2=10.39
PROJECTM=2.0.1
PROTOBUF=3.1.0
QT5=5.7.1
RAW1394=2.0.5
SHOUT=2.4.1
SPEEX=1.2.0
-SPEEXDSP=1.2rc3
+SPEEXDSP=1.2.0
SRT=1.2.2
-SSH2=1.8.0
+SSH2=1.10.0
TAGLIB=1.11.1
THEORA=1.1.1
TIGER=0.3.4
TWOLAME=0.3.13
-UPNP=1.6.19
+UPNP=1.6.19 # pinned by VLC devs?
VDPAU=1.1.1
-VPX=1.9.0
+VPX=1.11.0
X262=20180907
X264=20180907-2245
X265=2.7
@@ -971,7 +975,7 @@ USE[34]="YES"
# VAAPI for video hardware acceleration:
SOURCE[35]="$SRCDIR/sources/libva-${LIBVA}.tar.bz2"
-SRCURL[35]="https://github.com/01org/libva/releases/download/${LIBVA}/libva-${LIBVA}.tar.bz2"
+SRCURL[35]="https://github.com/intel/libva/releases/download/${LIBVA}/libva-${LIBVA}.tar.bz2"
SRCPAT[35]="NO"
USE[35]="YES"
@@ -1624,6 +1628,11 @@ cat $SRCDIR/patches/ffmpeg_avcodec_h264_slice_sei_params.patch | patch -p1 --ver
# Backport VP9 profile 10-bit support:
cat $SRCDIR/patches/ffmpeg_avcodec_vp9_10bit_support.patch | patch -p1 --verbose \
2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log
+# Fix crash on use after free buffer in MPEG2 DXVA
+cat $SRCDIR/patches/ffmpeg_mpeg12dec-dont-call-hw-end_frame-when-start.patch \
+ | patch -p1 --verbose 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ffmpeg.log
+cat $SRCDIR/patches/ffmpeg_mpeg12dec-dont-end-slice-without-first_slice.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"
@@ -1858,6 +1867,10 @@ touch $OUTPUT/patch-${PRGNAM}_ebml.log
# cat $SRCDIR/patches/ebml_limits.patch | patch -p1 --verbose \
# 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ebml.log
#fi
+if [ $(gcc -dumpversion |cut -d'.' -f1) -ge 11 ]; then
+ cat $SRCDIR/patches/ebml_gcc11.patch | patch -p1 --verbose \
+ 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ebml.log
+fi
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS -fexceptions -fvisibility=hidden"
@@ -2284,8 +2297,8 @@ echo -e "\n**\n**\n"
make install 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_upnp.log
# Add DOCS to the vlcdeps to have it added to vlc package later:
mkdir -p $VLCDEPSDIR/doc/libupnp/
-cp AUTHORS COPYING ChangeLog LICENSE NEWS README THANKS TODO \
- $VLCDEPSDIR/doc/libupnp/ || true
+cp COPYING ChangeLog THANKS \
+ $VLCDEPSDIR/doc/libupnp/ || true
cd -
}
@@ -3683,8 +3696,6 @@ cd $TMP/tmp-$PRGNAM/libssh2-${SSH2}
touch $OUTPUT/patch-${PRGNAM}_ssh2.log
cat $SRCDIR/patches/libssh2_notests.patch | patch -p1 --verbose \
2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ssh2.log
-cat $SRCDIR/patches/libssh2_libgcrypt.patch | patch -p1 --verbose \
- 2>&1 | tee -a $OUTPUT/patch-${PRGNAM}_ssh2.log
pkg_static "libssh2.pc.in"