From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/
Date: Thu, 30 Jan 2025 22:39:52 +0000 (UTC) [thread overview]
Message-ID: <1738276463.4acce30f14476d8b2f99e64275abe57054bf8d05.asturm@gentoo> (raw)
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
next reply other threads:[~2025-01-30 22:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-30 22:39 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-22 9:47 [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/ Sam James
2025-03-10 17:05 Andreas Sturmlechner
2025-02-10 20:42 Andreas Sturmlechner
2025-02-10 20:42 Andreas Sturmlechner
2022-05-10 17:53 Miroslav Šulc
2021-01-04 9:17 Miroslav Šulc
2020-08-11 7:27 Miroslav Šulc
2020-06-08 9:19 Lars Wendler
2020-01-24 22:48 Andreas Sturmlechner
2018-12-26 0:04 Lars Wendler
2016-07-22 0:22 Lars Wendler
2016-07-21 21:16 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1738276463.4acce30f14476d8b2f99e64275abe57054bf8d05.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox