* update vlc to 3.0.21-1

This commit is contained in:
Alexander Baldeck 2024-08-08 08:28:52 +02:00
parent 754df67cc5
commit 47dc860854
5 changed files with 213 additions and 184 deletions

200
vlc/.SRCINFO Normal file
View File

@ -0,0 +1,200 @@
pkgbase = vlc
pkgdesc = Multi-platform MPEG, VCD/DVD, and DivX player
pkgver = 3.0.21
pkgrel = 1
url = https://www.videolan.org/vlc/
arch = x86_64
license = GPL-2.0-or-later
license = LGPL-2.1-or-later
makedepends = aalib
makedepends = alsa-lib
makedepends = aom
makedepends = aribb25
makedepends = avahi
makedepends = dav1d
makedepends = flac
makedepends = fluidsynth
makedepends = gst-plugins-base-libs
makedepends = gtk3
makedepends = jack
makedepends = libass
makedepends = libavc1394
makedepends = libbluray
makedepends = libcaca
makedepends = libdc1394
makedepends = libdvdcss
makedepends = libdvdnav
makedepends = libdvdread
makedepends = libgme
makedepends = libgoom2
makedepends = libjpeg-turbo
makedepends = libkate
makedepends = libmicrodns
makedepends = libmodplug
makedepends = libmtp
makedepends = libnotify
makedepends = libnfs
makedepends = libogg
makedepends = libpng
makedepends = libpulse
makedepends = librsvg
makedepends = libsamplerate
makedepends = libshout
makedepends = libsoxr
makedepends = libssh2
makedepends = libtheora
makedepends = libtiger
makedepends = libvorbis
makedepends = libvpx
makedepends = lirc
makedepends = live-media
makedepends = mesa
makedepends = mpg123
makedepends = opus
makedepends = pcsclite
makedepends = projectm
makedepends = protobuf
makedepends = sdl_image
makedepends = smbclient
makedepends = speex
makedepends = srt
makedepends = systemd-libs
makedepends = twolame
makedepends = vcdimager
makedepends = wayland-protocols
makedepends = x264
makedepends = libx264.so
makedepends = x265
makedepends = libx265.so
makedepends = xosd
makedepends = zvbi
depends = a52dec
depends = abseil-cpp
depends = aribb24
depends = bash
depends = cairo
depends = dbus
depends = faad2
depends = ffmpeg4.4
depends = fontconfig
depends = freetype2
depends = fribidi
depends = gcc-libs
depends = gdk-pixbuf2
depends = glib2
depends = glibc
depends = gnutls
depends = harfbuzz
depends = hicolor-icon-theme
depends = libarchive
depends = libdca
depends = libdvbpsi
depends = libglvnd
depends = libidn
depends = libmad
depends = libmatroska
depends = libmpcdec
depends = libmpeg2
depends = libproxy
depends = libsecret
depends = libtar
depends = libupnp
depends = libixml.so
depends = libupnp.so
depends = libva
depends = libx11
depends = libxcb
depends = libxinerama
depends = libxml2
depends = libxpm
depends = lua
depends = qt5-base
depends = qt5-svg
depends = qt5-x11extras
depends = taglib
depends = wayland
depends = xcb-util-keysyms
depends = zlib
optdepends = aalib: ASCII art video output
optdepends = alsa-lib: ALSA audio output
optdepends = aom: AOM AV1 codec
optdepends = aribb25: aribcam support
optdepends = avahi: service discovery using bonjour protocol
optdepends = dav1d: dav1d AV1 decoder
optdepends = flac: Free Lossless Audio Codec plugin
optdepends = fluidsynth: FluidSynth based MIDI playback plugin
optdepends = gnu-free-fonts: subtitle font
optdepends = gst-plugins-base-libs: for libgst plugins
optdepends = gstreamer: for libgst plugins
optdepends = gtk3: notification plugin
optdepends = jack: jack audio server
optdepends = kwallet: kwallet keystore
optdepends = libass: Subtitle support
optdepends = libavc1394: devices using the 1394ta AV/C
optdepends = libbluray: Blu-Ray video input
optdepends = libcaca: colored ASCII art video output
optdepends = libcdio: audio CD playback
optdepends = libdc1394: IEEE 1394 access plugin
optdepends = libdvdcss: decoding encrypted DVDs
optdepends = libdvdnav: DVD with navigation input module
optdepends = libdvdread: DVD input module
optdepends = libgme: Game Music Emu plugin
optdepends = libgoom2: Goom visualization
optdepends = libjpeg-turbo: JPEG support
optdepends = libkate: Kate codec
optdepends = libmodplug: MOD output plugin
optdepends = libmicrodns: mDNS services discovery (chromecast etc)
optdepends = libmtp: MTP devices discovery
optdepends = libnfs: NFS access
optdepends = libnotify: notification plugin
optdepends = libogg: Ogg and OggSpots codec
optdepends = libpng: PNG support
optdepends = libpulse: PulseAudio audio output
optdepends = libraw1394: IEEE 1394 access plugin
optdepends = librsvg: SVG plugin
optdepends = libsamplerate: audio Resampler
optdepends = libshout: shoutcast/icecast output plugin
optdepends = libsoxr: SoX audio Resampler
optdepends = libssh2: sftp access
optdepends = libtheora: theora codec
optdepends = libtiger: Tiger rendering for Kate streams
optdepends = libva-intel-driver: video backend intel
optdepends = libva-vdpau-driver: vdpau backend nvidia
optdepends = libvorbis: Vorbis decoder/encoder
optdepends = libvpx: VP8 and VP9 codec
optdepends = lirc: lirc control
optdepends = live-media: streaming over RTSP
optdepends = lua-socket: http interface
optdepends = mpg123: mpg123 codec
optdepends = ncurses: ncurses interface
optdepends = opus: opus codec
optdepends = pcsclite: aribcam support
optdepends = projectm: ProjectM visualisation
optdepends = protobuf: chromecast streaming
optdepends = sdl12-compat: SDL image support
optdepends = sdl_image: SDL image support
optdepends = smbclient: SMB access plugin
optdepends = speex: Speex codec
optdepends = speexdsp: Speex codec
optdepends = srt: SRT input/output plugin
optdepends = systemd-libs: udev services discovery
optdepends = ttf-dejavu: subtitle font
optdepends = twolame: TwoLAME mpeg2 encoder plugin
optdepends = vcdimager: navigate VCD with libvcdinfo
optdepends = x264: H264 encoding
optdepends = x265: HEVC/H.265 encoder
optdepends = zvbi: VBI/Teletext/webcam/v4l2 capture/decoding
conflicts = vlc-plugin
replaces = vlc-plugin
options = !emptydirs
source = https://download.videolan.org/vlc/3.0.21/vlc-3.0.21.tar.xz
source = https://download.videolan.org/vlc/3.0.21/vlc-3.0.21.tar.xz.asc
source = update-vlc-plugin-cache.hook
source = taglib-2.patch
validpgpkeys = 65F7C6B4206BD057A7EB73787180713BE58D1ADC
sha512sums = cb1af76c8056648c331d7e6e0680d161ed1849eb635987504f45eae02531e9b432651034317fa7e02b0722905dfb9f0f5dad67b5924cc62edcaf0d173ac36aee
sha512sums = SKIP
sha512sums = b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3
sha512sums = ea0d1e1dfed16dac8f9027eb55d987dee59630568b9744ceb42bfa134ea9295252d83574f3d793a76a5be3b02661c1731ed366003b6b55b2d7f02fde70586ff3
pkgname = vlc

4
vlc/.nvchecker.toml Normal file
View File

@ -0,0 +1,4 @@
[vlc]
source = "regex"
url = "https://www.videolan.org/vlc/download-sources.html"
regex = "Latest VLC source code tarball \\(([0-9\\.]+)\\):"

View File

@ -5,11 +5,11 @@
# Contributor: Martin Sandsmark <martin.sandsmark@kde.org>
pkgname=vlc
_vlcver=3.0.20
_vlcver=3.0.21
# optional fixup version including hyphen
_vlcfixupver=
pkgver=${_vlcver}${_vlcfixupver//-/.r}
pkgrel=10
pkgrel=1
pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
url='https://www.videolan.org/vlc/'
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
@ -202,15 +202,11 @@ source=(
https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
update-vlc-plugin-cache.hook
taglib-2.patch
vlc-3.0.20-c99.patch
vlc-3.0.20-c99-2.patch
)
sha512sums=('02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406'
sha512sums=('cb1af76c8056648c331d7e6e0680d161ed1849eb635987504f45eae02531e9b432651034317fa7e02b0722905dfb9f0f5dad67b5924cc62edcaf0d173ac36aee'
'SKIP'
'b247510ffeadfd439a5dadd170c91900b6cdb05b5ca00d38b1a17c720ffe5a9f75a32e0cb1af5ebefdf1c23c5acc53513ed983a736e8fa30dd8fad237ef49dd3'
'ea0d1e1dfed16dac8f9027eb55d987dee59630568b9744ceb42bfa134ea9295252d83574f3d793a76a5be3b02661c1731ed366003b6b55b2d7f02fde70586ff3'
'2b609afab28bf57adca34e11d9eeb120d6c61c7d3d3b06c999bac13987d1d4116819ce18d5af68e737c4f2eda727d619d129640d240ffdccdc634eeac91dd27a'
'1b5d40171ca9247fe144284eef8bf832626700d3daae76a7b7b2928c774de54e3e646da0ffcc8f2f0874d7fa1f289fa027c44cdc4b8461e0b2f9cdd8bc049f3f')
'ea0d1e1dfed16dac8f9027eb55d987dee59630568b9744ceb42bfa134ea9295252d83574f3d793a76a5be3b02661c1731ed366003b6b55b2d7f02fde70586ff3')
validpgpkeys=('65F7C6B4206BD057A7EB73787180713BE58D1ADC') # VideoLAN Release Signing Key
prepare() {
@ -233,7 +229,7 @@ prepare() {
build() {
cd ${pkgname}-${_vlcver}
export CFLAGS+=" -I/usr/include/samba-4.0 -ffat-lto-objects"
export CFLAGS+=" -I/usr/include/samba-4.0 -ffat-lto-objects -Wno-incompatible-pointer-types"
export CPPFLAGS+=" -I/usr/include/samba-4.0"
export CXXFLAGS+=" -std=c++17"
export PKG_CONFIG_PATH="/usr/lib/ffmpeg4.4/pkgconfig"
@ -249,14 +245,15 @@ build() {
--disable-taglib #FIXME: broken only on powerpc
)
;;
riscv64)
riscv64)
export CFLAGS+=" -latomic"
export CXXFLAGS+=" -latomic"
;;
*)
*)
_configure_options=(
--enable-taglib
)
;;
esac
./configure \
@ -345,6 +342,7 @@ build() {
--enable-libxml2 \
--disable-libgcrypt \
--enable-gnutls \
--enable-taglib \
--enable-secret \
--enable-kwallet \
--disable-update-check \

View File

@ -1,23 +0,0 @@
https://bugs.gentoo.org/926261
https://code.videolan.org/videolan/vlc/-/commit/770789f265761fc7ab2de69ca105fec4ad93d9e2
From 770789f265761fc7ab2de69ca105fec4ad93d9e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Mon, 26 Feb 2018 20:36:29 +0200
Subject: [PATCH] chromaprint: missing cast
(cherry picked from commit 7bd5bab3e43ae187f7219db61ed85d06d2ba0547)
Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
--- a/modules/stream_out/chromaprint.c
+++ b/modules/stream_out/chromaprint.c
@@ -231,7 +231,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
if ( !p_sys->b_finished && id->i_samples > 0 && p_buf->i_buffer )
{
if(! chromaprint_feed( p_sys->p_chromaprint_ctx,
- p_buf->p_buffer,
+ (int16_t *)p_buf->p_buffer,
p_buf->i_buffer / BYTESPERSAMPLE ) )
msg_Warn( p_stream, "feed error" );
id->i_samples -= i_samples;
--
GitLab

View File

@ -1,150 +0,0 @@
https://bugs.gentoo.org/919068
https://code.videolan.org/videolan/vlc/-/issues/28441
https://code.videolan.org/videolan/vlc/-/merge_requests/4645
From 1e2918115ca2f5c4ffde00dc02ad89525714f6c2 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Tue, 5 Dec 2023 09:23:35 +0100
Subject: [PATCH 1/5] input: fix incompatible-pointer-types assignment
Fixes #28441
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -117,7 +117,7 @@ typedef struct input_thread_private_t
/* Title infos FIXME multi-input (not easy) ? */
int i_title;
- const input_title_t **title;
+ input_title_t * const *title;
int i_title_offset;
int i_seekpoint_offset;
--
GitLab
From adcf4e66e2ce2c382bb97957c91bfde040f4f3ca Mon Sep 17 00:00:00 2001
From: Zhao Zhili <quinkblack@foxmail.com>
Date: Thu, 1 Mar 2018 14:25:59 +0800
Subject: [PATCH 2/5] yadif: fix variable type
Signed-off-by: Thomas Guillem <thomas@gllm.fr>
(cherry picked from commit 77b86f4452be4dbe0d56a9cd1b66da61b116da60)
Signed-off-by: Thomas Guillem <thomas@gllm.fr>
--- a/modules/video_filter/deinterlace/yadif.h
+++ b/modules/video_filter/deinterlace/yadif.h
@@ -140,10 +140,10 @@ static void yadif_filter_line_c(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8
}
static void yadif_filter_line_c_16bit(uint8_t *dst8, uint8_t *prev8, uint8_t *cur8, uint8_t *next8, int w, int prefs, int mrefs, int parity, int mode) {
- uint8_t *dst = (uint8_t *)dst8;
- uint8_t *prev = (uint8_t *)prev8;
- uint8_t *cur = (uint8_t *)cur8;
- uint8_t *next = (uint8_t *)next8;
+ uint16_t *dst = (uint16_t *)dst8;
+ uint16_t *prev = (uint16_t *)prev8;
+ uint16_t *cur = (uint16_t *)cur8;
+ uint16_t *next = (uint16_t *)next8;
int x;
uint16_t *prev2= parity ? prev : cur ;
uint16_t *next2= parity ? cur : next;
--
GitLab
From 45198e5328ff2b2f4eb2fb76add0789fec26270f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sun, 3 Mar 2019 09:59:10 +0200
Subject: [PATCH 3/5] swscale: avoid invalid pointer conversion
(cherry picked from commit ab00e6c59d42e05ab08893091783d8b5febc0058)
Signed-off-by: Thomas Guillem <thomas@gllm.fr>
--- a/modules/video_chroma/swscale.c
+++ b/modules/video_chroma/swscale.c
@@ -588,8 +588,9 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx,
{
filter_sys_t *p_sys = p_filter->p_sys;
uint8_t palette[AVPALETTE_SIZE];
- uint8_t *src[4]; int src_stride[4];
- uint8_t *dst[4]; int dst_stride[4];
+ uint8_t *src[4], *dst[4];
+ const uint8_t *csrc[4];
+ int src_stride[4], dst_stride[4];
GetPixels( src, src_stride, p_sys->desc_in, &p_filter->fmt_in.video,
p_src, i_plane_count, b_swap_uvi );
@@ -606,11 +607,14 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx,
GetPixels( dst, dst_stride, p_sys->desc_out, &p_filter->fmt_out.video,
p_dst, i_plane_count, b_swap_uvo );
+ for (size_t i = 0; i < ARRAY_SIZE(src); i++)
+ csrc[i] = src[i];
+
#if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0)
- sws_scale( ctx, src, src_stride, 0, i_height,
+ sws_scale( ctx, csrc, src_stride, 0, i_height,
dst, dst_stride );
#else
- sws_scale_ordered( ctx, src, src_stride, 0, i_height,
+ sws_scale_ordered( ctx, csrc, src_stride, 0, i_height,
dst, dst_stride );
#endif
}
--
GitLab
From 4431076ad4a21fdcabd3f7ef1d61c45891689b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sun, 3 Mar 2019 17:20:04 +0200
Subject: [PATCH 4/5] dynamicoverlay: fix variable shadowing
(cherry picked from commit d42e05d6b2c061ae352c131d5aebf8c8d8aa6d35)
Signed-off-by: Thomas Guillem <thomas@gllm.fr>
--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
+++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
@@ -899,12 +899,11 @@ static const commanddesc_static_t p_commands[] =
void RegisterCommand( filter_t *p_filter )
{
filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys;
- size_t i_index = 0;
p_sys->i_commands = ARRAY_SIZE(p_commands);
p_sys->pp_commands = (commanddesc_t **) calloc( p_sys->i_commands, sizeof(commanddesc_t*) );
if( !p_sys->pp_commands ) return;
- for( i_index = 0; i_index < p_sys->i_commands; i_index ++ )
+ for( size_t i_index = 0; i_index < p_sys->i_commands; i_index ++ )
{
p_sys->pp_commands[i_index] = (commanddesc_t *) malloc( sizeof(commanddesc_t) );
if( !p_sys->pp_commands[i_index] ) return;
--
GitLab
From fda14fc7c013eb75291df10cc8b88336c51328ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Mon, 26 Feb 2018 20:43:03 +0200
Subject: [PATCH 5/5] dynamicoverlay: fix memory corruption
Font alpha is 8-bits, not 32-bits.
(cherry picked from commit 6f14081af7325d334a53126c4eea52bc30fc08a0)
Signed-off-by: Thomas Guillem <thomas@gllm.fr>
--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
+++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c
@@ -234,8 +234,12 @@ static int parser_SetTextAlpha( char *psz_command, char *psz_end,
skip_space( &psz_command );
if( isdigit( (unsigned char)*psz_command ) )
{
- if( parse_digit( &psz_command, &p_params->fontstyle.i_font_alpha ) == VLC_EGENERIC )
+ int32_t value;
+
+ if( parse_digit( &psz_command, &value ) == VLC_EGENERIC )
return VLC_EGENERIC;
+
+ p_params->fontstyle.i_font_alpha = value;
}
return VLC_SUCCESS;
}
--
GitLab