From nobody Fri Jun 07 01:23:07 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VwNk41GQsz5NQb2; Fri, 07 Jun 2024 01:23:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VwNk36Mcqz4N1Z; Fri, 7 Jun 2024 01:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717723387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D3TM4cQCXD1QAf2RSsBb4YP2cpUsKIMSj/DNLXHXYMg=; b=gPAUwngQ2mRxvsFBImwID2dA50lPfOcBbPXyMHvMXw1hHN/cp++611442IeVsahhaKoHOu BTs19oi3E+rs2nFbmHohIVMjf0Y8yjAjESy3F3Uc83Pkbd0yeaJjxnud68l9zl5trQcRUb /xyHUsSgFyn/apFYCDiwlsqJf1OvLtXY8UytZVGfREmoHqJsZY/A3bq8yRx3S1LxYtV9GY lg4ezPWOKKuMJpCqNhuOPd+GhsEIMlIpGoKncpFf2inMaVlIay2AJaqdZNAYsqdAi6fDu1 GX8is/uIg2yPhnZTMQVX2teVF1D22qDyjlt91oZi3jwnpYfQfoygD9D5g4SxNg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717723387; a=rsa-sha256; cv=none; b=Ve+bdNKyM0XgOszc0XRKBfOAzAxAUlribkLMhYJH67K/KV5YlbVQOiwnpm1cDaeVPftDfK qJ73a3OgpZ/TMlynBfuyC08Kvnyn2brvwlIB/SxFfZmIvSB3K6NL2REGrvMlf/EcRSmDhH uuIOphxj+NAnW4bR6/0tY+2EMNmrlJFDS+ShmdOo4ZEBdUBE1lsKEGPVJYlWr9ibgfPpNq AWvX1o3YuuGwRvyfh0+Xfa06iFjVS1600fg9j0x7r5GkK4By6p81H6j8yFS9DZwqnoNLfc NVa3X4JnuwZsEevm8HVUb2aEKh91l3aQceo4q+XeTlSvXRVwycYx9MlOexWjrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717723387; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D3TM4cQCXD1QAf2RSsBb4YP2cpUsKIMSj/DNLXHXYMg=; b=PhHGYNbmUjQ7kz67v4dc+hnESY7DA0eKXv1SsGoS80RBj922xQgQjk728EKhwbBxzMOa9j Olc6K7lHdFA6UZP8Q46o/953iXO8eG0SkE+bru33NPgiU3MTem+PCc1l/R7hhgyID/Tm1v jjY44d2e/6ODGdb1YJVAjDThIX/JV5U0ohixaswZV+npyrU61u3fuAZ+bLLs2SFmpO1eaF oIocDoYiy9NIYtsqNFwxSMcMSnKWTUfI3yj4UnUus8FQ+J3h1UoKgXzrxXNOr7Roqipzsj 7KhiWpc2yZJ1+VyrI7o3SBv3bylzIZvj4al1M4f0ZHMgIAt+4w3AicIyS+idpw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VwNk35zKvz18VT; Fri, 7 Jun 2024 01:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4571N7FD019717; Fri, 7 Jun 2024 01:23:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4571N7W0019714; Fri, 7 Jun 2024 01:23:07 GMT (envelope-from git) Date: Fri, 7 Jun 2024 01:23:07 GMT Message-Id: <202406070123.4571N7W0019714@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: d7e2af190e56 - main - multimedia/musique: Prepare for Taglib 2.x List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d7e2af190e56f36661230d12c86cbf4adfd76e51 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=d7e2af190e56f36661230d12c86cbf4adfd76e51 commit d7e2af190e56f36661230d12c86cbf4adfd76e51 Author: Jason E. Hale AuthorDate: 2024-06-06 21:54:39 +0000 Commit: Jason E. Hale CommitDate: 2024-06-06 23:05:02 +0000 multimedia/musique: Prepare for Taglib 2.x PR: 276677 Obtained from: upstream --- multimedia/musique/files/patch-src_coverutils.cpp | 16 ++++++++++++++ multimedia/musique/files/patch-src_mainwindow.cpp | 17 +++++++++++++++ multimedia/musique/files/patch-src_tags_mp4utils.h | 25 ++++++++++++++++++++++ .../musique/files/patch-src_tags_tagutils.cpp | 13 +++++++++++ 4 files changed, 71 insertions(+) diff --git a/multimedia/musique/files/patch-src_coverutils.cpp b/multimedia/musique/files/patch-src_coverutils.cpp new file mode 100644 index 000000000000..1f74650156b8 --- /dev/null +++ b/multimedia/musique/files/patch-src_coverutils.cpp @@ -0,0 +1,16 @@ +Fix build with Taglib 2.x + +Obtained from: +https://github.com/flaviotordini/musique/commit/7277d40defe9cde40f947a81d624195ddf683f44 + +--- src/coverutils.cpp.orig 2023-06-24 18:44:28 UTC ++++ src/coverutils.cpp +@@ -159,7 +159,7 @@ bool CoverUtils::coverFromMP4(const QString &filename, + TagLib::MP4::Tag *tag = static_cast(f.tag()); + if (!tag) return false; + +- TagLib::MP4::ItemListMap itemsListMap = tag->itemListMap(); ++ TagLib::MP4::ItemMap itemsListMap = tag->itemMap(); + TagLib::MP4::Item coverItem = itemsListMap["covr"]; + TagLib::MP4::CoverArtList coverArtList = coverItem.toCoverArtList(); + TagLib::MP4::CoverArt coverArt = coverArtList.front(); diff --git a/multimedia/musique/files/patch-src_mainwindow.cpp b/multimedia/musique/files/patch-src_mainwindow.cpp new file mode 100644 index 000000000000..c1410a1a6c5a --- /dev/null +++ b/multimedia/musique/files/patch-src_mainwindow.cpp @@ -0,0 +1,17 @@ +Fix build with Taglib 2.x + +Obtained from: +https://github.com/flaviotordini/musique/commit/7277d40defe9cde40f947a81d624195ddf683f44 + +--- src/mainwindow.cpp.orig 2023-06-24 18:44:28 UTC ++++ src/mainwindow.cpp +@@ -575,6 +575,9 @@ void MainWindow::createToolBar() { + volumeSlider = new SeekSlider(this); + volumeSlider->setValue(volumeSlider->maximum()); + ++#include ++ ++ + #if defined(APP_MAC_SEARCHFIELD) && !defined(APP_MAC_QMACTOOLBAR) + SearchWrapper *searchWrapper = new SearchWrapper(this); + toolbarSearch = searchWrapper->getSearchLineEdit(); diff --git a/multimedia/musique/files/patch-src_tags_mp4utils.h b/multimedia/musique/files/patch-src_tags_mp4utils.h new file mode 100644 index 000000000000..ed5966e9a3f9 --- /dev/null +++ b/multimedia/musique/files/patch-src_tags_mp4utils.h @@ -0,0 +1,25 @@ +Fix build with Taglib 2.x + +Obtained from: +https://github.com/flaviotordini/musique/commit/7277d40defe9cde40f947a81d624195ddf683f44 + +--- src/tags/mp4utils.h.orig 2023-06-24 18:44:28 UTC ++++ src/tags/mp4utils.h +@@ -9,7 +9,7 @@ void load(TagLib::MP4::Tag *tag, Tags *tags) { + namespace Mp4Utils { + + void load(TagLib::MP4::Tag *tag, Tags *tags) { +- const TagLib::MP4::ItemListMap &map = tag->itemListMap(); ++ const TagLib::MP4::ItemMap &map = tag->itemMap(); + + if (map.contains("trkn")) { + TagLib::MP4::Item::IntPair intPair = map["trkn"].toIntPair(); +@@ -31,7 +31,7 @@ void load(TagLib::MP4::Tag *tag, Tags *tags) { + tags->setComposerSort(v); + } + +- TagLib::MP4::ItemListMap::ConstIterator it = map.find("aART"); ++ TagLib::MP4::ItemMap::ConstIterator it = map.find("aART"); + if (it != map.end()) { + TagLib::StringList sl = it->second.toStringList(); + if (!sl.isEmpty()) diff --git a/multimedia/musique/files/patch-src_tags_tagutils.cpp b/multimedia/musique/files/patch-src_tags_tagutils.cpp new file mode 100644 index 000000000000..634728b76fbc --- /dev/null +++ b/multimedia/musique/files/patch-src_tags_tagutils.cpp @@ -0,0 +1,13 @@ +TagLib::AudioProperties::length() is deprecated in Taglib 2.x. + +--- src/tags/tagutils.cpp.orig 2023-06-24 18:44:28 UTC ++++ src/tags/tagutils.cpp +@@ -49,7 +49,7 @@ Tags *TagUtils::load(const QString &filename) { + tags->setComment(TagUtils::qString(tag->comment())); + TagLib::AudioProperties *audioProperties = fileref.audioProperties(); + if (audioProperties) +- tags->setDuration(audioProperties->length()); ++ tags->setDuration(audioProperties->lengthInSeconds()); + } + + /*