From 9491cc3b19481e127d033da815d7d54077bfb374 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 2 Sep 2023 16:35:14 +0000 Subject: [PATCH] extra/vlc to 3.0.18-15 --- extra/vlc/PKGBUILD | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 750d4d19b..7ff50061a 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -11,13 +11,13 @@ _vlcver=3.0.18 # optional fixup version including hyphen _vlcfixupver= pkgver=${_vlcver}${_vlcfixupver//-/.r} -pkgrel=14 +pkgrel=15 pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player' url='https://www.videolan.org/vlc/' arch=('x86_64') license=('LGPL2.1' 'GPL2') # NOTE: switch to ffmpeg4.4, as ffmpeg >= 5 requires extensive changes disabling VAAPI (only supported with vlc >= 4) -depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'lua52' 'libidn' +depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'lua' 'libidn' 'libmatroska' 'taglib' 'libmpcdec' 'ffmpeg4.4' 'faad2' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar' 'libxinerama' 'libsecret' 'libupnp' 'libixml.so' 'libupnp.so' 'libarchive' 'qt5-base' @@ -62,7 +62,7 @@ optdepends=('avahi: service discovery using bonjour protocol' 'mpg123: mpg123 codec' 'protobuf: chromecast streaming' 'libmicrodns: mDNS services discovery (chromecast etc)' - 'lua52-socket: http interface' + 'lua-socket: http interface' 'libdvdread: DVD input module' 'libdvdnav: DVD with navigation input module' 'libogg: Ogg and OggSpots codec' @@ -138,9 +138,8 @@ build() { export CPPFLAGS+=" -I/usr/include/samba-4.0" export CXXFLAGS+=" -std=c++17" export PKG_CONFIG_PATH="/usr/lib/ffmpeg4.4/pkgconfig" - # upstream doesn't support lua 5.4 yet: https://trac.videolan.org/vlc/ticket/25036 - export LUAC=/usr/bin/luac5.2 - export LUA_LIBS="$(pkg-config --libs lua5.2)" + export LUAC=/usr/bin/luac + export LUA_LIBS="$(pkg-config --libs lua)" export RCC=/usr/bin/rcc-qt5 export PKG_CONFIG_PATH="/usr/lib/ffmpeg4.4/pkgconfig/:$PKG_CONFIG_PATH"