Index: head/audio/cantata/files/patch-mpd-interface_mpdstats.h =================================================================== --- head/audio/cantata/files/patch-mpd-interface_mpdstats.h (revision 451055) +++ head/audio/cantata/files/patch-mpd-interface_mpdstats.h (nonexistent) @@ -1,12 +0,0 @@ -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 ___________________________________________________________________ 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-mpd-interface_httpstream.cpp =================================================================== --- head/audio/cantata/files/patch-mpd-interface_httpstream.cpp (revision 451055) +++ head/audio/cantata/files/patch-mpd-interface_httpstream.cpp (nonexistent) @@ -1,14 +0,0 @@ -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 ___________________________________________________________________ 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 (revision 451055) +++ head/audio/cantata/files/patch-devices_cddbinterface.cpp (nonexistent) @@ -1,13 +0,0 @@ -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 ___________________________________________________________________ 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/Makefile =================================================================== --- head/audio/cantata/Makefile (revision 451055) +++ head/audio/cantata/Makefile (revision 451056) @@ -1,106 +1,106 @@ # $FreeBSD$ PORTNAME= cantata -PORTVERSION= 2.1.0 +DISTVERSION= 2.2.0 DISTVERSIONPREFIX= v 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 \ -DCMAKE_DISABLE_FIND_PACKAGE_UDev:BOOL=TRUE USES= cmake:outsource cpe pkgconfig shebangfix -SHEBANG_FILES= dynamic/cantata-dynamic cantata-remote.cmake +SHEBANG_FILES= playlists/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 451055) +++ head/audio/cantata/distinfo (revision 451056) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501534413 -SHA256 (CDrummond-cantata-v2.1.0_GH0.tar.gz) = ad679d10f013a427e0af2ed92ed3ab435f60071aef71b271467f3947b4852c8b -SIZE (CDrummond-cantata-v2.1.0_GH0.tar.gz) = 2925024 +TIMESTAMP = 1506781584 +SHA256 (CDrummond-cantata-v2.2.0_GH0.tar.gz) = 000f7a8561667fc8d15fad3b8bf0ada8f693a76fed0afafa166a0225cc93e9de +SIZE (CDrummond-cantata-v2.2.0_GH0.tar.gz) = 2955660