Date: Wed, 14 Sep 2022 03:45:15 GMT From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 21dc3fef5f96 - main - audio/kid3: Remove redundant dependencies Message-ID: <202209140345.28E3jFM3006154@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=21dc3fef5f9680f44ba18f60b1993cf80e00ee46 commit 21dc3fef5f9680f44ba18f60b1993cf80e00ee46 Author: Jason E. Hale <jhale@FreeBSD.org> AuthorDate: 2022-09-14 03:37:35 +0000 Commit: Jason E. Hale <jhale@FreeBSD.org> CommitDate: 2022-09-14 03:37:35 +0000 audio/kid3: Remove redundant dependencies Remove MP3, MP4, and TAGLIB options and make audio/taglib non-optional. audio/id3lib is unmaintained upstream and they recommend using taglib instead. Taglib can tag MP4 files, as well. PR: 266401 Reported by: diizzy --- audio/kid3/Makefile | 27 +++++++++++---------------- audio/kid3/pkg-plist | 4 +--- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/audio/kid3/Makefile b/audio/kid3/Makefile index 745e061fb4ff..731d101f7dd9 100644 --- a/audio/kid3/Makefile +++ b/audio/kid3/Makefile @@ -1,5 +1,6 @@ PORTNAME= kid3 PORTVERSION= 3.9.2 +PORTREVISION= 1 CATEGORIES= audio kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} PKGNAMESUFFIX= -${FLAVOR} @@ -12,6 +13,7 @@ LICENSE= GPLv2+ 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 FLAVOR?= ${FLAVORS:[1]} @@ -26,15 +28,18 @@ CMAKE_ARGS= -DWITH_DOCBOOKDIR="${LOCALBASE}/share/xsl/docbook" \ -DWITH_MANDIR=man \ -DWITH_PLUGINSDIR=lib/kid3 \ -DFFMPEG_ROOT="${LOCALBASE}" \ - -DWITH_QML=OFF \ -DWITH_APPS="${KID3_APPS:S/ /;/gW}" +CMAKE_OFF= WITH_ID3LIB \ + WITH_MP4V2 \ + WITH_QML +CMAKE_ON= WITH_TAGLIB PLIST_SUB+= 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_ARGS+= -DWITH_QT5=ON +CMAKE_ON+= WITH_QT5 PLIST_SUB+= KF5="@comment " \ QT="" \ QT_SUFX="-qt" @@ -43,7 +48,7 @@ KID3_APPS+= QT USES+= gl qt:6 USE_GL= opengl USE_QT= base multimedia tools:build -CMAKE_ARGS+= -DWITH_QT5=OFF +CMAKE_OFF+= WITH_QT5 PLIST_SUB+= KF5="@comment " \ QT="" \ QT_SUFX="-qt" @@ -54,7 +59,7 @@ USE_KDE= auth codecs config configwidgets coreaddons kio \ service widgetsaddons xmlgui doctools:build ecm:build USE_QT= concurrent core dbus gui multimedia network xml widgets \ buildtools:build linguisttools:build qmake:build -CMAKE_ARGS+= -DWITH_QT5=ON +CMAKE_ON+= WITH_QT5 PLIST_SUB+= KF5="" \ QT="@comment " \ QT_SUFX="" @@ -67,8 +72,8 @@ CONFLICTS_INSTALL+= kid3-${f} . endif .endfor -OPTIONS_DEFINE= CLI ACOUSTID FLAC MP3 MP4 VORBIS TAGLIB TEST -OPTIONS_DEFAULT= CLI ACOUSTID FLAC MP3 MP4 VORBIS TAGLIB +OPTIONS_DEFINE= CLI ACOUSTID FLAC VORBIS TEST +OPTIONS_DEFAULT= CLI ACOUSTID FLAC VORBIS OPTIONS_SUB= yes NO_OPTIONS_SORT= yes @@ -84,16 +89,6 @@ FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CMAKE_BOOL= WITH_FLAC FLAC_IMPLIES= VORBIS -MP3_LIB_DEPENDS= libid3.so:audio/id3lib -MP3_CMAKE_BOOL= WITH_ID3LIB - -MP4_LIB_DEPENDS= libmp4v2.so:multimedia/mp4v2 -MP4_CMAKE_BOOL= WITH_MP4V2 - -TAGLIB_DESC= Various audio formats support via Taglib -TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib -TAGLIB_CMAKE_BOOL= WITH_TAGLIB - TEST_USE= LOCALE=en_US.UTF-8 .if ${FLAVOR} == qt5 || ${FLAVOR} == kf5 TEST_USE+= QT=testlib:build diff --git a/audio/kid3/pkg-plist b/audio/kid3/pkg-plist index 9265025f2412..0a70bddeecdd 100644 --- a/audio/kid3/pkg-plist +++ b/audio/kid3/pkg-plist @@ -6,11 +6,9 @@ lib/libkid3-gui.so lib/kid3/libamazonimport.so lib/kid3/libdiscogsimport.so lib/kid3/libfreedbimport.so -%%MP3%%lib/kid3/libid3libmetadata.so -%%MP4%%lib/kid3/libmp4v2metadata.so lib/kid3/libmusicbrainzimport.so %%VORBIS%%lib/kid3/liboggflacmetadata.so -%%TAGLIB%%lib/kid3/libtaglibmetadata.so +lib/kid3/libtaglibmetadata.so %%CLI%%man/ca/man1/kid3-cli.1.gz %%QT%%man/ca/man1/kid3-qt.1.gz man/ca/man1/kid3.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202209140345.28E3jFM3006154>