diff --git a/media-video/vlc/patches/vlc-3.0.21.patchset b/media-video/vlc/patches/vlc-3.0.21.patchset index 1997cf0a8..b2235fdeb 100644 --- a/media-video/vlc/patches/vlc-3.0.21.patchset +++ b/media-video/vlc/patches/vlc-3.0.21.patchset @@ -2295,77 +2295,3 @@ index 36aaa9d..95b2e74 100644 -- 2.45.2 - -From 6bb1dc25774228cc4832691658fea05fe66e8f94 Mon Sep 17 00:00:00 2001 -From: Begasus -Date: Tue, 10 Sep 2024 09:24:46 +0200 -Subject: applying patch taglib-2.patch - -Kudos to archlinux: https://gitlab.archlinux.org/archlinux/packaging/packages/vlc/-/blob/main/taglib-2.patch - -diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp -index 84b401c..f371485 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(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()) ) - { --- -2.45.2 - diff --git a/media-video/vlc/vlc-3.0.21.recipe b/media-video/vlc/vlc-3.0.21.recipe index 953839926..d5b31c4ea 100644 --- a/media-video/vlc/vlc-3.0.21.recipe +++ b/media-video/vlc/vlc-3.0.21.recipe @@ -5,7 +5,7 @@ VCDs, and various streaming protocols." HOMEPAGE="https://www.videolan.org/vlc/" COPYRIGHT="1998-2024 VideoLAN" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="https://download.videolan.org/pub/videolan/vlc/$portVersion/vlc-$portVersion.tar.xz" SOURCE_DIR="vlc-$portVersion" CHECKSUM_SHA256="24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0" @@ -139,7 +139,7 @@ BUILD_REQUIRES=" devel:libspeexdsp$secondaryArchSuffix devel:libssl$secondaryArchSuffix >= 3 devel:libswscale$secondaryArchSuffix >= 7 - devel:libtag$secondaryArchSuffix >= 2.0.0 + devel:libtag$secondaryArchSuffix >= 1.18.0 devel:libtheora$secondaryArchSuffix devel:libtwolame$secondaryArchSuffix devel:libupnp$secondaryArchSuffix