Index: head/audio/cantata/Makefile =================================================================== --- head/audio/cantata/Makefile (revision 468630) +++ head/audio/cantata/Makefile (revision 468631) @@ -1,107 +1,107 @@ # $FreeBSD$ PORTNAME= cantata -DISTVERSION= 2.2.0 +DISTVERSION= 2.3.0 DISTVERSIONPREFIX= v -PORTREVISION= 1 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= playlists/cantata-dynamic cantata-remote.cmake +SHEBANG_FILES= playlists/cantata-dynamic cantata-remote.cmake \ + devices/mounter/mount.cifs.wrapper 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 468630) +++ head/audio/cantata/distinfo (revision 468631) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506781584 -SHA256 (CDrummond-cantata-v2.2.0_GH0.tar.gz) = 000f7a8561667fc8d15fad3b8bf0ada8f693a76fed0afafa166a0225cc93e9de -SIZE (CDrummond-cantata-v2.2.0_GH0.tar.gz) = 2955660 +TIMESTAMP = 1524847557 +SHA256 (CDrummond-cantata-v2.3.0_GH0.tar.gz) = 99d232cb03e4e3ccdba0249c366237218d29fec00abfbbc0c83b4fdb8ceb4d90 +SIZE (CDrummond-cantata-v2.3.0_GH0.tar.gz) = 3998039 Index: head/audio/cantata/files/patch-CMakeLists.txt =================================================================== --- head/audio/cantata/files/patch-CMakeLists.txt (nonexistent) +++ head/audio/cantata/files/patch-CMakeLists.txt (revision 468631) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2018-04-27 18:02:32 UTC ++++ CMakeLists.txt +@@ -100,7 +100,7 @@ elseif (NOT HAIKU) + set(CANTATA_ICON_INSTALL_PREFIX ${SHARE_INSTALL_PREFIX}/icons/hicolor) + endif () + +-if (NOT WIN32 AND NOT APPLE AND ENABLE_DEVICES_SUPPORT AND ENABLE_UDISKS2) ++if (LINUX AND ENABLE_DEVICES_SUPPORT AND ENABLE_UDISKS2) + set(WITH_SOLID_UDISKS2 ON) + endif () + Property changes on: head/audio/cantata/files/patch-CMakeLists.txt ___________________________________________________________________ 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-devices_mounter_CMakeLists.txt =================================================================== --- head/audio/cantata/files/patch-devices_mounter_CMakeLists.txt (nonexistent) +++ head/audio/cantata/files/patch-devices_mounter_CMakeLists.txt (revision 468631) @@ -0,0 +1,11 @@ +--- devices/mounter/CMakeLists.txt.orig 2018-04-29 14:02:49 UTC ++++ devices/mounter/CMakeLists.txt +@@ -5,7 +5,7 @@ add_executable( cantata-mounter ${CANTATA_MOUNTER_SRCS + install(TARGETS cantata-mounter RUNTIME DESTINATION lib/cantata) + configure_file(mpd.cantata.mounter.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/mpd.cantata.mounter.service) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mpd.cantata.mounter.service DESTINATION ${SHARE_INSTALL_PREFIX}/dbus-1/system-services/ ) +-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mpd.cantata.mounter.conf DESTINATION /etc/dbus-1/system.d/ ) ++install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mpd.cantata.mounter.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/dbus-1/system.d/ ) + + target_link_libraries(cantata-mounter ${Qt5Core_LIBRARIES} ${Qt5DBus_LIBRARIES}) + include_directories( ${QTINCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_BINARY_DIR}) Property changes on: head/audio/cantata/files/patch-devices_mounter_CMakeLists.txt ___________________________________________________________________ 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 468630) +++ head/audio/cantata/pkg-plist (revision 468631) @@ -1,64 +1,72 @@ bin/cantata +%%TAGLIB%%etc/dbus-1/system.d/mpd.cantata.mounter.conf +%%TAGLIB%%lib/cantata/cantata-mounter %%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-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/128/cantata.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 %%TAGLIB%%%%DATADIR%%/icons/cantata/svg/drive-removable-media-usb-pendrive.svg -%%DATADIR%%/icons/cantata/svg/folder-downloads.svg +%%TAGLIB%%%%DATADIR%%/icons/cantata/svg/folder-network.svg +%%TAGLIB%%%%DATADIR%%/icons/cantata/svg/folder-samba.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 +%%DATADIR%%/icons/cantata/svg/key.svg %%TAGLIB%%%%DATADIR%%/icons/cantata/svg/multimedia-player.svg %%DATADIR%%/icons/cantata/svg/network-server-database.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%%/icons/cbc.svg +%%DATADIR%%/icons/npr.svg +%%DATADIR%%/icons/podcasts.png +%%DATADIR%%/icons/soundcloud.png +%%DATADIR%%/icons/stream.png %%DATADIR%%/mpd/mpd.conf.template %%DATADIR%%/scripts/cantata-dynamic %%DATADIR%%/scripts/cantata-remote +%%TAGLIB%%%%DATADIR%%/scripts/mount.cifs.wrapper %%NLS%%%%DATADIR%%/translations/blank.qm %%NLS%%%%DATADIR%%/translations/cantata_cs.qm +%%NLS%%%%DATADIR%%/translations/cantata_da.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 +%%TAGLIB%%share/dbus-1/system-services/mpd.cantata.mounter.service 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 +share/icons/hicolor/scalable/apps/cantata.svg