Index: multimedia/qmmp-qt5/Makefile =================================================================== --- multimedia/qmmp-qt5/Makefile (revision 454968) +++ multimedia/qmmp-qt5/Makefile (working copy) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= qmmp -PORTVERSION= 1.1.10 -PORTREVISION= 1 +PORTVERSION= 1.2.0 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/ \ SF/qmmp-dev/${PORTNAME}/ @@ -12,30 +11,15 @@ COMMENT= Qt5-based multimedia player LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING +CONFLICTS= ${PORTNAME}-0.* +PORTSCOUT= limit:^1\..* + USES= cmake:outsource pathfix pkgconfig tar:bzip2 USE_QT5= core gui network widgets xml \ buildtools_build linguisttools_build qmake_build USE_LDCONFIG= yes -CONFLICTS= ${PORTNAME}-0.* -PORTSCOUT= limit:^1\..* - -PLIST_SUB= SHLIB_VER=${PORTVERSION:C/-.*//} - -PATHFIX_CMAKELISTSTXT= \\"CMakeLists.txt -exec grep -l /pkgconfig {} +\\" -PORTDOCS= README README.RUS AUTHORS -INSTALLS_ICONS= yes - -OPTIONS_DEFAULT= ALSA ANALYZER BS2B CDDA CONVERTER COPYPASTE COVER \ - CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD FFMPEG FILEOPS FLAC \ - GNOMEHOTKEY GME HAL HOTKEY JACK KDENOTIFY LADSPA LYRICS MAD \ - MMS MODPLUG MPRIS MPLAYER MUSEPACK NOTIFIER NULLOUT \ - OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI QTMULTIMEDIA \ - RGSCAN SB SCROBBLER SID SKINNEDUI SNDFILE SOXR STATICON STEREO \ - TRACKCHANGE TWOPANELDIALOG UDISKS2 VORBIS WAVPACK WILDMIDI - OPTIONS_SUB= yes OPTIONS_GROUP= DOCUMENTS PLUGIN_APPLICATION PLUGIN_FORMATS \ PLUGIN_DSP_EFFECTS PLUGIN_VISUAL_EFFECTS PLUGIN_OUTPUT \ @@ -49,8 +33,8 @@ OPTIONS_GROUP_DOCUMENTS= DOCS DOXYGEN PLUGIN_FORMATS_DESC= Support various media formats -OPTIONS_GROUP_PLUGIN_FORMATS= CDDA FAAD FFMPEG FLAC GME MAD MODPLUG \ - MUSEPACK OPUS SNDFILE VORBIS WAVPACK WILDMIDI +OPTIONS_GROUP_PLUGIN_FORMATS= ARCHIVE CDDA FAAD FFMPEG FLAC GME \ + MAD MODPLUG MUSEPACK OPUS SNDFILE VORBIS WAVPACK WILDMIDI PLUGIN_DSP_EFFECTS_DESC= DSP effects OPTIONS_GROUP_PLUGIN_DSP_EFFECTS= BS2B CROSSFADE LADSPA SOXR STEREO @@ -60,7 +44,7 @@ PLUGIN_OUTPUT_DESC= Output sound systems OPTIONS_GROUP_PLUGIN_OUTPUT= ALSA JACK NULLOUT OSS OSS4 \ - PULSEAUDIO QTMULTIMEDIA + PULSEAUDIO QTMULTIMEDIA SHOUTCAST PLUGIN_PLAYLIST_DESC= Playlist operation OPTIONS_GROUP_PLUGIN_PLAYLIST= COPYPASTE DIR_ASSOC FILEOPS HAL \ @@ -70,8 +54,16 @@ OPTIONS_GROUP_PLUGIN_NETWORKING= COVER CURL LYRICS MMS SB SCROBBLER MISC_DESC= Other features -OPTIONS_GROUP_MISC= CONVERTER CUE ENCA MPLAYER MPRIS RGSCAN SID +OPTIONS_GROUP_MISC= CONVERTER CUE ENCA FILEWRITER MPLAYER MPRIS RGSCAN SID +OPTIONS_DEFAULT= ALSA ANALYZER ARCHIVE BS2B CDDA CONVERTER COPYPASTE COVER \ + CROSSFADE CUE CURL DIR_ASSOC ENCA FAAD FFMPEG FILEOPS FILEWRITER FLAC \ + GNOMEHOTKEY GME HAL HOTKEY JACK KDENOTIFY LADSPA LYRICS MAD \ + MMS MODPLUG MPRIS MPLAYER MUSEPACK NOTIFIER NULLOUT \ + OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI QTMULTIMEDIA RGSCAN \ + SHOUTCAST SB SCROBBLER SID SKINNEDUI SNDFILE SOXR STATICON STEREO \ + TRACKCHANGE TWOPANELDIALOG UDISKS2 VORBIS WAVPACK WILDMIDI + DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen QSUI_DESC= Simple UI based on standard widgets set @@ -104,6 +96,12 @@ QTMULTIMEDIA_USE= QT5=multimedia QTMULTIMEDIA_CMAKE_BOOL= USE_QTMULTIMEDIA +SHOUTCAST_LIB_DEPENDS= libogg.so:audio/libogg \ + libshout.so:audio/libshout \ + libsoxr.so:audio/libsoxr \ + libvorbis.so:audio/libvorbis +SHOUTCAST_CMAKE_BOOL= USE_SHOUT + FLAC_LIB_DEPENDS= libFLAC.so:audio/flac \ libtag.so:audio/taglib FLAC_CMAKE_BOOL= USE_FLAC @@ -135,6 +133,10 @@ ENCA_LIB_DEPENDS= libenca.so:converters/enca ENCA_CMAKE_BOOL= USE_ENCA +FILEWRITER_DESC= Dump output sound into ogg audio file +FILEWRITER_LIB_DEPENDS= libvorbisenc.so:audio/libvorbis +FILEWRITER_CMAKE_BOOL= USE_FILEWRITER + MPLAYER_DESC= Enable showing videos by mplayer MPLAYER_RUN_DEPENDS= mplayer:multimedia/mplayer MPLAYER_CMAKE_BOOL= USE_MPLAYER @@ -205,6 +207,10 @@ ANALYZER_DESC= Support spectrum analyzer visualization ANALYZER_CMAKE_BOOL= USE_ANALYZER +ARCHIVE_DESC= Read archived media file +ARCHIVE_LIB_DEPENDS= libarchive.so:archivers/libarchive +ARCHIVE_CMAKE_BOOL= USE_ARCHIVE + CONVERTER_DESC= Support file type converter CONVERTER_LIB_DEPENDS= libtag.so:audio/taglib CONVERTER_CMAKE_BOOL= USE_CONVERTER @@ -270,6 +276,12 @@ TWOPANELDIALOG_DESC= File dialog by two-panel selector TWOPANELDIALOG_CMAKE_BOOL= USE_TWO_PANEL_DIALOG +PLIST_SUB+= SHLIB_VER=${PORTVERSION:C/-.*//} + +PATHFIX_CMAKELISTSTXT= \\"CMakeLists.txt -exec grep -l /pkgconfig {} +\\" +PORTDOCS= README README.RUS AUTHORS +INSTALLS_ICONS= yes + post-patch: @${GREP} -L '${LOCALBASE}/lib/oss' \ ${WRKSRC}/src/plugins/Output/oss4/CMakeLists.txt | ${XARGS} \ Index: multimedia/qmmp-qt5/distinfo =================================================================== --- multimedia/qmmp-qt5/distinfo (revision 454968) +++ multimedia/qmmp-qt5/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501879751 -SHA256 (qmmp-1.1.10.tar.bz2) = 1e5781bf65b3a27dd5e21349ac007464e67861dda99f8a0206984687881e0b9a -SIZE (qmmp-1.1.10.tar.bz2) = 1142444 +TIMESTAMP = 1511614849 +SHA256 (qmmp-1.2.0.tar.bz2) = 8020c92e5dd75ed9ab34fd5d1bb524e01f2f361dafd2fe9a3073ae97f5896c9e +SIZE (qmmp-1.2.0.tar.bz2) = 1182024 Index: multimedia/qmmp-qt5/pkg-descr =================================================================== --- multimedia/qmmp-qt5/pkg-descr (revision 454968) +++ multimedia/qmmp-qt5/pkg-descr (working copy) @@ -11,14 +11,14 @@ Visual effects: Spectrum Analyzer, and projectM audio visulaliser Output system support: - PulseAudio, OSS, OSS4, jack, ALSA, and Qt multimedia API + PulseAudio, OSS, OSS4, jack, ALSA, Qt multimedia API, and shoutcast Other features: multi-band equalizer, Last.fm/Libre.fm scrobbler, global hotkey, streaming (MP3, Vorbis, AAC, AAC+ via IceCast/ShoutCast) and browser, - CDDB, removable device detection (via HAL or UDisks), cover art, - multiple playlists, MMS, file type determination and converter, MPRIS, - CUE sheet, embedded CUE (for FLAC and WavPack), ReplayGain, + CDDB, removable device detection (via HAL or UDisks), cover art, MMS, + multiple playlists, file type determination and converter, ReplayGain, + CUE sheet, embedded CUE (for FLAC and WavPack), MPRIS, archived media, automatic charset detection for cue files and ShoutCast metadata, - video playback via Mplayer, lyrics (using lyrics.wikia.com), simple + video playback via Mplayer, dump, lyrics (using lyrics.wikia.com), simple UI, and skinned UI (supports all skins for XMMS and Winamp 2.x) WWW: http://qmmp.ylsoftware.com/ Index: multimedia/qmmp-qt5/pkg-plist =================================================================== --- multimedia/qmmp-qt5/pkg-plist (revision 454968) +++ multimedia/qmmp-qt5/pkg-plist (working copy) @@ -35,6 +35,7 @@ include/qmmpui/generalfactory.h include/qmmpui/mediaplayer.h include/qmmpui/metadataformatter.h +include/qmmpui/metadataformattermenu.h include/qmmpui/playlistdownloader.h include/qmmpui/playlistformat.h include/qmmpui/playlistgroup.h @@ -61,6 +62,7 @@ lib/qmmp/CommandLineOptions/libstatusoption.so %%LADSPA%%lib/qmmp/Effect/libladspa.so %%BS2B%%lib/qmmp/Effect/libbs2b.so +%%FILEWRITER%%lib/qmmp/Effect/libfilewriter.so %%SOXR%%lib/qmmp/Effect/libsoxr.so %%STEREO%%lib/qmmp/Effect/libstereo.so %%CROSSFADE%%lib/qmmp/Effect/libcrossfade.so @@ -85,6 +87,7 @@ %%TRACKCHANGE%%lib/qmmp/General/libtrackchange.so %%UDISKS2%%lib/qmmp/General/libudisks2.so %%FAAD%%lib/qmmp/Input/libaac.so +%%ARCHIVE%%lib/qmmp/Input/libarchive.so %%CDDA%%lib/qmmp/Input/libcdaudio.so %%CUE%%lib/qmmp/Input/libcue.so %%FFMPEG%%lib/qmmp/Input/libffmpeg.so @@ -106,6 +109,7 @@ %%OSS4%%lib/qmmp/Output/liboss4.so %%PULSEAUDIO%%lib/qmmp/Output/libpulseaudio.so %%QTMULTIMEDIA%%lib/qmmp/Output/libqtmultimedia.so +%%SHOUTCAST%%lib/qmmp/Output/libshout.so lib/qmmp/PlayListFormats/libm3uplaylistformat.so lib/qmmp/PlayListFormats/libplsplaylistformat.so lib/qmmp/PlayListFormats/libxspfplaylistformat.so