ArchPOWER/packages
1
0
Fork 0
Code Issues 8 Pull Requests 1 Actions Packages Projects Releases 18 Wiki Activity

* update vlc to 3.0.20-7

Browse Source
This commit is contained in:
Alexander Baldeck 2024-02-02 11:10:08 +01:00
parent 3e548cc90f
commit 064b8ceef5
2 changed files with 264 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

296
vlc/PKGBUILD
View File

@ -9,104 +9,204 @@ _vlcver=3.0.20
# optional fixup version including hyphen
_vlcfixupver=
pkgver=${_vlcver}${_vlcfixupver//-/.r}
pkgrel=2
pkgrel=7
pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
url='https://www.videolan.org/vlc/'
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
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' 'lua' 'libidn'
'libmatroska' 'taglib' 'libmpcdec' 'ffmpeg4.4' 'faad2' 'libmad'
'libmpeg2' 'xcb-util-keysyms' 'libtar' 'libxinerama' 'libsecret'
'libupnp' 'libixml.so' 'libupnp.so' 'libarchive' 'qt5-base'
'qt5-x11extras' 'qt5-svg' 'freetype2' 'fribidi' 'harfbuzz'
'fontconfig' 'libxml2' 'gnutls' 'libplacebo' 'aribb24')
makedepends=('gst-plugins-base-libs' 'live-media' 'libnotify' 'libbluray'
'flac' 'libdc1394' 'libavc1394' 'libcaca' 'gtk3'
'librsvg' 'libgme' 'xosd' 'twolame' 'aalib' 'avahi' 'systemd-libs'
'libmtp' 'libmicrodns' 'libdvdcss' 'smbclient'
'vcdimager' 'libssh2' 'mesa' 'protobuf' 'libnfs' 'mpg123'
'libdvdread' 'libdvdnav' 'libogg' 'libshout' 'libmodplug' 'libvpx'
'libvorbis' 'speex' 'opus' 'libtheora' 'libpng' 'libjpeg-turbo'
'libx265.so' 'libx264.so' 'zvbi' 'libass' 'libkate' 'libtiger'
'sdl_image' 'libpulse' 'alsa-lib' 'jack' 'libsamplerate' 'libsoxr'
'lirc' 'projectm' 'aom' 'srt' 'dav1d'
'aribb25' 'pcsclite' 'wayland-protocols')
# 'chromaprint: Chromaprint audio fingerprinter'
optdepends=('avahi: service discovery using bonjour protocol'
'aom: AOM AV1 codec'
'gst-plugins-base-libs: for libgst plugins'
'dav1d: dav1d AV1 decoder'
'libdvdcss: decoding encrypted DVDs'
'libavc1394: devices using the 1394ta AV/C'
'libdc1394: IEEE 1394 access plugin'
'kwallet: kwallet keystore'
'libva-vdpau-driver: vdpau backend nvidia'
'libva-intel-driver: video backend intel'
'libbluray: Blu-Ray video input'
'flac: Free Lossless Audio Codec plugin'
'twolame: TwoLAME mpeg2 encoder plugin'
'libgme: Game Music Emu plugin'
'vcdimager: navigate VCD with libvcdinfo'
'libmtp: MTP devices discovery'
'systemd-libs: udev services discovery'
'smbclient: SMB access plugin'
'libcdio: audio CD playback'
'gnu-free-fonts: subtitle font '
'ttf-dejavu: subtitle font'
'libssh2: sftp access'
'libnfs: NFS access'
'mpg123: mpg123 codec'
'protobuf: chromecast streaming'
'libmicrodns: mDNS services discovery (chromecast etc)'
'lua-socket: http interface'
'libdvdread: DVD input module'
'libdvdnav: DVD with navigation input module'
'libogg: Ogg and OggSpots codec'
'libshout: shoutcast/icecast output plugin'
'libmodplug: MOD output plugin'
'libvpx: VP8 and VP9 codec'
'libvorbis: Vorbis decoder/encoder'
'speex: Speex codec'
'opus: opus codec'
'libtheora: theora codec'
'libpng: PNG support'
'libjpeg-turbo: JPEG support'
'librsvg: SVG plugin'
'x264: H264 encoding'
'x265: HEVC/H.265 encoder'
'zvbi: VBI/Teletext/webcam/v4l2 capture/decoding'
'libass: Subtitle support'
'libkate: Kate codec'
'libtiger: Tiger rendering for Kate streams'
'sdl_image: SDL image support'
'srt: SRT input/output plugin'
'aalib: ASCII art video output'
'libcaca: colored ASCII art video output'
'libpulse: PulseAudio audio output'
'alsa-lib: ALSA audio output'
'jack: jack audio server'
'libsamplerate: audio Resampler'
'libsoxr: SoX audio Resampler'
'lirc: lirc control'
'projectm: ProjectM visualisation'
'ncurses: ncurses interface'
'libnotify: notification plugin'
'gtk3: notification plugin'
'aribb25: aribcam support'
'pcsclite: aribcam support'
'live-media: streaming over RTSP')
license=(
'GPL-2.0-or-later'
'LGPL-2.1-or-later'
)
depends=(
'a52dec'
'abseil-cpp'
'aribb24'
'bash'
'cairo'
'dbus'
'faad2'
'ffmpeg4.4' # NOTE: switch to ffmpeg4.4, as ffmpeg >= 5 requires extensive changes disabling VAAPI (only supported with vlc >= 4)
'fontconfig'
'freetype2'
'fribidi'
'gcc-libs'
'gdk-pixbuf2'
'glib2'
'glibc'
'gnutls'
'harfbuzz'
'hicolor-icon-theme'
'libarchive'
'libdca'
'libdvbpsi'
'libglvnd'
'libidn'
'libmad'
'libmatroska'
'libmpcdec'
'libmpeg2'
'libproxy'
'libsecret'
'libtar'
'libupnp' 'libixml.so' 'libupnp.so'
'libva'
'libx11'
'libxcb'
'libxinerama'
'libxml2'
'libxpm'
'lua'
'qt5-base'
'qt5-svg'
'qt5-x11extras'
'taglib'
'wayland'
'xcb-util-keysyms'
'zlib'
)
makedepends=(
'aalib'
'alsa-lib'
'aom'
'aribb25'
'avahi'
'dav1d'
'flac'
'fluidsynth'
'gst-plugins-base-libs'
'gtk3'
'jack'
'libass'
'libavc1394'
'libbluray'
'libcaca'
'libdc1394'
'libdvdcss'
'libdvdnav'
'libdvdread'
'libgme'
'libjpeg-turbo'
'libkate'
'libmicrodns'
'libmodplug'
'libmtp'
'libnotify'
'libnfs'
'libogg'
'libpng'
'libpulse'
'librsvg'
'libsamplerate'
'libshout'
'libsoxr'
'libssh2'
'libtheora'
'libtiger'
'libvorbis'
'libvpx'
'lirc'
'live-media'
'mesa'
'mpg123'
'opus'
'pcsclite'
'projectm'
'protobuf'
'sdl_image'
'smbclient'
'speex'
'srt'
'systemd-libs'
'twolame'
'vcdimager'
'wayland-protocols'
'x264' 'libx264.so'
'x265' 'libx265.so'
'xosd'
'zvbi'
)
optdepends=(
'aalib: ASCII art video output'
'alsa-lib: ALSA audio output'
'aom: AOM AV1 codec'
'aribb25: aribcam support'
'avahi: service discovery using bonjour protocol'
'dav1d: dav1d AV1 decoder'
'flac: Free Lossless Audio Codec plugin'
'fluidsynth: FluidSynth based MIDI playback plugin'
'gnu-free-fonts: subtitle font'
'gst-plugins-base-libs: for libgst plugins'
'gstreamer: for libgst plugins'
'gtk3: notification plugin'
'jack: jack audio server'
'kwallet: kwallet keystore'
'libass: Subtitle support'
'libavc1394: devices using the 1394ta AV/C'
'libbluray: Blu-Ray video input'
'libcaca: colored ASCII art video output'
'libcdio: audio CD playback'
'libdc1394: IEEE 1394 access plugin'
'libdvdcss: decoding encrypted DVDs'
'libdvdnav: DVD with navigation input module'
'libdvdread: DVD input module'
'libgme: Game Music Emu plugin'
'libjpeg-turbo: JPEG support'
'libkate: Kate codec'
'libmodplug: MOD output plugin'
'libmicrodns: mDNS services discovery (chromecast etc)'
'libmtp: MTP devices discovery'
'libnfs: NFS access'
'libnotify: notification plugin'
'libogg: Ogg and OggSpots codec'
'libpng: PNG support'
'libpulse: PulseAudio audio output'
'libraw1394: IEEE 1394 access plugin'
'librsvg: SVG plugin'
'libsamplerate: audio Resampler'
'libshout: shoutcast/icecast output plugin'
'libsoxr: SoX audio Resampler'
'libssh2: sftp access'
'libtheora: theora codec'
'libtiger: Tiger rendering for Kate streams'
'libva-intel-driver: video backend intel'
'libva-vdpau-driver: vdpau backend nvidia'
'libvorbis: Vorbis decoder/encoder'
'libvpx: VP8 and VP9 codec'
'lirc: lirc control'
'live-media: streaming over RTSP'
'lua-socket: http interface'
'mpg123: mpg123 codec'
'ncurses: ncurses interface'
'opus: opus codec'
'pcsclite: aribcam support'
'projectm: ProjectM visualisation'
'protobuf: chromecast streaming'
'sdl12-compat: SDL image support'
'sdl_image: SDL image support'
'smbclient: SMB access plugin'
'speex: Speex codec'
'speexdsp: Speex codec'
'srt: SRT input/output plugin'
'systemd-libs: udev services discovery'
'ttf-dejavu: subtitle font'
'twolame: TwoLAME mpeg2 encoder plugin'
'vcdimager: navigate VCD with libvcdinfo'
'x264: H264 encoding'
'x265: HEVC/H.265 encoder'
'zvbi: VBI/Teletext/webcam/v4l2 capture/decoding'
)
conflicts=('vlc-plugin')
replaces=('vlc-plugin')
options=('!emptydirs')
source=(https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
libplacebo-5.patch
update-vlc-plugin-cache.hook)
source=(
https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
update-vlc-plugin-cache.hook
taglib-2.patch
)
sha512sums=('02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406'
'SKIP'
'a06b04a8b059dbbef77d27435bd5bec3c26f937390bd112b0843385587e866e617c3dd0e66f99eed5fa4a91bc5f0fd9b5623f65b2f2435a54456dde2aa96209b'
'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3')
'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3'
'ea0d1e1dfed16dac8f9027eb55d987dee59630568b9744ceb42bfa134ea9295252d83574f3d793a76a5be3b02661c1731ed366003b6b55b2d7f02fde70586ff3')
validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
prepare() {
@ -140,13 +240,19 @@ build() {
case "${CARCH}" in
powerpc)
export CFLAGS+=' -maltivec -mabi=altivec'
export CFLAGS+=' -maltivec -mabi=altivec'
_configure_flags=(
--disable-altivec
--disable-taglib #FIXME: broken only on powerpc
)
;;
riscv64)
export CFLAGS+=" -latomic"
export CXXFLAGS+=" -latomic"
;;
*)
_configure_options=(
--enable-taglib
)
esac
./configure \
@ -188,6 +294,7 @@ build() {
--enable-a52 \
--enable-dca \
--enable-flac \
--enable-fluidsynth \
--enable-libmpeg2 \
--enable-vorbis \
--enable-speex \
@ -234,18 +341,17 @@ build() {
--enable-libxml2 \
--disable-libgcrypt \
--enable-gnutls \
--enable-taglib \
--enable-secret \
--enable-kwallet \
--disable-update-check \
--enable-notify \
--enable-libplacebo \
--disable-libplacebo \
--enable-vlc \
--enable-aribsub \
--enable-aribcam \
--enable-aom \
--enable-srt \
--enable-dav1d
--enable-dav1d ${_configure_flags[@]}
# prevent excessive overlinking due to libtool
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool

63
vlc/taglib-2.patch Normal file
View File

@ -0,0 +1,63 @@
diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp
index 84b401c795..f371485008 100644
--- a/modules/meta_engine/taglib.cpp
+++ b/modules/meta_engine/taglib.cpp
@@ -185,7 +185,7 @@ public:
ByteVector res(length, 0);
ssize_t i_read = vlc_stream_Read( m_stream, res.data(), length);
if (i_read < 0)
- return ByteVector::null;
+ return ByteVector();
else if ((size_t)i_read != length)
res.resize(i_read);
return res;
@@ -465,7 +465,7 @@ static void ReadMetaFromASF( ASF::Tag* tag, demux_meta_t* p_demux_meta, vlc_meta
static void ReadMetaFromBasicTag(const Tag* tag, vlc_meta_t *dest)
{
#define SET( accessor, meta ) \
- if( !tag->accessor().isNull() && !tag->accessor().isEmpty() ) \
+ if( !tag->accessor().isEmpty() ) \
vlc_meta_Set##meta( dest, tag->accessor().toCString(true) )
#define SETINT( accessor, meta ) \
if( tag->accessor() ) \
@@ -806,15 +806,15 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
{
MP4::Item list;
#define SET( keyName, metaName ) \
- if( tag->itemListMap().contains(keyName) ) \
+ if( tag->itemMap().contains(keyName) ) \
{ \
- list = tag->itemListMap()[keyName]; \
+ list = tag->itemMap()[keyName]; \
vlc_meta_Set##metaName( p_meta, list.toStringList().front().toCString( true ) ); \
}
#define SET_EXTRA( keyName, metaName ) \
- if( tag->itemListMap().contains(keyName) ) \
+ if( tag->itemMap().contains(keyName) ) \
{ \
- list = tag->itemListMap()[keyName]; \
+ list = tag->itemMap()[keyName]; \
vlc_meta_AddExtra( p_meta, metaName, list.toStringList().front().toCString( true ) ); \
}
@@ -824,9 +824,9 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_meta_t *p_demux_meta, vlc_meta
#undef SET
#undef SET_EXTRA
- if( tag->itemListMap().contains("covr") )
+ if( tag->itemMap().contains("covr") )
{
- MP4::CoverArtList list = tag->itemListMap()["covr"].toCoverArtList();
+ MP4::CoverArtList list = tag->itemMap()["covr"].toCoverArtList();
const char *psz_format = list[0].format() == MP4::CoverArt::PNG ? "image/png" : "image/jpeg";
msg_Dbg( p_demux_meta, "Found embedded art (%s) is %i bytes",
@@ -1337,7 +1337,7 @@ static int WriteMeta( vlc_object_t *p_this )
if( RIFF::AIFF::File* riff_aiff = dynamic_cast<RIFF::AIFF::File*>(f.file()) )
WriteMetaToId3v2( riff_aiff->tag(), p_item );
else if( RIFF::WAV::File* riff_wav = dynamic_cast<RIFF::WAV::File*>(f.file()) )
- WriteMetaToId3v2( riff_wav->tag(), p_item );
+ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item );
}
else if( TrueAudio::File* trueaudio = dynamic_cast<TrueAudio::File*>(f.file()) )
{