Index: head/audio/cantata/Makefile =================================================================== --- head/audio/cantata/Makefile (revision 447020) +++ head/audio/cantata/Makefile (revision 447021) @@ -1,106 +1,106 @@ # $FreeBSD$ PORTNAME= cantata -PORTVERSION= 2.0.1 +PORTVERSION= 2.1.0 DISTVERSIONPREFIX= v -PORTREVISION= 2 CATEGORIES= audio kde MAINTAINER= kde@FreeBSD.org COMMENT= Graphical client for MPD using Qt5 LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= CDrummond USE_QT5= buildtools_build concurrent core dbus gui network \ qmake_build sql sql-sqlite3_run svg widgets xml CMAKE_ARGS= -DENABLE_QT5:BOOL=TRUE \ - -DENABLE_KDE:BOOL=FALSE + -DENABLE_KDE:BOOL=FALSE \ + -DCMAKE_DISABLE_FIND_PACKAGE_UDev:BOOL=TRUE USES= cmake:outsource cpe pkgconfig shebangfix SHEBANG_FILES= dynamic/cantata-dynamic cantata-remote.cmake CPE_VENDOR= craig_drummond USE_LDCONFIG= yes OPTIONS_DEFINE= CDPARANOIA MTP NLS PROXY TAGLIB OPTIONS_GROUP= CDINFO REPLAYGAIN OPTIONS_GROUP_CDINFO= CDDB MUSICBRAINZ OPTIONS_GROUP_REPLAYGAIN= FFMPEG MPG123 OPTIONS_RADIO= HSP OPTIONS_RADIO_HSP= QT5 VLC OPTIONS_DEFAULT= CDDB CDPARANOIA FFMPEG MPG123 MTP MUSICBRAINZ TAGLIB VLC OPTIONS_SUB= yes CDDB_DESC= CD info retrieval via CDDB CDINFO_DESC= AudioCD support FFMPEG_DESC= ReplayGain calculation support via FFmpeg HSP_DESC= MPD HTTP stream playback MPG123_DESC= ReplayGain calculation support via mpg123 MUSICBRAINZ_DESC= CD info retrieval via MusicBrainz PROXY_DESC= Proxy configuration in settings dialog QT5_DESC= HTTP streams support via QtMultimedia REPLAYGAIN_DESC= Replaygain calculation support TAGLIB_DESC= Reading and editing Meta-Data of audio files VLC_DESC= HTTP streams support via libVLC CDDB_IMPLIES= CDPARANOIA CDDB_LIB_DEPENDS= libcddb.so:audio/libcddb CDDB_CMAKE_BOOL= ENABLE_CDDB CDPARANOIA_IMPLIES= TAGLIB CDPARANOIA_LIB_DEPENDS= libcdda_interface.so:audio/cdparanoia CDPARANOIA_CMAKE_BOOL= ENABLE_CDPARANOIA FFMPEG_IMPLIES= TAGLIB FFMPEG_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg FFMPEG_CMAKE_BOOL= ENABLE_FFMPEG MPG123_IMPLIES= TAGLIB MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 MPG123_CMAKE_BOOL= ENABLE_MPG123 MTP_LIB_DEPENDS= libmtp.so:multimedia/libmtp MTP_CMAKE_BOOL= ENABLE_MTP MUSICBRAINZ_IMPLIES= CDPARANOIA MUSICBRAINZ_LIB_DEPENDS=libmusicbrainz5.so:audio/libmusicbrainz5 MUSICBRAINZ_CMAKE_BOOL= ENABLE_MUSICBRAINZ NLS_USE= QT5=linguisttools_build NLS_CMAKE_ON= -DLCONVERT_EXECUTABLE:STRING=${QT_BINDIR}/lconvert \ -DLRELEASE_EXECUTABLE:STRING=${QT_BINDIR}/lrelease NLS_CMAKE_OFF= -DLCONVERT_EXECUTABLE:BOOL=FALSE \ -DLRELEASE_EXECUTABLE:BOOL=FALSE PROXY_CMAKE_BOOL= ENABLE_PROXY_CONFIG QT5_USE= QT5=multimedia TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib \ libtag-extras.so:audio/taglib-extras TAGLIB_USES= localbase TAGLIB_CMAKE_BOOL= ENABLE_TAGLIB ENABLE_TAGLIB_EXTRAS VLC_LIB_DEPENDS= libvlc.so:multimedia/vlc VLC_CMAKE_BOOL= ENABLE_LIBVLC .include .if ${PORT_OPTIONS:MFFMPEG} || ${PORT_OPTIONS:MMPG123} LIB_DEPENDS+= libebur128.so:audio/libebur128 PLIST_SUB+= REPLAYGAIN="" .else PLIST_SUB+= REPLAYGAIN="@comment " .endif .if ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MVLC} CMAKE_ARGS+= -DENABLE_HTTP_STREAM_PLAYBACK:BOOL=TRUE .else CMAKE_ARGS+= -DENABLE_HTTP_STREAM_PLAYBACK:BOOL=FALSE .endif .include Index: head/audio/cantata/distinfo =================================================================== --- head/audio/cantata/distinfo (revision 447020) +++ head/audio/cantata/distinfo (revision 447021) @@ -1,3 +1,3 @@ -TIMESTAMP = 1465799840 -SHA256 (CDrummond-cantata-v2.0.1_GH0.tar.gz) = 294fc96944dd2bb6056525a49ae9db1b1da1b7902ac63286ed6c01622b8e3b52 -SIZE (CDrummond-cantata-v2.0.1_GH0.tar.gz) = 2711833 +TIMESTAMP = 1501534413 +SHA256 (CDrummond-cantata-v2.1.0_GH0.tar.gz) = ad679d10f013a427e0af2ed92ed3ab435f60071aef71b271467f3947b4852c8b +SIZE (CDrummond-cantata-v2.1.0_GH0.tar.gz) = 2925024 Index: head/audio/cantata/files/patch-git_2cb8d7f =================================================================== --- head/audio/cantata/files/patch-git_2cb8d7f (revision 447020) +++ head/audio/cantata/files/patch-git_2cb8d7f (nonexistent) @@ -1,22 +0,0 @@ -From 2cb8d7f67411d6958388705893f5e5de46b3bba0 Mon Sep 17 00:00:00 2001 -From: Craig Drummond -Date: Sat, 29 Oct 2016 18:43:34 +0100 -Subject: [PATCH] Fix C++11 warning - ---- - support/utils.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/support/utils.cpp b/support/utils.cpp -index 2e0c885..4fad46c 100644 ---- support/utils.cpp -+++ support/utils.cpp -@@ -773,7 +773,7 @@ QString Utils::helper(const QString &app) - #elif defined Q_OS_MAC - return fixPath(QCoreApplication::applicationDirPath())+app; - #else -- return QString(INSTALL_PREFIX "/"LINUX_LIB_DIR"/")+QCoreApplication::applicationName()+constDirSep+app; -+ return QString(INSTALL_PREFIX "/" LINUX_LIB_DIR "/")+QCoreApplication::applicationName()+constDirSep+app; - #endif - } - Property changes on: head/audio/cantata/files/patch-git_2cb8d7f ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/cantata/files/patch-git_a13f957 =================================================================== --- head/audio/cantata/files/patch-git_a13f957 (revision 447020) +++ head/audio/cantata/files/patch-git_a13f957 (nonexistent) @@ -1,22 +0,0 @@ -From a13f9575e6226ef7378f3da6b700416354231767 Mon Sep 17 00:00:00 2001 -From: Craig Drummond -Date: Sat, 12 Nov 2016 20:05:46 +0000 -Subject: [PATCH] C++ 11 - ---- - devices/musicbrainz.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/devices/musicbrainz.cpp b/devices/musicbrainz.cpp -index cc1a7a0..89f5409 100644 ---- devices/musicbrainz.cpp -+++ devices/musicbrainz.cpp -@@ -248,7 +248,7 @@ void MusicBrainz::lookup(bool full) - } - DBUG << "Should lookup " << discId; - -- MusicBrainz5::CQuery Query("cantata-"PACKAGE_VERSION_STRING); -+ MusicBrainz5::CQuery Query("cantata-" PACKAGE_VERSION_STRING); - QList m; - QList proxies=NetworkProxyFactory::self()->queryProxy(QNetworkProxyQuery(QUrl("http://musicbrainz.org"))); - foreach (const QNetworkProxy &p, proxies) { Property changes on: head/audio/cantata/files/patch-git_a13f957 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/cantata/files/patch-devices_cddbinterface.cpp =================================================================== --- head/audio/cantata/files/patch-devices_cddbinterface.cpp (nonexistent) +++ head/audio/cantata/files/patch-devices_cddbinterface.cpp (revision 447021) @@ -0,0 +1,13 @@ +https://github.com/CDrummond/cantata/pull/1052 + +--- devices/cddbinterface.cpp.orig 2017-07-30 19:13:05 UTC ++++ devices/cddbinterface.cpp +@@ -158,7 +158,7 @@ void CddbInterface::readDisc() + cddb_track_t *track = cddb_track_new(); + if (track) { + cddb_track_set_frame_offset(track, te.entry.addr.lba + SECONDS_TO_FRAMES(2)); +- cddb_track_set_title(track, te.entry.control&0x04 ? dataTrack().toUtf8().constData() : tr("Track %1", i).toUtf8().constData()); ++ cddb_track_set_title(track, te.entry.control&0x04 ? dataTrack().toUtf8().constData() : tr("Track %1").arg(i).toUtf8().constData()); + cddb_track_set_artist(track, unknown.constData()); + cddb_disc_add_track(disc, track); + } Property changes on: head/audio/cantata/files/patch-devices_cddbinterface.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/cantata/files/patch-mpd-interface_httpstream.cpp =================================================================== --- head/audio/cantata/files/patch-mpd-interface_httpstream.cpp (nonexistent) +++ head/audio/cantata/files/patch-mpd-interface_httpstream.cpp (revision 447021) @@ -0,0 +1,14 @@ +https://github.com/CDrummond/cantata/pull/1052 + +--- mpd-interface/httpstream.cpp.orig 2017-08-01 10:50:50 UTC ++++ mpd-interface/httpstream.cpp +@@ -25,7 +25,9 @@ + #include "mpdconnection.h" + #include "mpdstatus.h" + #include "gui/settings.h" ++#ifndef LIBVLC_FOUND + #include ++#endif + #include + + static const int constPlayerCheckPeriod=250; Property changes on: head/audio/cantata/files/patch-mpd-interface_httpstream.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/cantata/files/patch-mpd-interface_mpdstats.h =================================================================== --- head/audio/cantata/files/patch-mpd-interface_mpdstats.h (nonexistent) +++ head/audio/cantata/files/patch-mpd-interface_mpdstats.h (revision 447021) @@ -0,0 +1,12 @@ +https://github.com/CDrummond/cantata/pull/1052 + +--- mpd-interface/mpdstats.h.orig 2017-07-30 19:13:05 UTC ++++ mpd-interface/mpdstats.h +@@ -27,6 +27,7 @@ + #ifndef MPD_STATS_H + #define MPD_STATS_H + ++#include + #include + #include + Property changes on: head/audio/cantata/files/patch-mpd-interface_mpdstats.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/cantata/pkg-plist =================================================================== --- head/audio/cantata/pkg-plist (revision 447020) +++ head/audio/cantata/pkg-plist (revision 447021) @@ -1,67 +1,64 @@ bin/cantata %%REPLAYGAIN%%lib/cantata/cantata-replaygain %%TAGLIB%%lib/cantata/cantata-tags share/applications/cantata.desktop %%DATADIR%%/config/lyrics_providers.xml %%DATADIR%%/config/podcast_directories.xml %%DATADIR%%/config/scrobblers.xml %%DATADIR%%/config/tag_fixes.xml %%DATADIR%%/config/weblinks.xml -%%DATADIR%%/fonts/fontawesome-4.3.0.ttf +%%DATADIR%%/fonts/fontawesome-webfont.ttf %%DATADIR%%/icons/bbc.svg %%DATADIR%%/icons/cbc.svg %%DATADIR%%/icons/npr.svg %%DATADIR%%/icons/podcasts.png %%DATADIR%%/icons/soundcloud.png %%DATADIR%%/icons/stream.png %%DATADIR%%/icons/cantata/AUTHORS %%DATADIR%%/icons/cantata/LICENSE %%DATADIR%%/icons/cantata/index.theme %%DATADIR%%/icons/cantata/svg/audio-x-generic.svg %%DATADIR%%/icons/cantata/svg/cantata.svg -%%DATADIR%%/icons/cantata/svg/dynamic-playlist.svg %%TAGLIB%%%%DATADIR%%/icons/cantata/svg/drive-removable-media-usb-pendrive.svg %%DATADIR%%/icons/cantata/svg/folder-downloads.svg %%DATADIR%%/icons/cantata/svg/folder-temp.svg %%DATADIR%%/icons/cantata/svg/fork.svg %%DATADIR%%/icons/cantata/svg/information.svg %%DATADIR%%/icons/cantata/svg/inode-directory.svg %%TAGLIB%%%%DATADIR%%/icons/cantata/svg/multimedia-player.svg %%DATADIR%%/icons/cantata/svg/network-server-database.svg -%%DATADIR%%/icons/cantata/svg/playlist.svg %%DATADIR%%/icons/cantata/svg/preferences-desktop-keyboard.svg %%DATADIR%%/icons/cantata/svg/preferences-other.svg %%PROXY%%%%DATADIR%%/icons/cantata/svg/preferences-system-network.svg %%DATADIR%%/icons/cantata/svg/speaker.svg %%DATADIR%%/icons/cantata/svg64/dialog-error.svg %%DATADIR%%/icons/cantata/svg64/dialog-information.svg %%DATADIR%%/icons/cantata/svg64/dialog-question.svg %%DATADIR%%/icons/cantata/svg64/dialog-warning.svg %%DATADIR%%/mpd/mpd.conf.template %%DATADIR%%/scripts/cantata-dynamic %%DATADIR%%/scripts/cantata-remote -%%DATADIR%%/themes/adwaita.css -%%DATADIR%%/themes/ambiance-dt.css -%%DATADIR%%/themes/ambiance.css -%%DATADIR%%/themes/elementary.css -%%DATADIR%%/themes/faience.css -%%DATADIR%%/themes/mint-x.css -%%DATADIR%%/themes/radiance-dt.css -%%DATADIR%%/themes/radiance.css +%%NLS%%%%DATADIR%%/translations/blank.qm %%NLS%%%%DATADIR%%/translations/cantata_cs.qm %%NLS%%%%DATADIR%%/translations/cantata_de.qm %%NLS%%%%DATADIR%%/translations/cantata_en_GB.qm %%NLS%%%%DATADIR%%/translations/cantata_es.qm %%NLS%%%%DATADIR%%/translations/cantata_fr.qm %%NLS%%%%DATADIR%%/translations/cantata_hu.qm +%%NLS%%%%DATADIR%%/translations/cantata_it.qm +%%NLS%%%%DATADIR%%/translations/cantata_ja.qm %%NLS%%%%DATADIR%%/translations/cantata_ko.qm %%NLS%%%%DATADIR%%/translations/cantata_pl.qm %%NLS%%%%DATADIR%%/translations/cantata_ru.qm %%NLS%%%%DATADIR%%/translations/cantata_zh_CN.qm +share/icons/hicolor/128x128/apps/cantata.png share/icons/hicolor/16x16/apps/cantata.png share/icons/hicolor/22x22/apps/cantata.png share/icons/hicolor/24x24/apps/cantata.png +share/icons/hicolor/256x256/apps/cantata.png share/icons/hicolor/32x32/apps/cantata.png share/icons/hicolor/48x48/apps/cantata.png +share/icons/hicolor/512x512/apps/cantata.png share/icons/hicolor/64x64/apps/cantata.png share/icons/hicolor/scalable/apps/cantata.svg +share/icons/hicolor/scalable/apps/cantata-symbolic.svg