From nobody Sun Feb 25 23:30:18 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 4Tjg2z2CKNz5BZ0t; Sun, 25 Feb 2024 23:30:19 +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 4Tjg2z1fTWz4l3G; Sun, 25 Feb 2024 23:30:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708903819; 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=ZlxYmWzozJRFg7d2Zz7l+PSOCk5G73zXkQJo6aTI8Z8=; b=VaR0quzxjXZF/dfRbcOCIfNCx8T5Fmb3HIg/E0Dd45iPZW6WvUKoNdJjVAC8DiTWY7+Fqz 6jrey11nBzWQfoOkryBdKOFOT9y1QUJjCprcv1LGrqMV0PZadjkAvBvroeOUDMyiMFQKFq Pf3dX/OK3Rdr6fOwo1DLrOMmO2nJWoqexQ1ms4FQ3j5ynFbWlGCcTyUaeVBlYri89DnJ7q 3rT6OMHZKLe1zw9N3EmXNm3ymvcHWGkON3t7DdF+JjTCztbl42Q+foJTcvTz88y5wXGxGf HCoNhXp5BqRIbm1W4Mrsr7z8kGbeFu5C9ntgmNgfdaE5sITeV9Htdu4i2VVZlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708903819; a=rsa-sha256; cv=none; b=mY6LxMfsTjEIvGvBO4GQ7UEGJz0k8ng2zlxIIWNYN40aT0oOjPD2a8D9C1XNPu9zz8GsV3 Z4vLZYjnKbJ79oNaP90YwsnxpSPrHDFeaZFlEHg1mVju8ZCTacKsZyJuLfGsjL79/zjxss 3zNNzOwQM55BImgsuQXpOOAO/r31eF3yoYUalQ4HnZ7pcHrKhG4RElyx9L1y0kYlSoICAY fIFsvwt+axz0kmgSwXaeM7zPiIYVYrdJ8sPOLzfbJkToXHdPX/T8C90/rzn7Ab8qXRX8Um dLUsn5emXUHmyjo279+fDkKn/zdnLqcMp9vKxgiMXO19qOjn/KGgBvgjVmv5Hg== 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=1708903819; 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=ZlxYmWzozJRFg7d2Zz7l+PSOCk5G73zXkQJo6aTI8Z8=; b=AbgetWLKc2cfCI1aR3dVjhE3ij1sPSeNeSrr4WBCPw2fIwvv/+ziFMnGHJEbLFQ+oB9n1A D4qBNDw/tdex93tfEi1CkH5lTHJ9iy6Y+vCrd7hmtS3EpxkcP38qTQy3ys11vS5ODk1P2D /VchVByrVI0AbvTyI7DIUxCUexxLx6YHoCzJqIOGSIPTPICaLjNJLuahTl/CxlEcTFc7Rq kc/yr9oYfZFj8U/P6AG1yKY2NLETxNjAcDn0bLqvQZy1YrfzlPzxZfquM0CddDCMqot9x3 mN4sOEsi4EODQtA5tT5q1BlK87K5rJ7w3St1qscYpbU79b/uJHpi9ZOsbmoE3A== 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 4Tjg2z0jDdz147k; Sun, 25 Feb 2024 23:30:19 +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 41PNUJP1084566; Sun, 25 Feb 2024 23:30:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41PNUIbS084563; Sun, 25 Feb 2024 23:30:18 GMT (envelope-from git) Date: Sun, 25 Feb 2024 23:30:18 GMT Message-Id: <202402252330.41PNUIbS084563@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: beb9bf57ccec - main - audio/kid3: Update to 3.9.5 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: beb9bf57ccec83337966e5a82e0fea6317374e6c Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=beb9bf57ccec83337966e5a82e0fea6317374e6c commit beb9bf57ccec83337966e5a82e0fea6317374e6c Author: Jason E. Hale AuthorDate: 2024-02-25 23:08:32 +0000 Commit: Jason E. Hale CommitDate: 2024-02-25 23:30:14 +0000 audio/kid3: Update to 3.9.5 Drop legacy qt5 flavor, add kf6 flavor, and make qt6 the default. Changes: - added keyboard shortcuts for the audio player - added preference option to fix the audio output used - code has been modernized for C++17 - added support for TagLib 2.0 [1] PR: 276677 [1] --- MOVED | 3 ++- audio/kid3/Makefile | 38 ++++++++++++++++++++------------------ audio/kid3/distinfo | 6 +++--- audio/kid3/pkg-plist | 42 +++++++++++++++++++++--------------------- 4 files changed, 46 insertions(+), 43 deletions(-) diff --git a/MOVED b/MOVED index e45a8db0072a..999188f35ba3 100644 --- a/MOVED +++ b/MOVED @@ -1651,7 +1651,7 @@ science/R-cran-AMORE||2022-09-12|Has expired: Upstream no longer maintained www/moodle310|www/moodle311|2022-09-12|Has expired: Upstream no longer maintained, upgrade to next LTS security/s2n|security/s2n-tls|2022-09-13|Renamed to match upstream naming audio/kid3-kf5|audio/kid3@kf5|2022-09-13|Merged into flavorized version -audio/kid3-qt5|audio/kid3@qt5|2022-09-13|Merged into flavorized version +audio/kid3-qt5|audio/kid3@qt6|2022-09-13|Merged into flavorized version audio/phaserotate-lv2|audio/x42-plugins-lv2|2022-09-13|phaserotate-lv2 LV2 plugin is included in the x42-plugins-lv2 plugin collection graphics/darktable40|graphics/darktable|2022-09-22|Obsolete. Use graphics/darktable, which is the same version java/bootstrap-openjdk6|java/bootstrap-openjdk8|2022-09-25|Was only used to bootstrap the now deleted java/openjdk7 port @@ -2993,3 +2993,4 @@ graphics/qcustomplot-qt5|graphics/qcustomplot|2024-02-19|Renamed to support flav audio/play||2024-02-20|Has expired: Upstream vaporized and last release was in 2000 graphics/fotoxx|graphics/fotocx|2024-02-21|Project was renamed upstream databases/xtrabackup8|databases/xtrabackup80|2024-02-22|Rename port to avoid confusion +audio/kid3@qt5|audio/kid3@qt6|2024-02-25|The legacy qt5 flavor has been replaced by the qt6 flavor diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile index 3bd6832d5168..ba5bd4dc2983 100644 --- a/audio/kid3/Makefile +++ b/audio/kid3/Makefile @@ -1,6 +1,5 @@ PORTNAME= kid3 -PORTVERSION= 3.9.4 -PORTREVISION= 2 +PORTVERSION= 3.9.5 CATEGORIES= audio kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} PKGNAMESUFFIX= -${FLAVOR} @@ -15,10 +14,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl LIB_DEPENDS= libtag.so:audio/taglib -FLAVORS= qt5 qt6 kf5 +FLAVORS= qt6 kf5 kf6 FLAVOR?= ${FLAVORS:[1]} -USES= cmake compiler:c++11-lang desktop-file-utils gnome pkgconfig \ +USES= cmake compiler:c++17-lang desktop-file-utils gnome pkgconfig \ tar:xz USE_GNOME= libxslt:build USE_LDCONFIG= yes @@ -33,23 +32,15 @@ CMAKE_OFF= WITH_ID3LIB \ WITH_MP4V2 \ WITH_QML CMAKE_ON= WITH_TAGLIB -PLIST_SUB+= SHLIB_VER=${PORTVERSION} +PLIST_SUB+= KF_SUFX=${FLAVOR:S/kf//:S/qt//} \ + SHLIB_VER=${PORTVERSION} -.if ${FLAVOR} == qt5 -USES+= qt:5 -USE_QT= core dbus gui multimedia network xml widgets \ - buildtools:build linguisttools:build qmake:build -CMAKE_OFF+= BUILD_WITH_QT6 -PLIST_SUB+= KF5="@comment " \ - QT="" \ - QT_SUFX="-qt" -KID3_APPS+= QT -.elif ${FLAVOR} == qt6 +.if ${FLAVOR} == qt6 USES+= gl qt:6 USE_GL= opengl USE_QT= base multimedia tools:build CMAKE_ON+= BUILD_WITH_QT6 -PLIST_SUB+= KF5="@comment " \ +PLIST_SUB+= KF="@comment " \ QT="" \ QT_SUFX="-qt" KID3_APPS+= QT @@ -60,7 +51,18 @@ USE_KDE= auth codecs config configwidgets coreaddons kio \ USE_QT= concurrent core dbus gui multimedia network xml widgets \ buildtools:build linguisttools:build qmake:build CMAKE_OFF+= BUILD_WITH_QT6 -PLIST_SUB+= KF5="" \ +PLIST_SUB+= KF="" \ + QT="@comment " \ + QT_SUFX="" +KID3_APPS+= KDE +.elif ${FLAVOR} == kf6 +USES+= gl kde:6 qt:6 +USE_GL= opengl +USE_KDE= colorscheme config configwidgets coreaddons kio \ + widgetsaddons xmlgui doctools:build ecm:build +USE_QT= base multimedia tools:build +CMAKE_ON+= BUILD_WITH_QT6 +PLIST_SUB+= KF="" \ QT="@comment " \ QT_SUFX="" KID3_APPS+= KDE @@ -90,7 +92,7 @@ FLAC_CMAKE_BOOL= WITH_FLAC FLAC_IMPLIES= VORBIS TEST_USE= LOCALE=en_US.UTF-8 -.if ${FLAVOR} == qt5 || ${FLAVOR} == kf5 +.if ${FLAVOR} == kf5 TEST_USE+= QT=testlib:build .endif TEST_CMAKE_BOOL= BUILD_TESTING diff --git a/audio/kid3/distinfo b/audio/kid3/distinfo index 42ba611810da..f77a763e5704 100644 --- a/audio/kid3/distinfo +++ b/audio/kid3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1689017923 -SHA256 (kid3-3.9.4.tar.xz) = c410960e96225de0a1c4888c3ea1c6dc2ca245abb691474326dcdc3edbd6a520 -SIZE (kid3-3.9.4.tar.xz) = 1834140 +TIMESTAMP = 1708887915 +SHA256 (kid3-3.9.5.tar.xz) = a424fedde35c176e3b44334422aad43848418772da020751d00d0874e5ce8145 +SIZE (kid3-3.9.5.tar.xz) = 1843528 diff --git a/audio/kid3/pkg-plist b/audio/kid3/pkg-plist index ccad2eacd0d5..333e8c9d9062 100644 --- a/audio/kid3/pkg-plist +++ b/audio/kid3/pkg-plist @@ -10,25 +10,25 @@ lib/kid3/libmusicbrainzimport.so %%VORBIS%%lib/kid3/liboggflacmetadata.so lib/kid3/libtaglibmetadata.so share/applications/org.kde.kid3%%QT_SUFX%%.desktop -%%KF5%%share/dbus-1/interfaces/org.kde.Kid3.xml -%%KF5%%share/doc/HTML/ca/kid3/index.cache.bz2 -%%KF5%%share/doc/HTML/ca/kid3/index.docbook -%%KF5%%share/doc/HTML/de/kid3/index.cache.bz2 -%%KF5%%share/doc/HTML/de/kid3/index.docbook -%%KF5%%share/doc/HTML/en/kid3/index.cache.bz2 -%%KF5%%share/doc/HTML/en/kid3/index.docbook -%%KF5%%share/doc/HTML/it/kid3/index.cache.bz2 -%%KF5%%share/doc/HTML/it/kid3/index.docbook -%%KF5%%share/doc/HTML/nl/kid3/index.cache.bz2 -%%KF5%%share/doc/HTML/nl/kid3/index.docbook -%%KF5%%share/doc/HTML/pt/kid3/index.cache.bz2 -%%KF5%%share/doc/HTML/pt/kid3/index.docbook -%%KF5%%share/doc/HTML/ru/kid3/index.cache.bz2 -%%KF5%%share/doc/HTML/ru/kid3/index.docbook -%%KF5%%share/doc/HTML/sv/kid3/index.cache.bz2 -%%KF5%%share/doc/HTML/sv/kid3/index.docbook -%%KF5%%share/doc/HTML/uk/kid3/index.cache.bz2 -%%KF5%%share/doc/HTML/uk/kid3/index.docbook +%%KF%%share/dbus-1/interfaces/org.kde.Kid3.xml +%%KF%%share/doc/HTML/ca/kid3/index.cache.bz2 +%%KF%%share/doc/HTML/ca/kid3/index.docbook +%%KF%%share/doc/HTML/de/kid3/index.cache.bz2 +%%KF%%share/doc/HTML/de/kid3/index.docbook +%%KF%%share/doc/HTML/en/kid3/index.cache.bz2 +%%KF%%share/doc/HTML/en/kid3/index.docbook +%%KF%%share/doc/HTML/it/kid3/index.cache.bz2 +%%KF%%share/doc/HTML/it/kid3/index.docbook +%%KF%%share/doc/HTML/nl/kid3/index.cache.bz2 +%%KF%%share/doc/HTML/nl/kid3/index.docbook +%%KF%%share/doc/HTML/pt/kid3/index.cache.bz2 +%%KF%%share/doc/HTML/pt/kid3/index.docbook +%%KF%%share/doc/HTML/ru/kid3/index.cache.bz2 +%%KF%%share/doc/HTML/ru/kid3/index.docbook +%%KF%%share/doc/HTML/sv/kid3/index.cache.bz2 +%%KF%%share/doc/HTML/sv/kid3/index.docbook +%%KF%%share/doc/HTML/uk/kid3/index.cache.bz2 +%%KF%%share/doc/HTML/uk/kid3/index.docbook %%QT%%share/doc/kid3-qt/kid3_ca.html %%QT%%share/doc/kid3-qt/kid3_de.html %%QT%%share/doc/kid3-qt/kid3_en.html @@ -43,8 +43,8 @@ share/icons/hicolor/32x32/apps/kid3%%QT_SUFX%%.png share/icons/hicolor/48x48/apps/kid3%%QT_SUFX%%.png share/icons/hicolor/64x64/apps/kid3%%QT_SUFX%%.png %%QT%%share/icons/hicolor/scalable/apps/kid3-qt.svg -%%KF5%%share/icons/hicolor/scalable/apps/kid3.svgz -%%KF5%%share/kxmlgui5/kid3/kid3ui.rc +%%KF%%share/icons/hicolor/scalable/apps/kid3.svgz +%%KF%%share/kxmlgui%%KF_SUFX%%/kid3/kid3ui.rc %%CLI%%share/man/ca/man1/kid3-cli.1.gz %%QT%%share/man/ca/man1/kid3-qt.1.gz share/man/ca/man1/kid3.1.gz