summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO46
-rw-r--r--PKGBUILD107
-rw-r--r--vlc-luajit.hook10
-rwxr-xr-xvlc-luajit.sh19
4 files changed, 41 insertions, 141 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 00cb3792ecdd..a9dd6a6def03 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.18
- pkgrel = 4
+ pkgrel = 5
url = https://www.videolan.org/vlc/
arch = i686
arch = x86_64
@@ -60,17 +60,16 @@ pkgbase = vlc-luajit
makedepends = aribb25
makedepends = pcsclite
makedepends = lua51
- makedepends = lsb-release
makedepends = wayland-protocols
- makedepends = aom
- makedepends = dav1d
- makedepends = flac
- makedepends = libmicrodns
- makedepends = libvpx
- makedepends = x264
- makedepends = x265
- makedepends = protobuf
- makedepends = srt
+ makedepends = aom>=3
+ makedepends = dav1d>=1.0.0
+ makedepends = flac>=1.4.0
+ makedepends = libmicrodns>=0.2
+ makedepends = libvpx>=1.13
+ makedepends = x264>=0.164
+ makedepends = x265>=3.5
+ makedepends = protobuf>=21
+ makedepends = srt>=1.5
depends = a52dec
depends = libdvbpsi
depends = libxpm
@@ -90,7 +89,7 @@ pkgbase = vlc-luajit
depends = libsecret
depends = libarchive
depends = qt5-base
- depends = ffmpeg>=5
+ depends = ffmpeg>=6
depends = qt5-x11extras
depends = qt5-svg
depends = freetype2
@@ -100,8 +99,8 @@ pkgbase = vlc-luajit
depends = libxml2
depends = gnutls
depends = libplacebo
- depends = libplacebo
- depends = libupnp
+ depends = libupnp>=1.14
+ depends = libplacebo>=4.208
optdepends = avahi: service discovery using bonjour protocol
optdepends = gst-plugins-base-libs: for libgst plugins
optdepends = dav1d: dav1d AV1 decoder
@@ -158,21 +157,20 @@ pkgbase = vlc-luajit
optdepends = aribb25: aribcam support
optdepends = pcsclite: aribcam support
optdepends = live-media: streaming over RTSP
- optdepends = aom: AOM AV1 codec
- optdepends = dav1d: dav1d AV1 decoder
- optdepends = flac: Free Lossless Audio Codec plugin
- optdepends = protobuf: chromecast streaming
- optdepends = libmicrodns: mDNS services discovery (chromecast etc)
- optdepends = libvpx: VP8 and VP9 codec
- optdepends = x264: H264 encoding
- optdepends = x265: HEVC/H.265 encoder
- optdepends = srt: SRT input/output plugin
+ optdepends = aom>=3: AOM AV1 codec
+ optdepends = dav1d>=1.0.0: dav1d AV1 decoder
+ optdepends = flac>=1.4.0: Free Lossless Audio Codec plugin
+ optdepends = protobuf>=21: chromecast streaming
+ optdepends = libmicrodns>=0.2: mDNS services discovery (chromecast etc)
+ optdepends = libvpx>=1.13: VP8 and VP9 codec
+ optdepends = x264>=0.164: H264 encoding
+ optdepends = x265>=3.5: HEVC/H.265 encoder
+ optdepends = srt>=1.5: SRT input/output plugin
provides = vlc=3.0.18
conflicts = vlc
conflicts = vlc-dev
conflicts = vlc-plugin
conflicts = vlc-stable-git
- options = debug
options = !emptydirs
source = https://download.videolan.org/vlc/3.0.18/vlc-3.0.18.tar.xz
source = update-vlc-plugin-cache.hook
diff --git a/PKGBUILD b/PKGBUILD
index 1b9936f7294e..6fbc801f97ba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,16 @@
# Maintainer: tytan652 <tytan652[at]tytanium[dot]xyz>
-DISTRIB_ID=`lsb_release --id | cut -f2 -d$'\t'`
-
pkgname=vlc-luajit
_vlcver=3.0.18
# optional fixup version including hyphen
_vlcfixupver=
pkgver=${_vlcver}${_vlcfixupver//-/.r}
-pkgrel=4
+pkgrel=5
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')
license=('LGPL2.1' 'GPL2')
+# To manage dependency rebuild easily, this will prevent you to rebuild VLC on non-updated system
_aomver=3
_dav1dver=1.0.0
_flacver=1.4.0
@@ -27,23 +26,11 @@ depends=(
'a52dec' 'libdvbpsi' 'libxpm' 'libdca' 'libproxy' 'luajit' 'libidn'
'libmatroska' 'taglib' 'libmpcdec' 'faad2' 'libmad'
'libmpeg2' 'xcb-util-keysyms' 'libtar' 'libxinerama' 'libsecret'
- 'libarchive' 'qt5-base' "ffmpeg>=5"
+ 'libarchive' 'qt5-base' "ffmpeg>=6"
'qt5-x11extras' 'qt5-svg' 'freetype2' 'fribidi' 'harfbuzz'
'fontconfig' 'libxml2' 'gnutls' 'libplacebo'
+ "libupnp>=$_libupnpver" "libplacebo>=$_libplacebover"
)
-# 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
- depends+=(
- 'libplacebo'
- 'libupnp'
- )
-else
- depends+=(
- "libplacebo>=$_libplacebover"
- "libupnp>=$_libupnpver"
- )
-fi
makedepends=(
'gst-plugins-base-libs' 'live-media' 'libnotify' 'libbluray'
'libdc1394' 'libavc1394' 'libcaca' 'gtk3'
@@ -55,36 +42,12 @@ makedepends=(
'zvbi' 'libass' 'libkate' 'libtiger'
'sdl_image' 'libpulse' 'alsa-lib' 'jack' 'libsamplerate' 'libsoxr'
'lirc' 'libgoom2' 'projectm' 'chromaprint'
- 'aribb24' 'aribb25' 'pcsclite' 'lua51' 'lsb-release'
- 'wayland-protocols'
+ 'aribb24' 'aribb25' 'pcsclite' 'lua51' 'wayland-protocols'
+ "aom>=$_aomver" "dav1d>=$_dav1dver" "flac>=$_flacver"
+ "libmicrodns>=$_libmicrodnsver" "libvpx>=$_libvpxver"
+ "x264>=$_x264ver" "x265>=$_x265ver" "protobuf>=$_protobufver"
+ "srt>=$_srtver"
)
-# 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
- makedepends+=(
- 'aom'
- 'dav1d'
- 'flac'
- 'libmicrodns'
- 'libvpx'
- 'x264'
- 'x265'
- 'protobuf'
- 'srt'
- )
-else
- makedepends+=(
- "aom>=$_aomver"
- "dav1d>=$_dav1dver"
- "flac>=$_flacver"
- "libmicrodns>=$_libmicrodnsver"
- "libvpx>=$_libvpxver"
- "x264>=$_x264ver"
- "x265>=$_x265ver"
- "protobuf>=$_protobufver"
- "srt>=$_srtver"
- )
-fi
optdepends=(
'avahi: service discovery using bonjour protocol'
'gst-plugins-base-libs: for libgst plugins'
@@ -143,37 +106,20 @@ optdepends=(
'aribb25: aribcam support'
'pcsclite: aribcam support'
'live-media: streaming over RTSP'
+ "aom>=$_aomver: AOM AV1 codec"
+ "dav1d>=$_dav1dver: dav1d AV1 decoder"
+ "flac>=$_flacver: Free Lossless Audio Codec plugin"
+ "protobuf>=$_protobufver: chromecast streaming"
+ "libmicrodns>=$_libmicrodnsver: mDNS services discovery (chromecast etc)"
+ "libvpx>=$_libvpxver: VP8 and VP9 codec"
+ "x264>=$_x264ver: H264 encoding"
+ "x265>=$_x265ver: HEVC/H.265 encoder"
+ "srt>=$_srtver: SRT input/output plugin"
)
-# To manage dependency rebuild easily, this will prevent you to rebuild VLC on non-updated system
-if [[ $DISTRIB_ID == 'ManjaroLinux' ]]; then
- optdepends+=(
- 'aom: AOM AV1 codec'
- 'dav1d: dav1d AV1 decoder'
- 'flac: Free Lossless Audio Codec plugin'
- 'protobuf: chromecast streaming'
- 'libmicrodns: mDNS services discovery (chromecast etc)'
- 'libvpx: VP8 and VP9 codec'
- 'x264: H264 encoding'
- 'x265: HEVC/H.265 encoder'
- 'srt: SRT input/output plugin'
- )
-else
- optdepends+=(
- "aom>=$_aomver: AOM AV1 codec"
- "dav1d>=$_dav1dver: dav1d AV1 decoder"
- "flac>=$_flacver: Free Lossless Audio Codec plugin"
- "protobuf>=$_protobufver: chromecast streaming"
- "libmicrodns>=$_libmicrodnsver: mDNS services discovery (chromecast etc)"
- "libvpx>=$_libvpxver: VP8 and VP9 codec"
- "x264>=$_x264ver: H264 encoding"
- "x265>=$_x265ver: HEVC/H.265 encoder"
- "srt>=$_srtver: SRT input/output plugin"
- )
-fi
_name=vlc
conflicts=("${_name}" 'vlc-dev' 'vlc-plugin' 'vlc-stable-git')
provides=("${_name}=${pkgver}")
-options=('debug' '!emptydirs')
+options=('!emptydirs')
source=(https://download.videolan.org/${_name}/${_vlcver}/${_name}-${_vlcver}${_vlcfixupver}.tar.xz
'update-vlc-plugin-cache.hook'
'libplacebo-5.patch')
@@ -181,16 +127,6 @@ sha512sums=('6fc8fdaa7e8862ad7133d69b3dab99ab9cd3945846a6ce5e2379b7f68ee9accd385
'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3'
'a06b04a8b059dbbef77d27435bd5bec3c26f937390bd112b0843385587e866e617c3dd0e66f99eed5fa4a91bc5f0fd9b5623f65b2f2435a54456dde2aa96209b')
-if [[ $DISTRIB_ID == 'ManjaroLinux' ]]; then
-source+=(
- "$pkgname.hook"
- "$pkgname.sh"
-)
-sha512sums+=(
- "387bc13bd61ab926228d58e102271a964415f11a175778323487080a7ebc424d1a6148d5705e1563eee49c9ea6407643f82e274478b589664c9fcdffb6177f99"
- "698b3ee23d02677cd46950adc5188320ff4e5ead76d655db8d276558ee6745a567bec878c68a76b65728a6d893919b2cd4c9c6fec544461762df52476e4a8fe6")
-fi
-
prepare() {
cd ${_name}-${_vlcver}
sed -e 's:truetype/ttf-dejavu:TTF:g' -i modules/visualization/projectm.cpp
@@ -350,9 +286,4 @@ package() {
"${pkgdir}/usr/share/icons/hicolor/${res}x${res}/apps/vlc.png"
done
install -Dm 644 "${srcdir}/update-vlc-plugin-cache.hook" -t "${pkgdir}/usr/share/libalpm/hooks"
-
- if [[ $DISTRIB_ID == 'ManjaroLinux' ]]; then
- install -D -m644 "$srcdir/$pkgname.hook" -t "${pkgdir}"/usr/share/libalpm/hooks/
- install -D -m755 "$srcdir/$pkgname.sh" -t "${pkgdir}"/usr/share/libalpm/scripts/
- fi
}
diff --git a/vlc-luajit.hook b/vlc-luajit.hook
deleted file mode 100644
index aa4081e85d5b..000000000000
--- a/vlc-luajit.hook
+++ /dev/null
@@ -1,10 +0,0 @@
-[Trigger]
-Type = Package
-Operation = Install
-Operation = Upgrade
-Target = vlc-luajit
-
-[Action]
-Description = Warn Manjaro user about rebuild
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/vlc-luajit.sh
diff --git a/vlc-luajit.sh b/vlc-luajit.sh
deleted file mode 100755
index f9a45924c86c..000000000000
--- a/vlc-luajit.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-msg() {
-ALL_OFF="\\e[1;0m"
-BOLD="\\e[1;1m"
-GREEN="${BOLD}\\e[1;32m"
-local mesg=$1; shift
-printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}" "$@" >&2
-}
-
-echo
-msg "Warning:
- -> vlc-luajit does not support Manjaro officially.
- -> Some dependency version checks are disabled to
- -> allow the package to be built on it.
- -> So the package may require to be rebuilt if some
- -> dependency packages are updated. If not the
- -> package could not work correctly.
-"