Index: multimedia/qmmp/Makefile =================================================================== --- multimedia/qmmp/Makefile (revision 417406) +++ multimedia/qmmp/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= qmmp -PORTVERSION= 0.9.10 +PORTVERSION= 0.10.0 CATEGORIES= multimedia MASTER_SITES= http://qmmp.ylsoftware.com/files/ \ SF/qmmp-dev/${PORTNAME}/ @@ -26,7 +26,7 @@ PLUGIN_APPLICATION_DESC= Main program view OPTIONS_GROUP_PLUGIN_APPLICATION= GNOMEHOTKEY HOTKEY KDENOTIFY \ - NOTIFIER QMMP_DIALOG QSUI SKINNEDUI STATICON + NOTIFIER QMMP_DIALOG QSUI SKINNEDUI STATICON TWOPANELDIALOG DOCUMENTS_DESC= Documentation and API Reference OPTIONS_GROUP_DOCUMENTS= DOCS DOXYGEN @@ -36,13 +36,14 @@ MUSEPACK OPUS SNDFILE VORBIS WAVPACK WILDMIDI PLUGIN_DSP_EFFECTS_DESC= DSP effects -OPTIONS_GROUP_PLUGIN_DSP_EFFECTS= BS2B CROSSFADE LADSPA SRCONV STEREO +OPTIONS_GROUP_PLUGIN_DSP_EFFECTS= BS2B CROSSFADE LADSPA STEREO PLUGIN_VISUAL_EFFECTS_DESC= Visual effects OPTIONS_GROUP_PLUGIN_VISUAL_EFFECTS= ANALYZER PROJECTM PLUGIN_OUTPUT_DESC= Output sound systems -OPTIONS_GROUP_PLUGIN_OUTPUT= ALSA JACK NULLOUT OSS OSS4 PULSEAUDIO +OPTIONS_GROUP_PLUGIN_OUTPUT= ALSA NULLOUT OSS OSS4 \ + PULSEAUDIO QTMULTIMEDIA PLUGIN_PLAYLIST_DESC= Playlist operation OPTIONS_GROUP_PLUGIN_PLAYLIST= COPYPASTE DIR_ASSOC FILEOPS HAL \ @@ -56,11 +57,11 @@ 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 \ + GNOMEHOTKEY GME HAL HOTKEY KDENOTIFY LADSPA LYRICS MAD \ MMS MODPLUG MPRIS MPLAYER1 MUSEPACK NOTIFIER NULLOUT \ - OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI RGSCAN \ - SB SCROBBLER SID SKINNEDUI SNDFILE SRCONV STATICON STEREO \ - TRACKCHANGE UDISKS2 VORBIS WAVPACK WILDMIDI + OPUS OSS4 PROJECTM PULSEAUDIO QMMP_DIALOG QSUI QTMULTIMEDIA \ + RGSCAN SB SCROBBLER SID SKINNEDUI SNDFILE STATICON STEREO \ + TRACKCHANGE TWOPANELDIALOG UDISKS2 VORBIS WAVPACK WILDMIDI DOXYGEN_BUILD_DEPENDS= doxygen:devel/doxygen @@ -79,11 +80,12 @@ DIR_ASSOC_CMAKE_OFF= -DUSE_DIR_ASSOC:BOOL=FALSE DIR_ASSOC_USES= desktop-file-utils -JACK_LIB_DEPENDS= libjack.so:audio/jack \ - libsamplerate.so:audio/libsamplerate -JACK_BUILD_DEPENDS= jackit>=0.121.2:audio/jack -JACK_CMAKE_ON= -DUSE_JACK:BOOL=TRUE -JACK_CMAKE_OFF= -DUSE_JACK:BOOL=FALSE +#JACK_LIB_DEPENDS= libjack.so:audio/jack \ +# libsoxr.so:audio/soxr +#JACK_BUILD_DEPENDS= jackit>=0.121.2:audio/jack +#JACK_CMAKE_ON= -DUSE_JACK:BOOL=TRUE +#JACK_CMAKE_OFF= -DUSE_JACK:BOOL=FALSE +CMAKE_ARGS+= -DUSE_JACK:BOOL=FALSE ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_ON= -DUSE_ALSA:BOOL=TRUE @@ -98,6 +100,11 @@ PULSEAUDIO_CMAKE_ON= -DUSE_PULSE:BOOL=TRUE PULSEAUDIO_CMAKE_OFF= -DUSE_PULSE:BOOL=FALSE +QTMULTIMEDIA_DESC= Support to use Qt low-level multimedia API +QTMULTIMEDIA_USE= QT4=multimedia +QTMULTIMEDIA_CMAKE_ON= -DUSE_QTMULTIMEDIA:BOOL=TRUE +QTMULTIMEDIA_CMAKE_OFF= -DUSE_QTMULTIMEDIA:BOOL=FALSE + FLAC_LIB_DEPENDS= libFLAC.so:audio/flac \ libtag.so:audio/taglib FLAC_CMAKE_ON= -DUSE_FLAC:BOOL=TRUE @@ -137,8 +144,8 @@ ENCA_CMAKE_ON= -DUSE_ENCA:BOOL=TRUE ENCA_CMAKE_OFF= -DUSE_ENCA:BOOL=FALSE -MPLAYER1_DESC= mplayer-1.1.x (multimedia/mplayer) -MPLAYER2_DESC= mplayer-2.0.x (multimedia/mplayer2) +MPLAYER1_DESC= mplayer-1.x (multimedia/mplayer) +MPLAYER2_DESC= mplayer-2.x (multimedia/mplayer2) MPLAYER1_RUN_DEPENDS= mplayer:multimedia/mplayer MPLAYER2_RUN_DEPENDS= mplayer:multimedia/mplayer2 MPLAYER1_PREVENTS= MPLAYER2 @@ -213,10 +220,11 @@ NULLOUT_CMAKE_ON= -DUSE_NULL:BOOL=TRUE NULLOUT_CMAKE_OFF= -DUSE_NULL:BOOL=FALSE -SRCONV_DESC= Support the sample rate converter -SRCONV_LIB_DEPENDS= libsamplerate.so:audio/libsamplerate -SRCONV_CMAKE_ON= -DUSE_SRC:BOOL=TRUE -SRCONV_CMAKE_OFF= -DUSE_SRC:BOOL=FALSE +#SOXR_DESC= Support SoX Resampler +#SOXR_LIB_DEPENDS= libsoxr.so:audio/soxr +#SOXR_CMAKE_ON= -DUSE_SOXR:BOOL=TRUE +#SOXR_CMAKE_OFF= -DUSE_SOXR:BOOL=FALSE +CMAKE_ARGS+= -DUSE_SOXR:BOOL=FALSE CROSSFADE_DESC= Support cross-fade effect CROSSFADE_CMAKE_ON= -DUSE_CROSSFADE:BOOL=TRUE @@ -313,6 +321,10 @@ QMMP_DIALOG_CMAKE_ON= -DUSE_QMMP_DIALOG:BOOL=TRUE QMMP_DIALOG_CMAKE_OFF= -DUSE_QMMP_DIALOG:BOOL=FALSE +TWOPANELDIALOG_DESC= File dialog by two-panel selector +TWOPANELDIALOG_CMAKE_ON= -DUSE_TWO_PANEL_DIALOG:BOOL=TRUE +TWOPANELDIALOG_CMAKE_OFF= -DUSE_TWO_PANEL_DIALOG:BOOL=FALSE + .include .if ${PORT_OPTIONS:MMPLAYER1} || ${PORT_OPTIONS:MMPLAYER2} @@ -329,8 +341,7 @@ PORTDOCS= README README.RUS AUTHORS INSTALLS_ICONS= yes -CMAKE_ARGS+= -DUSE_FFMPEG_LEGACY:BOOL=FALSE \ - -DCMAKE_REQUIRED_INCLUDES:PATH=${LOCALBASE}/include +CMAKE_ARGS+= -DUSE_FFMPEG_LEGACY:BOOL=FALSE post-patch: @${GREP} -L '${LOCALBASE}/lib/oss' \ Index: multimedia/qmmp/distinfo =================================================================== --- multimedia/qmmp/distinfo (revision 417406) +++ multimedia/qmmp/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1464687723 -SHA256 (qmmp-0.9.10.tar.bz2) = a93ca43b2407b917602a47b5728cd4d72d694069a3ea329572c01ff66845f7e1 -SIZE (qmmp-0.9.10.tar.bz2) = 1126355 +TIMESTAMP = 1466521084 +SHA256 (qmmp-0.10.0.tar.bz2) = b22ced5715d6778438054a97ef73326ac92a1bbca9686bfb923a00fe6c7128f4 +SIZE (qmmp-0.10.0.tar.bz2) = 1338447 Index: multimedia/qmmp/pkg-descr =================================================================== --- multimedia/qmmp/pkg-descr (revision 417406) +++ multimedia/qmmp/pkg-descr (working copy) @@ -6,12 +6,12 @@ PCM Wave (and other formats via libsndfile), and Chiptune formats (AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ, VTX) DSP effects: - Bauer Stereophonic-to-Binaural effect, sample rate conversion, - LADSPA effects, extra stereo effect, and crossfade effect + Effects of Bauer Stereophonic-to-Binaural, LADSPA, + extra stereo, and crossfade Visual effects: Spectrum Analyzer, and projectM audio visulaliser Output system support: - PulseAudio, OSS, OSS4, jack, and ALSA + PulseAudio, OSS, OSS4, ALSA, and Qt multimedia API Other features: multi-band equalizer, Last.fm/Libre.fm scrobbler, global hotkey, streaming (MP3, Vorbis, AAC, AAC+ via IceCast/ShoutCast) and browser, Index: multimedia/qmmp/pkg-plist =================================================================== --- multimedia/qmmp/pkg-plist (revision 417406) +++ multimedia/qmmp/pkg-plist (working copy) @@ -1,5 +1,6 @@ bin/qmmp include/qmmp/abstractengine.h +include/qmmp/audioconverter.h include/qmmp/audioparameters.h include/qmmp/buffer.h include/qmmp/channelmap.h @@ -60,11 +61,12 @@ lib/qmmp/CommandLineOptions/libstatusoption.so %%LADSPA%%lib/qmmp/Effect/libladspa.so %%BS2B%%lib/qmmp/Effect/libbs2b.so -%%SRCONV%%lib/qmmp/Effect/libsrconverter.so +@comment %%SOXR%%lib/qmmp/Effect/libsoxr.so %%STEREO%%lib/qmmp/Effect/libstereo.so %%CROSSFADE%%lib/qmmp/Effect/libcrossfade.so %%MPLAYER%%lib/qmmp/Engines/libmplayer.so %%QMMP_DIALOG%%lib/qmmp/FileDialogs/libqmmpfiledialog.so +%%TWOPANELDIALOG%%lib/qmmp/FileDialogs/libtwopanelfiledialog.so %%CONVERTER%%lib/qmmp/General/libconverter.so %%COPYPASTE%%lib/qmmp/General/libcopypaste.so %%COVER%%lib/qmmp/General/libcovermanager.so @@ -98,12 +100,13 @@ %%VORBIS%%lib/qmmp/Input/libvorbis.so %%WAVPACK%%lib/qmmp/Input/libwavpack.so %%WILDMIDI%%lib/qmmp/Input/libwildmidi.so -%%JACK%%lib/qmmp/Output/libjack.so +@comment %%JACK%%lib/qmmp/Output/libjack.so %%ALSA%%lib/qmmp/Output/libalsa.so %%NULLOUT%%lib/qmmp/Output/libnull.so %%OSS%%lib/qmmp/Output/liboss.so %%OSS4%%lib/qmmp/Output/liboss4.so %%PULSEAUDIO%%lib/qmmp/Output/libpulseaudio.so +%%QTMULTIMEDIA%%lib/qmmp/Output/libqtmultimedia.so lib/qmmp/PlayListFormats/libm3uplaylistformat.so lib/qmmp/PlayListFormats/libplsplaylistformat.so lib/qmmp/PlayListFormats/libxspfplaylistformat.so