From ff4c6dc4bac0455e24be57d61f17254a6f88c1eb Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 8 Dec 2025 19:36:52 +0100 Subject: [PATCH] vlc: update to 3.0.22. --- srcpkgs/vlc/patches/taglib-2.0.patch | 97 ---------------------------- srcpkgs/vlc/patches/x265-4.0.patch | 43 ------------ srcpkgs/vlc/patches/x265-4.1.patch | 53 --------------- srcpkgs/vlc/template | 6 +- 4 files changed, 3 insertions(+), 196 deletions(-) delete mode 100644 srcpkgs/vlc/patches/taglib-2.0.patch delete mode 100644 srcpkgs/vlc/patches/x265-4.0.patch delete mode 100644 srcpkgs/vlc/patches/x265-4.1.patch diff --git a/srcpkgs/vlc/patches/taglib-2.0.patch b/srcpkgs/vlc/patches/taglib-2.0.patch deleted file mode 100644 index 930e55fb6df..00000000000 --- a/srcpkgs/vlc/patches/taglib-2.0.patch +++ /dev/null @@ -1,97 +0,0 @@ -Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/raw/40b8a8a1fc24f594a0b828fbde521c644964efaf/taglib-2.patch -diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp -index 84b401c..a3bdac7 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; -@@ -216,7 +216,7 @@ public: - - void seek(long offset, Position p) - { -- uint64_t pos = 0; -+ offset_t pos = 0; - switch (p) - { - case Current: -@@ -237,12 +237,12 @@ public: - return; - } - -- long tell() const -+ offset_t tell() const - { - return m_previousPos; - } - -- long length() -+ offset_t length() - { - uint64_t i_size; - if (vlc_stream_GetSize( m_stream, &i_size ) != VLC_SUCCESS) -@@ -256,7 +256,7 @@ public: - - private: - stream_t* m_stream; -- int64_t m_previousPos; -+ offset_t m_previousPos; - }; - #endif /* TAGLIB_VERSION_1_11 */ - -@@ -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(f.file()) ) - WriteMetaToId3v2( riff_aiff->tag(), p_item ); - else if( RIFF::WAV::File* riff_wav = dynamic_cast(f.file()) ) -- WriteMetaToId3v2( riff_wav->tag(), p_item ); -+ WriteMetaToId3v2( riff_wav->ID3v2Tag(), p_item ); - } - else if( TrueAudio::File* trueaudio = dynamic_cast(f.file()) ) - { diff --git a/srcpkgs/vlc/patches/x265-4.0.patch b/srcpkgs/vlc/patches/x265-4.0.patch deleted file mode 100644 index 20bd879c379..00000000000 --- a/srcpkgs/vlc/patches/x265-4.0.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 83e2c3955a563b60f74f05cea57e3ab5f447c8fb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Cartegnie?= -Date: Tue, 24 Sep 2024 18:53:11 +0700 -Subject: [PATCH] codec: x265: handle 4.0 encoding API change - -refs #28799 ---- - modules/codec/x265.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/modules/codec/x265.c b/modules/codec/x265.c -index 4c2b585594b2..5c5f35e214df 100644 ---- a/modules/codec/x265.c -+++ b/modules/codec/x265.c -@@ -71,6 +71,11 @@ static block_t *Encode(encoder_t *p_enc, picture_t *p_pict) - x265_picture pic; - - x265_picture_init(&p_sys->param, &pic); -+#ifdef MAX_SCALABLE_LAYERS -+ /* Handle API changes for scalable layers output in x265 4.0 */ -+ x265_picture *pics[MAX_SCALABLE_LAYERS] = {NULL}; -+ pics[0] = &pic; -+#endif - - if (likely(p_pict)) { - pic.pts = p_pict->date; -@@ -89,8 +94,13 @@ static block_t *Encode(encoder_t *p_enc, picture_t *p_pict) - - x265_nal *nal; - uint32_t i_nal = 0; -+#ifdef MAX_SCALABLE_LAYERS -+ x265_encoder_encode(p_sys->h, &nal, &i_nal, -+ likely(p_pict) ? &pic : NULL, pics); -+#else - x265_encoder_encode(p_sys->h, &nal, &i_nal, - likely(p_pict) ? &pic : NULL, &pic); -+#endif - - if (!i_nal) - return NULL; --- -GitLab - diff --git a/srcpkgs/vlc/patches/x265-4.1.patch b/srcpkgs/vlc/patches/x265-4.1.patch deleted file mode 100644 index 251574ccf3a..00000000000 --- a/srcpkgs/vlc/patches/x265-4.1.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 1e6808b25d6dd018db484314ee44db43b65038ea Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Mon, 13 Jan 2025 10:35:07 +0100 -Subject: [PATCH] x265: fix API signature with x265 4.1 - -They changed the API in c69c113960834400545bc4bce2830ff51dcb86b3 -And then reverted it in -78e5b703b186fe184bf91bb37df82f64059b3f61 - -The X265_BUILD is how you can tell the x265 version(s). But they didn't change -the values in these commits. - -- X265_BUILD was 210 when the API was changed -- X265_BUILD was 214 when the API was reverted ---- - modules/codec/x265.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/modules/codec/x265.c b/modules/codec/x265.c -index 1f6c2ad585c5..17ea12e2dadd 100644 ---- a/modules/codec/x265.c -+++ b/modules/codec/x265.c -@@ -39,6 +39,9 @@ - #ifndef X265_MAX_FRAME_THREADS - # define X265_MAX_FRAME_THREADS 16 - #endif -+#if X265_BUILD > 210 && X265_BUILD <= 214 -+#define X265_OUTPUT_ARRAY 1 -+#endif - - /***************************************************************************** - * Module descriptor -@@ -70,7 +73,7 @@ static block_t *Encode(encoder_t *p_enc, picture_t *p_pict) - x265_picture pic; - - x265_picture_init(&p_sys->param, &pic); --#ifdef MAX_SCALABLE_LAYERS -+#ifdef X265_OUTPUT_ARRAY - /* Handle API changes for scalable layers output in x265 4.0 */ - x265_picture *pics[MAX_SCALABLE_LAYERS] = {NULL}; - pics[0] = &pic; -@@ -91,7 +94,7 @@ static block_t *Encode(encoder_t *p_enc, picture_t *p_pict) - - x265_nal *nal; - uint32_t i_nal = 0; --#ifdef MAX_SCALABLE_LAYERS -+#ifdef X265_OUTPUT_ARRAY - x265_encoder_encode(p_sys->h, &nal, &i_nal, - likely(p_pict) ? &pic : NULL, pics); - #else --- -GitLab - diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template index 178efe59ed1..66e27e616c4 100644 --- a/srcpkgs/vlc/template +++ b/srcpkgs/vlc/template @@ -1,7 +1,7 @@ # Template file for 'vlc' pkgname=vlc -version=3.0.21 -revision=6 +version=3.0.22 +revision=1 build_style=gnu-configure configure_args="--disable-gme --disable-libtar --enable-jack --enable-live555 --disable-fluidsynth --enable-dvdread @@ -17,7 +17,7 @@ license="GPL-2.0-only, LGPL-2.1-only" homepage="https://www.videolan.org/vlc/" changelog="https://www.videolan.org/developers/vlc-branch/NEWS" distfiles="${VIDEOLAN_SITE}/vlc/${version}/vlc-${version}.tar.xz" -checksum=24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0 +checksum=e2cc1cf0ae0902a09da5a37c249a8a4e4b5ec4dc095443b8e1493c6a7cc138ea lib32disabled=yes