diff options
| author | andrewSC | 2022-06-14 11:30:20 -0400 |
|---|---|---|
| committer | andrewSC | 2022-06-14 11:30:20 -0400 |
| commit | 8331dac292de6d7ff4b12b079ca020d7c93b84df (patch) | |
| tree | 95e1f4165db5b2d742ebbba5eb122afa3154077d /PKGBUILD | |
| parent | b2d0ad73d2c779784da201cedd4acff49ec18f22 (diff) | |
| download | aur-8331dac292de6d7ff4b12b079ca020d7c93b84df.tar.gz | |
Ver bump 4.0.0.r19766.g0e448365f6
- Removed lua53 patch and downgraded to lua52 until:
https://code.videolan.org/videolan/vlc/-/issues/25036 is resolved
- Bumped ffmpeg dep to use latest instead of 4.4
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 17 |
1 files changed, 8 insertions, 9 deletions
@@ -9,14 +9,14 @@ # Contributor: MacWolf <macwolf at archlinux dot de> pkgname=vlc-git -pkgver=4.0.0.r18660.g5f74392dcb +pkgver=4.0.0.r19766.g0e448365f6 pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player (GIT Version)" url='https://www.videolan.org/vlc/' arch=('i686' 'x86_64') license=('LGPL2.1' 'GPL2') -depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'lua' - 'libmatroska' 'taglib' 'libmpcdec' 'ffmpeg4.4' 'faad2' 'libupnp' 'libmad' +depends=('a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'lua52' + 'libmatroska' 'taglib' 'libmpcdec' 'ffmpeg' 'faad2' 'libupnp' 'libmad' 'libmpeg2' 'xcb-util-keysyms' 'libtar' 'libxinerama' 'libsecret' 'libarchive' 'qt5-base' 'qt5-x11extras' 'qt5-svg' 'freetype2' 'fribidi' 'harfbuzz' 'fontconfig' 'libxml2' 'gnutls' 'wayland-protocols' @@ -101,11 +101,9 @@ conflicts=("${_name}" 'vlc-dev' 'vlc-plugin' 'vlc-stable-git') provides=("${_name}=${pkgver}") options=(debug !emptydirs) source=('git+https://github.com/videolan/vlc.git' - 'lua53_compat.patch' 'vlc-live-media-2021.patch' 'update-vlc-plugin-cache.hook') sha512sums=('SKIP' - '33cda373aa1fb3ee19a78748e2687f2b93c8662c9fda62ecd122a2e649df8edaceb54dda3991bc38c80737945a143a9e65baa2743a483bb737bb94cd590dc25f' 'ad17d6f4f2cc83841c1c89623c339ec3ee94f6084ea980e2c8cbc3903854c85e5396e31bfd8dc90745b41794670903d854c4d282d8adec263087a9d47b226ccc' '2f1015af384559bf4868bb989c06a7d281a8e32afb175ef397dbf1671bae3540a3a6b073a74ed77ed82e79a81f964a5a58a98c2a3f1b5e5cd5e9ea60d58c737f') @@ -121,7 +119,6 @@ prepare() { 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-live-media-2021.patch sed 's|whoami|echo builduser|g' -i configure sed 's|hostname -f|echo arch|g' -i configure @@ -134,10 +131,12 @@ build() { export CFLAGS+=" -I/usr/include/samba-4.0 -ffat-lto-objects" export CPPFLAGS+=" -I/usr/include/samba-4.0" export CXXFLAGS+=" -std=c++11" - export LUAC=/usr/bin/luac - export LUA_LIBS="$(pkg-config --libs lua)" + + # 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 RCC=/usr/bin/rcc-qt5 - export PKG_CONFIG_PATH="/usr/lib/ffmpeg4.4/pkgconfig/:$PKG_CONFIG_PATH" + export PKG_CONFIG_PATH="/usr/lib/pkgconfig/:$PKG_CONFIG_PATH" ./configure --prefix=/usr \ --sysconfdir=/etc \ |