summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authortytan6522022-02-27 19:52:19 +0100
committertytan6522022-02-27 19:52:19 +0100
commitddf9fcd8d70295ae1a00bf8513698ca95caabc71 (patch)
treeafcf85595daea41a3db49bf3847f081af7379cd5
parent3945251999a8fa9ed01fd9b43543946f5c3b538d (diff)
downloadaur-ddf9fcd8d70295ae1a00bf8513698ca95caabc71.tar.gz
build: Manjaro use FFmpeg 5
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD10
2 files changed, 4 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2fafaa408ce8..f430a6444ce0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = vlc-luajit
pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player built with luajit for OBS Studio compatibility
pkgver = 3.0.16
- pkgrel = 8
+ pkgrel = 9
url = https://www.videolan.org/vlc/
arch = i686
arch = x86_64
@@ -89,6 +89,7 @@ pkgbase = vlc-luajit
depends = libsecret
depends = libarchive
depends = qt5-base
+ depends = ffmpeg>=5
depends = qt5-x11extras
depends = qt5-svg
depends = freetype2
@@ -99,7 +100,6 @@ pkgbase = vlc-luajit
depends = gnutls
depends = libplacebo
depends = wayland-protocols
- depends = ffmpeg
depends = libplacebo
depends = libupnp
depends = libixml.so
diff --git a/PKGBUILD b/PKGBUILD
index 6abe985e41d4..17eab9537608 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ _vlcver=3.0.16
# optional fixup version including hyphen
_vlcfixupver=
pkgver=${_vlcver}${_vlcfixupver//-/.r}
-pkgrel=8
+pkgrel=9
pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player built with luajit for OBS Studio compatibility'
url='https://www.videolan.org/vlc/'
arch=('i686' 'x86_64' 'aarch64')
@@ -25,16 +25,10 @@ depends=(
'a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'luajit' 'libidn'
'libmatroska' 'taglib' 'libmpcdec' 'faad2' 'libmad'
'libmpeg2' 'xcb-util-keysyms' 'libtar' 'libxinerama' 'libsecret'
- 'libarchive' 'qt5-base'
+ 'libarchive' 'qt5-base' "ffmpeg>=5"
'qt5-x11extras' 'qt5-svg' 'freetype2' 'fribidi' 'harfbuzz'
'fontconfig' 'libxml2' 'gnutls' 'libplacebo' 'wayland-protocols'
)
-# Manjaro still on 4.4.1 and Arch use ffmpeg4.4
-if [[ $DISTRIB_ID == 'ManjaroLinux' ]]; then
- depends+=("ffmpeg")
-else
- depends+=("ffmpeg>=5")
-fi
# To manage dependency rebuild easily, this will prevent you to rebuild VLC on non-updated system
# For Manjaro user this feature is disabled
if [[ $DISTRIB_ID == 'ManjaroLinux' ]]; then