From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C5E211580E0 for ; Thu, 30 Jan 2025 22:39:55 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id A398534310E for ; Thu, 30 Jan 2025 22:39:55 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 9E21511046F; Thu, 30 Jan 2025 22:39:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 90DB61103B6 for ; Thu, 30 Jan 2025 22:39:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 369FC34310D for ; Thu, 30 Jan 2025 22:39:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 676B511A7 for ; Thu, 30 Jan 2025 22:39:52 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1738276463.4acce30f14476d8b2f99e64275abe57054bf8d05.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/files/, media-sound/mixxx/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/mixxx/files/mixxx-2.3.6-fix-build-taglib2.patch media-sound/mixxx/mixxx-2.3.6-r1.ebuild media-sound/mixxx/mixxx-2.3.6-r2.ebuild media-sound/mixxx/mixxx-2.3.9999.ebuild media-sound/mixxx/mixxx-9999.ebuild X-VCS-Directories: media-sound/mixxx/files/ media-sound/mixxx/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4acce30f14476d8b2f99e64275abe57054bf8d05 X-VCS-Branch: master Date: Thu, 30 Jan 2025 22:39:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 18a25f8e-04e6-4f06-bd09-7c3462e40745 X-Archives-Hash: f34d5965f06f0613df94d7a7c059fb13 commit: 4acce30f14476d8b2f99e64275abe57054bf8d05 Author: Nicolas PARLANT parhuet fr> AuthorDate: Tue Jan 21 22:56:02 2025 +0000 Commit: Andreas Sturmlechner gentoo 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 parhuet.fr> Closes: https://github.com/gentoo/gentoo/pull/40251 Signed-off-by: Andreas Sturmlechner 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:= +