commit: 4acce30f14476d8b2f99e64275abe57054bf8d05 Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr> AuthorDate: Tue Jan 21 22:56:02 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jan 30 22:34:23 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4acce30f
media-sound/mixxx: taglib-2 blocker Even if upstream has produced a patch to compile with taglib2, it is advised against using it because of new '/' separator for multi value tags. Blocker could be remove soon (pull/12854). See : issues 12708 12790 https://github.com/Holzhaus/mixxx/commit/4e4d4e866ef86bb4d196a1903778697552cca05a https://github.com/mixxxdj/mixxx/pull/12854.patch Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr> Closes: https://github.com/gentoo/gentoo/pull/40251 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../mixxx/files/mixxx-2.3.6-fix-build-taglib2.patch | 14 -------------- .../mixxx/{mixxx-2.3.6-r1.ebuild => mixxx-2.3.6-r2.ebuild} | 5 ++--- media-sound/mixxx/mixxx-2.3.9999.ebuild | 5 ++--- media-sound/mixxx/mixxx-9999.ebuild | 4 ++-- 4 files changed, 6 insertions(+), 22 deletions(-) diff --git a/media-sound/mixxx/files/mixxx-2.3.6-fix-build-taglib2.patch b/media-sound/mixxx/files/mixxx-2.3.6-fix-build-taglib2.patch deleted file mode 100644 index 1a00a455e6ea..000000000000 --- a/media-sound/mixxx/files/mixxx-2.3.6-fix-build-taglib2.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://github.com/mixxxdj/mixxx/commit/1dd2ae25e065401371800ad76cb813021702a9e1.patch -diff --git a/src/track/taglib/trackmetadata_ape.cpp b/src/track/taglib/trackmetadata_ape.cpp -index c370c6a7f93..b4af3b5afbc 100644 ---- a/src/track/taglib/trackmetadata_ape.cpp -+++ b/src/track/taglib/trackmetadata_ape.cpp -@@ -59,7 +59,7 @@ bool importCoverImageFromTag(QImage* pCoverArt, const TagLib::APE::Tag& tag) { - if (tag.itemListMap().contains("COVER ART (FRONT)")) { - const TagLib::ByteVector nullStringTerminator(1, 0); - TagLib::ByteVector item = -- tag.itemListMap()["COVER ART (FRONT)"].value(); -+ tag.itemListMap()["COVER ART (FRONT)"].binaryData(); - int pos = item.find(nullStringTerminator); // skip the filename - if (++pos > 0) { - const TagLib::ByteVector data(item.mid(pos)); diff --git a/media-sound/mixxx/mixxx-2.3.6-r1.ebuild b/media-sound/mixxx/mixxx-2.3.6-r2.ebuild similarity index 97% rename from media-sound/mixxx/mixxx-2.3.6-r1.ebuild rename to media-sound/mixxx/mixxx-2.3.6-r2.ebuild index d1cbb797177d..429f29d55113 100644 --- a/media-sound/mixxx/mixxx-2.3.6-r1.ebuild +++ b/media-sound/mixxx/mixxx-2.3.6-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -49,7 +49,7 @@ RDEPEND=" media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband - media-libs/taglib:= + <media-libs/taglib-2 media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= @@ -92,7 +92,6 @@ PATCHES=( "${FILESDIR}"/${PN}-2.3.0-docs.patch "${FILESDIR}"/${PN}-2.3.0-cmake.patch "${FILESDIR}"/${PN}-2.3.1-benchmark_compile_fix.patch - "${FILESDIR}"/${PN}-2.3.6-fix-build-taglib2.patch ) PLOCALES=" diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild index 442ba0752f5f..e6988a2060f6 100644 --- a/media-sound/mixxx/mixxx-2.3.9999.ebuild +++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -49,7 +49,7 @@ RDEPEND=" media-libs/portaudio[alsa] media-libs/portmidi media-libs/rubberband - media-libs/taglib:= + <media-libs/taglib-2 media-libs/vamp-plugin-sdk media-sound/lame sci-libs/fftw:3.0= @@ -90,7 +90,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-9999-docs.patch - "${FILESDIR}"/${PN}-2.3.6-fix-build-taglib2.patch ) PLOCALES=" diff --git a/media-sound/mixxx/mixxx-9999.ebuild b/media-sound/mixxx/mixxx-9999.ebuild index 7f200f135d0b..cf915aaeb49f 100644 --- a/media-sound/mixxx/mixxx-9999.ebuild +++ b/media-sound/mixxx/mixxx-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -50,7 +50,7 @@ RDEPEND=" media-libs/portaudio media-libs/portmidi media-libs/rubberband - media-libs/taglib:= + <media-libs/taglib-2 media-libs/vamp-plugin-sdk sci-libs/fftw:3.0= sys-power/upower
