Date: Sun, 13 Nov 2016 10:11:05 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426022 - head/audio/kid3-kde4 Message-ID: <201611131011.uADAB55t032961@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Sun Nov 13 10:11:05 2016 New Revision: 426022 URL: https://svnweb.freebsd.org/changeset/ports/426022 Log: Update to 3.4.3 Rename a few options based on what they do vs. what libraries they use and use standard descriptions where possible. Namely, CHROMAPRINT -> ACOUSTID, ID3LIB -> MP3, MP4V2 -> MP4. Add a few missing dependencies reported by stage-qa. Cosmetic changes to make the Makefile a little more readable. Modified: head/audio/kid3-kde4/Makefile head/audio/kid3-kde4/distinfo head/audio/kid3-kde4/pkg-plist Modified: head/audio/kid3-kde4/Makefile ============================================================================== --- head/audio/kid3-kde4/Makefile Sun Nov 13 10:03:39 2016 (r426021) +++ head/audio/kid3-kde4/Makefile Sun Nov 13 10:11:05 2016 (r426022) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= kid3 -PORTVERSION= 3.4.2 +PORTVERSION= 3.4.3 PORTREVISION?= 0 CATEGORIES= audio kde MASTER_SITES= SF @@ -11,97 +11,93 @@ COMMENT?= MP3/Ogg/FLAC tag editor for KD LICENSE= GPLv2 -USE_PERL5= build -USES= cmake:outsource kde:4 perl5 +USES= cmake:outsource kde:4 pkgconfig +USE_LDCONFIG= yes CMAKE_ARGS= -DWITH_DOCBOOKDIR=${LOCALBASE}/share/xsl/docbook \ -DWITH_MANDIR=man \ -DFFMPEG_ROOT=${LOCALBASE} \ -DWITH_QML=OFF CXXFLAGS+= -I${LOCALBASE}/include -OPTIONS_DEFINE= CHROMAPRINT FLAC ID3LIB MP4V2 VORBIS TAGLIB \ - CLI -OPTIONS_DEFAULT:= ${OPTIONS_DEFINE} -OPTIONS_SUB= yes +OPTIONS_DEFINE= CLI ACOUSTID FLAC MP3 MP4 VORBIS TAGLIB PHONON +OPTIONS_DEFAULT= CLI ACOUSTID FLAC MP3 MP4 VORBIS TAGLIB +OPTIONS_SUB= yes NO_OPTIONS_SORT= yes -.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt5" -CONFLICTS_INSTALL+= kid3-qt4-3.* - -USE_QT5= core dbus gui multimedia network testlib xml widgets \ - buildtools_build linguisttools_build qmake_build -CMAKE_ARGS+= -DWITH_QT5=true -.else -# Qt 4 and KDE 4 -USE_QT4= qmake_build moc_build rcc_build uic_build \ - linguisttools_build -.endif - -.if defined(PKGNAMESUFFIX) && ${PKGNAMESUFFIX} == "-qt4" -CONFLICTS_INSTALL+= kid3-qt5-3.* - -USE_QT4+= corelib dbus gui network xml - -OPTIONS_DEFINE+= PHONON -PHONON_DESC= Build with Phonon support -PHONON_CMAKE_OFF= -DWITH_PHONON=OFF -PHONON_USE= QT4=phonon -.endif - .if defined(PKGNAMESUFFIX) # Qt 4 and Qt 5 -CONFLICTS_INSTALL+= kid3-3.* - BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:textproc/docbook-xsl USES+= desktop-file-utils USE_GNOME= libxslt:build CMAKE_ARGS+= -DWITH_APPS="${KID3_CLI}QT" PLIST_SUB+= QT="" KDE="@comment " +. if ${PKGNAMESUFFIX} == "-qt5" +# Qt 5 only +CONFLICTS_INSTALL= kid3-3.* kid3-qt4-3.* + +USE_QT5= core dbus gui multimedia network testlib xml widgets \ + buildtools_build linguisttools_build qmake_build +CMAKE_ARGS+= -DWITH_QT5=true +OPTIONS_EXCLUDE=PHONON +. elif ${PKGNAMESUFFIX} == "-qt4" +# Qt 4 only +CONFLICTS_INSTALL= kid3-3.* kid3-qt5-3.* + +USE_QT4= corelib dbus gui network xml \ + qmake_build moc_build rcc_build uic_build \ + linguisttools_build +. endif .else -CONFLICTS_INSTALL+= kid3-qt4-3.* kid3-qt5-3.* +# KDE 4 only +CONFLICTS_INSTALL= kid3-qt4-3.* kid3-qt5-3.* +USE_QT4= corelib dbus gui network svg xml \ + qmake_build moc_build rcc_build uic_build \ + linguisttools_build USE_KDE= kdelibs automoc4 CMAKE_ARGS+= -DWITH_APPS="${KID3_CLI}KDE" PLIST_SUB+= QT="@comment " KDE="" +OPTIONS_SLAVE= PHONON .endif PLIST_SUB+= SHLIB_VER=${PORTVERSION} -CLI_DESC= Build and install command line utility -CLI_USES= readline -CLI_VARS= KID3_CLI=CLI; +ACOUSTID_DESC= AcoustID audio fingerprinting support +ACOUSTID_LIB_DEPENDS= libchromaprint.so:audio/chromaprint \ + libavcodec.so:multimedia/ffmpeg +ACOUSTID_CMAKE_ON= -DWITH_CHROMAPRINT=ON -DWITH_FFMPEG=ON +ACOUSTID_CMAKE_OFF= -DWITH_CHROMAPRINT=OFF + +CLI_DESC= Build and install command line utility +CLI_USES= readline +CLI_VARS= KID3_CLI=CLI; -FLAC_DESC= Support for FLAC files FLAC_LIB_DEPENDS= libFLAC.so:audio/flac FLAC_CMAKE_ON= -DWITH_FLAC=ON FLAC_CMAKE_OFF= -DWITH_FLAC=OFF -ID3LIB_DESC= Support for mp3 files -ID3LIB_LIB_DEPENDS= libid3.so:audio/id3lib -ID3LIB_CMAKE_ON= -DWITH_ID3LIB=ON -ID3LIB_CMAKE_OFF= -DWITH_ID3LIB=OFF - -MP4V2_DESC= Support for mp4 files -MP4V2_LIB_DEPENDS= libmp4v2.so:multimedia/mp4v2 -MP4V2_CMAKE_ON= -DWITH_MP4V2=ON -MP4V2_CMAKE_OFF= -DWITH_MP4V2=OFF +MP3_LIB_DEPENDS= libid3.so:audio/id3lib +MP3_CMAKE_ON= -DWITH_ID3LIB=ON +MP3_CMAKE_OFF= -DWITH_ID3LIB=OFF + +MP4_LIB_DEPENDS= libmp4v2.so:multimedia/mp4v2 +MP4_CMAKE_ON= -DWITH_MP4V2=ON +MP4_CMAKE_OFF= -DWITH_MP4V2=OFF -VORBIS_DESC= Support for Ogg/Vorbis files -VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ - libogg.so:audio/libogg -VORBIS_CMAKE_ON= -DWITH_VORBIS=ON -VORBIS_CMAKE_OFF= -DWITH_VORBIS=OFF +PHONON_CMAKE_ON= -DWITH_PHONON=ON +PHONON_CMAKE_OFF= -DWITH_PHONON=OFF +PHONON_USE= QT4=phonon -TAGLIB_DESC= Support for various audio formats +TAGLIB_DESC= Various audio formats support via Taglib TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib TAGLIB_CMAKE_ON= -DWITH_TAGLIB=ON TAGLIB_CMAKE_OFF= -DWITH_TAGLIB=OFF -CHROMAPRINT_DESC= Support for Chromaprint audio fingerprints -CHROMAPRINT_LIB_DEPENDS= libchromaprint.so:audio/chromaprint -CHROMAPRINT_CMAKE_ON= -DWITH_CHROMAPRINT=ON -CHROMAPRINT_CMAKE_OFF= -DWITH_CHROMAPRINT=OFF +VORBIS_LIB_DEPENDS= libvorbis.so:audio/libvorbis \ + libogg.so:audio/libogg +VORBIS_CMAKE_ON= -DWITH_VORBIS=ON +VORBIS_CMAKE_OFF= -DWITH_VORBIS=OFF .include <bsd.port.options.mk> Modified: head/audio/kid3-kde4/distinfo ============================================================================== --- head/audio/kid3-kde4/distinfo Sun Nov 13 10:03:39 2016 (r426021) +++ head/audio/kid3-kde4/distinfo Sun Nov 13 10:11:05 2016 (r426022) @@ -1,3 +1,3 @@ -TIMESTAMP = 1477211912 -SHA256 (kid3-3.4.2.tar.gz) = 5c0707f1be73c486d09522ca086693d3ee830b7a28a88dbd2c010c5494256a3e -SIZE (kid3-3.4.2.tar.gz) = 1349361 +TIMESTAMP = 1478081700 +SHA256 (kid3-3.4.3.tar.gz) = e8b03bb784fd4ef944ac4f31c770434719747c7750dee62f51efdfd61f4e3b2a +SIZE (kid3-3.4.3.tar.gz) = 1360042 Modified: head/audio/kid3-kde4/pkg-plist ============================================================================== --- head/audio/kid3-kde4/pkg-plist Sun Nov 13 10:03:39 2016 (r426021) +++ head/audio/kid3-kde4/pkg-plist Sun Nov 13 10:11:05 2016 (r426022) @@ -5,12 +5,12 @@ lib/libkid3-core.so lib/libkid3-core.so.%%SHLIB_VER%% lib/libkid3-gui.so lib/libkid3-gui.so.%%SHLIB_VER%% -%%CHROMAPRINT%%lib/kid3/libacoustidimport.so +%%ACOUSTID%%lib/kid3/libacoustidimport.so lib/kid3/libamazonimport.so lib/kid3/libdiscogsimport.so lib/kid3/libfreedbimport.so -%%ID3LIB%%lib/kid3/libid3libmetadata.so -%%MP4V2%%lib/kid3/libmp4v2metadata.so +%%MP3%%lib/kid3/libid3libmetadata.so +%%MP4%%lib/kid3/libmp4v2metadata.so lib/kid3/libmusicbrainzimport.so %%OGGFLAC%%lib/kid3/liboggflacmetadata.so %%TAGLIB%%lib/kid3/libtaglibmetadata.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611131011.uADAB55t032961>