diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | vlc-3.0.11.1-srt_1.4.2.patch | 24 |
3 files changed, 37 insertions, 8 deletions
@@ -1,7 +1,7 @@ pkgbase = vlc-nox pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player (without X support) pkgver = 3.0.11.1 - pkgrel = 1 + pkgrel = 2 url = https://www.videolan.org/vlc/ arch = x86_64 license = LGPL2.1 @@ -73,13 +73,13 @@ pkgbase = vlc-nox depends = libmpcdec depends = ffmpeg depends = faad2 - depends = libupnp depends = libmad depends = libmpeg2 depends = xcb-util-keysyms depends = libtar depends = libxinerama depends = libsecret + depends = libupnp depends = libarchive depends = freetype2 depends = fribidi @@ -159,9 +159,11 @@ pkgbase = vlc-nox source = http://download.videolan.org/vlc/3.0.11.1/vlc-3.0.11.1.tar.xz source = update-vlc-plugin-cache.hook source = lua53_compat.patch + source = vlc-3.0.11.1-srt_1.4.2.patch sha512sums = 8ce1e2f11aabf847dc5c55cf21ce6d7c0419a1051b5f4795e36cd060eab82d5056e44b4c070b80af56744e6aa841ef538386d08bc3b397a444e7258b2ba3f76b sha512sums = b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3 sha512sums = 33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f + sha512sums = 090c75878894f89184179f534da503a78234cf4f0f5af602873ea2ba6b68326afed71ef6160d1352bdd5c05e45b36bfcd23b7286d5111a900b7c11829642ae0d pkgname = vlc-nox @@ -8,16 +8,16 @@ _pkgbase=vlc pkgname=vlc-nox pkgver=3.0.11.1 -pkgrel=1 +pkgrel=2 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player (without X support)' url='https://www.videolan.org/vlc/' arch=('x86_64') license=('LGPL2.1' 'GPL2') depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'lua' 'libidn' - 'libmatroska' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 'libmad' + 'libmatroska' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar' 'libxinerama' 'libsecret' - 'libarchive' 'freetype2' 'fribidi' 'harfbuzz' 'fontconfig' 'libxml2' - 'gnutls' 'libplacebo' 'aribb24') + 'libupnp' 'libarchive' 'freetype2' 'fribidi' 'harfbuzz' + 'fontconfig' 'libxml2' 'gnutls' 'libplacebo' 'aribb24') makedepends=('live-media' 'libbluray' 'flac' 'libdc1394' 'libavc1394' 'libcaca' 'librsvg' 'libgme' 'xosd' 'twolame' 'aalib' 'avahi' 'systemd-libs' 'libmtp' 'libupnp' 'libmicrodns' 'libdvdcss' 'smbclient' @@ -92,16 +92,19 @@ replaces=('vlc' 'vlc-plugin' 'vlc-git') options=('!emptydirs') source=(http://download.videolan.org/${_pkgbase}/${pkgver}/${_pkgbase}-${pkgver}.tar.xz update-vlc-plugin-cache.hook - lua53_compat.patch) + lua53_compat.patch + vlc-3.0.11.1-srt_1.4.2.patch) sha512sums=('8ce1e2f11aabf847dc5c55cf21ce6d7c0419a1051b5f4795e36cd060eab82d5056e44b4c070b80af56744e6aa841ef538386d08bc3b397a444e7258b2ba3f76b' 'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3' - '33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f') + '33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f' + '090c75878894f89184179f534da503a78234cf4f0f5af602873ea2ba6b68326afed71ef6160d1352bdd5c05e45b36bfcd23b7286d5111a900b7c11829642ae0d') prepare() { cd "${srcdir}/${_pkgbase}-${pkgver}" sed -e 's:truetype/ttf-dejavu:TTF:g' -i modules/visualization/projectm.cpp sed -e 's|-Werror-implicit-function-declaration||g' -i configure patch -Np1 < "${srcdir}/lua53_compat.patch" + patch -Np1 < "${srcdir}/vlc-3.0.11.1-srt_1.4.2.patch" sed 's|whoami|echo builduser|g' -i configure sed 's|hostname -f|echo arch|g' -i configure } diff --git a/vlc-3.0.11.1-srt_1.4.2.patch b/vlc-3.0.11.1-srt_1.4.2.patch new file mode 100644 index 000000000000..cadfa0edf81e --- /dev/null +++ b/vlc-3.0.11.1-srt_1.4.2.patch @@ -0,0 +1,24 @@ +diff -ruN a/modules/access/srt.c b/modules/access/srt.c +--- a/modules/access/srt.c 2018-04-23 10:03:39.000000000 +0200 ++++ b/modules/access/srt.c 2020-09-26 10:35:18.830149487 +0200 +@@ -165,7 +165,7 @@ + + /* Set latency */ + i_latency = var_InheritInteger( p_stream, "latency" ); +- srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY, ++ srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY, + &i_latency, sizeof( int ) ); + + psz_passphrase = var_InheritString( p_stream, "passphrase" ); +diff -ruN a/modules/access_output/srt.c b/modules/access_output/srt.c +--- a/modules/access_output/srt.c 2018-04-06 11:22:51.000000000 +0200 ++++ b/modules/access_output/srt.c 2020-09-26 10:35:03.386828120 +0200 +@@ -162,7 +162,7 @@ + + /* Set latency */ + i_latency = var_InheritInteger( p_access, "latency" ); +- srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY, ++ srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY, + &i_latency, sizeof( int ) ); + + if ( psz_passphrase != NULL && psz_passphrase[0] != '\0') |