diff options
author | Booloki | 2021-05-10 14:35:28 +0200 |
---|---|---|
committer | Booloki | 2021-05-10 14:35:28 +0200 |
commit | 393af9a959c8d1c75d9a4108c0dfc96e1a9ba849 (patch) | |
tree | 18fb84a2ade14d5fbc5e97d0f2301bd52f330a08 | |
parent | df3f952af5c0e967acd6847d85aa7f2b34e439cc (diff) | |
download | aur-393af9a959c8d1c75d9a4108c0dfc96e1a9ba849.tar.gz |
Update to version 3.0.13 with patch
-rw-r--r-- | .SRCINFO | 12 | ||||
-rw-r--r-- | PKGBUILD | 15 | ||||
-rw-r--r-- | lua53_compat.patch | 30 | ||||
-rw-r--r-- | vlc-3.0.11.1-srt_1.4.2.patch | 12 | ||||
-rw-r--r-- | vlc-live-media-2021.patch | 26 |
5 files changed, 52 insertions, 43 deletions
@@ -1,6 +1,6 @@ pkgbase = vlc-nox pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player (without X support) - pkgver = 3.0.12 + pkgver = 3.0.13 pkgrel = 1 url = https://www.videolan.org/vlc/ arch = x86_64 @@ -162,14 +162,14 @@ pkgbase = vlc-nox replaces = vlc-plugin replaces = vlc-git options = !emptydirs - source = http://download.videolan.org/vlc/3.0.12/vlc-3.0.12.tar.xz + source = http://download.videolan.org/vlc/3.0.13/vlc-3.0.13.tar.xz source = update-vlc-plugin-cache.hook - source = lua53_compat.patch source = vlc-3.0.11.1-srt_1.4.2.patch - sha512sums = ebec92bf732540be117551e94613747c53514ade7e280167c08400375738df9a01ee0e5d7c7733aca151a4f80f1c7163fd41318f2cc80b04a3201f0ba697e5df + source = vlc-live-media-2021.patch + sha512sums = 0badca9d71b682b1dd6f05acab48d77baffe22e6a00be6db2a790644bab74738f9807e889fd0348af72628694b5210896638ac2cd99d0efc0e1c2cef7ab28bff sha512sums = b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3 - sha512sums = 33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f - sha512sums = 090c75878894f89184179f534da503a78234cf4f0f5af602873ea2ba6b68326afed71ef6160d1352bdd5c05e45b36bfcd23b7286d5111a900b7c11829642ae0d + sha512sums = ac1d33d434aca2a0ad6e70800073deeaefc02b8fd72656b682ca833ee0cffe10dfa19a9355388700cab46ffbf9421c007d00ed04c7fa562698ff81e70db5f283 + sha512sums = ad17d6f4f2cc83841c1c89623c339ec3ee94f6084ea980e2c8cbc3903854c85e5396e31bfd8dc90745b41794670903d854c4d282d8adec263087a9d47b226ccc pkgname = vlc-nox @@ -7,7 +7,7 @@ _pkgbase=vlc pkgname=vlc-nox -pkgver=3.0.12 +pkgver=3.0.13 pkgrel=1 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player (without X support)' url='https://www.videolan.org/vlc/' @@ -96,21 +96,22 @@ 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 - vlc-3.0.11.1-srt_1.4.2.patch) -sha512sums=('ebec92bf732540be117551e94613747c53514ade7e280167c08400375738df9a01ee0e5d7c7733aca151a4f80f1c7163fd41318f2cc80b04a3201f0ba697e5df' + vlc-3.0.11.1-srt_1.4.2.patch + vlc-live-media-2021.patch) +sha512sums=('0badca9d71b682b1dd6f05acab48d77baffe22e6a00be6db2a790644bab74738f9807e889fd0348af72628694b5210896638ac2cd99d0efc0e1c2cef7ab28bff' 'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3' - '33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f' - '090c75878894f89184179f534da503a78234cf4f0f5af602873ea2ba6b68326afed71ef6160d1352bdd5c05e45b36bfcd23b7286d5111a900b7c11829642ae0d') + 'ac1d33d434aca2a0ad6e70800073deeaefc02b8fd72656b682ca833ee0cffe10dfa19a9355388700cab46ffbf9421c007d00ed04c7fa562698ff81e70db5f283' + 'ad17d6f4f2cc83841c1c89623c339ec3ee94f6084ea980e2c8cbc3903854c85e5396e31bfd8dc90745b41794670903d854c4d282d8adec263087a9d47b226ccc') 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" + patch -Np1 < "${srcdir}/vlc-live-media-2021.patch" sed 's|whoami|echo builduser|g' -i configure sed 's|hostname -f|echo arch|g' -i configure + autoreconf -vf } build() { diff --git a/lua53_compat.patch b/lua53_compat.patch deleted file mode 100644 index aeff7b2fd778..000000000000 --- a/lua53_compat.patch +++ /dev/null @@ -1,30 +0,0 @@ -commit 41caaa08cde60c4fec4bf2e5f9610e2a1b9e6a23 -Author: Vinson Lee <vlee@freedesktop.org> -Date: Thu Feb 5 14:48:53 2015 -0800 - - lua: Define LUA_COMPAT_APIINTCASTS for Lua >= 5.3.0 compatibility. - - In Lua 5.3.0, luaL_checkint was deprecated. - - This patch fixes this build error with Lua 5.3.0. - - lua/demux.c: In function ‘vlclua_demux_peek’: - lua/demux.c:55:5: error: implicit declaration of function ‘luaL_checkint’ [-Werror=implicit-function-declaration] - int n = luaL_checkint( L, 1 ); - ^ - - Signed-off-by: Vinson Lee <vlee@freedesktop.org> - Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org> - -diff --git a/modules/lua/vlc.h b/modules/lua/vlc.h -index efd94f1..85c7fc1 100644 ---- a/modules/lua/vlc.h -+++ b/modules/lua/vlc.h -@@ -38,6 +38,7 @@ - #include <vlc_stream.h> - #include <vlc_demux.h> - -+#define LUA_COMPAT_APIINTCASTS - #define LUA_COMPAT_MODULE - #include <lua.h> /* Low level lua C API */ - #include <lauxlib.h> /* Higher level C API */ diff --git a/vlc-3.0.11.1-srt_1.4.2.patch b/vlc-3.0.11.1-srt_1.4.2.patch index cadfa0edf81e..0bc3822e7a9d 100644 --- a/vlc-3.0.11.1-srt_1.4.2.patch +++ b/vlc-3.0.11.1-srt_1.4.2.patch @@ -1,3 +1,15 @@ +diff -ru vlc-3.0.13.orig/configure.ac vlc-3.0.13/configure.ac +--- vlc-3.0.13.orig/configure.ac 2021-04-27 15:18:39.000000000 +0200 ++++ vlc-3.0.13/configure.ac 2021-05-03 16:10:00.342592591 +0200 +@@ -4016,7 +4016,7 @@ + dnl + dnl SRT plugin + dnl +-PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2 srt < 1.3.0], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT]) ++PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT]) + + EXTEND_HELP_STRING([Visualisations and Video filter plugins:]) + dnl 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 diff --git a/vlc-live-media-2021.patch b/vlc-live-media-2021.patch new file mode 100644 index 000000000000..5ca5cb30cd63 --- /dev/null +++ b/vlc-live-media-2021.patch @@ -0,0 +1,26 @@ +diff -ru vlc-3.0.13.orig/configure.ac vlc-3.0.13/configure.ac +--- vlc-3.0.13.orig/configure.ac 2021-04-27 15:18:39.000000000 +0200 ++++ vlc-3.0.13/configure.ac 2021-05-03 16:26:26.691200904 +0200 +@@ -1825,7 +1825,7 @@ + AC_MSG_ERROR([Update live555 or pass --disable-live555 to disable RTSP input support.]) + ]) + ], [ +- other_libs="-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment" ++ other_libs="-lcrypto -lssl -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment" + other_libs_pic="-lgroupsock_pic -lBasicUsageEnvironment_pic -lUsageEnvironment_pic" + AS_IF([test "${SYS}" = "mingw32"], [ + # add ws2_32 for closesocket, select, recv +diff -ru vlc-3.0.13.orig/modules/access/live555.cpp vlc-3.0.13/modules/access/live555.cpp +--- vlc-3.0.13.orig/modules/access/live555.cpp 2019-03-29 20:01:15.000000000 +0100 ++++ vlc-3.0.13/modules/access/live555.cpp 2021-05-03 16:04:38.030121796 +0200 +@@ -852,7 +852,9 @@ + if( !p_sys->b_multicast ) + { + /* We need different rollover behaviour for multicast */ +- p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() ); ++ struct sockaddr_storage tempAddr; ++ sub->getConnectionEndpointAddress(tempAddr); ++ p_sys->b_multicast = IsMulticastAddress( tempAddr ); + } + + tk = (live_track_t*)malloc( sizeof( live_track_t ) ); |