gentoo auto-resync : 28:12:2024 - 06:30:54

3 files changed, 51 insertions, 4 deletions

diff --git a/media-sound/yarock/Manifest b/media-sound/yarock/Manifest
index b3934f7d2b82..0a3dfc8922e6 100644
--- a/media-sound/yarock/Manifest
+++ b/media-sound/yarock/Manifest
@@ -1,3 +1,4 @@
+AUX yarock-1.4.0-fix-build-taglib2.patch 1863 BLAKE2B d52fc6407b663d362e516013b3d011e47240bfc3e8856951a9d2ee12864ca4d9ff2d83d100b24b4b3039422da981ba3fa5891abe3edeeff0e0548ae59c205c12 SHA512 71907f11188558935d180661500da26bc9b815330915a50e1929234f194c8200efd15cb516b58442edb173a08e1a797d25eb217ba319425d12fa252109a7eda4
 DIST Yarock_1.4.0_Sources.tar.gz 735399 BLAKE2B e54e995a419e1837b746374d3d7c6655e750d5142cce4d573dc268010b7bcf9da1a15531991769c16693f8b587228da445d4a14a89499600708309876f83bb5f SHA512 39ad470cd53fef738166ca635ca96da0868db406b62be92d276062acc568724a62886b7779eb47fc6a3e6d2825fe417753e9e6b87a978b9009e09d7ea5866f00
-EBUILD yarock-1.4.0-r3.ebuild 1216 BLAKE2B 5a106f69decc2b1dad915e8b45a33b97ba5df4d78b65316915b671284cbe96e148f1dc656a817b945234559ff35276ca7a12fa3d7e8464eb88aabf0275909bc8 SHA512 360d81e67cb87e6a91d9868c834d5ff334274e40e214556ebdb519d59c1b7c1c450afa9b3af3781cc3cff866f7f994b6ede39b64acbe834f18b22a4091b655a4
+EBUILD yarock-1.4.0-r4.ebuild 1281 BLAKE2B 09d4ee71860e48ac6c78ab651f3d55eb61fd2ec66e345c40aa7d0ef90a6feb58b7f4194c74d94a273b3dccffbd147f4ddfb67deb7d0153c64130ddb7a7c98e15 SHA512 48682ff3113006065854d36db3b942769c169d1ae12d0b778e833b34bd2da5df0739c3139ede4d1ccde2d627903ff4384909d68f60946838edb9d0010204f13b
 MISC metadata.xml 478 BLAKE2B 61705b6938687fabef20be9ca0733531a8e50dc2a1853e27c62e695ac2a506a3f8b6d456aa21b428544bd31a1c7346317f5905bfa4188c63755e2aad3d5864b6 SHA512 3afed127784c1f952f2c49dd80c527a5816e080f3b1edb83575e4fd325221512c1a5767eb3a0f331db3eaf1c51268d577d8c0524afffa9c2814714aeeb12e1a3
diff --git a/media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch b/media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch
new file mode 100644
index 000000000000..d234866ea26d
--- /dev/null
+++ b/media-sound/yarock/files/yarock-1.4.0-fix-build-taglib2.patch
@@ -0,0 +1,44 @@
+https://github.com/sebaro/Yarock/commit/3cdc8910a6dec9054913dcdd8e804bb79b53b861.patch
+--- a/src/core/mediaitem/tag.cpp
++++ b/src/core/mediaitem/tag.cpp
+@@ -28,6 +28,7 @@
+
+ #include <taglib/mpegfile.h>
+ #include <taglib/asffile.h>
++#include <taglib/attachedpictureframe.h>
+ #include <taglib/vorbisfile.h>
+ #include <taglib/oggfile.h>
+ #include <taglib/oggflacfile.h>
+@@ -289,10 +290,10 @@
+ /*----------------------------------------------------------------------------*/
+ static void readMP4Tags(TagLib::MP4::Tag *tag, MEDIA::TrackPtr track, QString& s_disc )
+ {
+-    const TagLib::MP4::ItemListMap& items = tag->itemListMap();
++    const TagLib::MP4::ItemMap& items = tag->itemMap();
+ 
+     /* album artists tags */
+-    TagLib::MP4::ItemListMap::ConstIterator it = items.find("aART");
++    TagLib::MP4::ItemMap::ConstIterator it = items.find("aART");
+     if ( it != items.end() ) 
+     {
+         TagLib::StringList album_artists = it->second.toStringList();
+@@ -665,7 +666,7 @@
+     else if (TagLib::MP4::File* file = dynamic_cast<TagLib::MP4::File*>(fileref.file())) 
+     {
+       TagLib::MP4::Tag* tag = file->tag();
+-      tag->itemListMap()[kMP4_FMPS_Rating_ID] = TagLib::StringList(QStringToTaglibString(QString::number( rating )));
++      tag->setItem(kMP4_FMPS_Rating_ID, TagLib::StringList(QStringToTaglibString(QString::number( rating ))));
+     }
+     else 
+     {
+@@ -772,8 +773,8 @@
+     if (aac_file) 
+     {
+       TagLib::MP4::Tag* tag = aac_file->tag();
+-      const TagLib::MP4::ItemListMap& items = tag->itemListMap();
+-      TagLib::MP4::ItemListMap::ConstIterator it = items.find("covr");
++      const TagLib::MP4::ItemMap& items = tag->itemMap();
++      TagLib::MP4::ItemMap::ConstIterator it = items.find("covr");
+       if (it != items.end()) 
+       {
+         const TagLib::MP4::CoverArtList& art_list = it->second.toCoverArtList();
diff --git a/media-sound/yarock/yarock-1.4.0-r3.ebuild b/media-sound/yarock/yarock-1.4.0-r4.ebuild
index 2d7d556e68e6..e12b562a93b8 100644
--- a/media-sound/yarock/yarock-1.4.0-r3.ebuild
+++ b/media-sound/yarock/yarock-1.4.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -25,10 +25,10 @@ RDEPEND="
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
-	media-libs/taglib
+	media-libs/taglib:=
 	x11-libs/libX11
 	mpv? ( media-video/mpv:=[libmpv] )
-	phonon? ( >=media-libs/phonon-4.11.0[qt5(+)] )
+	phonon? ( >=media-libs/phonon-4.12.0[qt5(-)] )
 	vlc? ( media-video/vlc:= )
 "
 DEPEND="${RDEPEND}
@@ -39,6 +39,8 @@ BDEPEND="
 	dev-qt/linguist-tools:5
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-1.4.0-fix-build-taglib2.patch )
+
 DOCS=( CHANGES.md README.md )
 
 src_prepare() {