- Update to 1.1.0

- Remove SRCONV option
- Add 3 new options: TWOPANEDIALOG, QTMULTIMEDIA and SOXR

PR:		210524
Submitted by:	SimaMoto,RyoTa <liangtai.s16@gmail.com> (maintainer)

4 files changed, 34 insertions, 21 deletions

diff --git a/multimedia/qmmp-qt5/Makefile b/multimedia/qmmp-qt5/Makefile
index afc08454f178..7dcd1a3d3c86 100644
--- a/multimedia/qmmp-qt5/Makefile
+++ b/multimedia/qmmp-qt5/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qmmp
-PORTVERSION=	1.0.10
+PORTVERSION=	1.1.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/ \
 	SF/qmmp-dev/${PORTNAME}/
@@ -27,7 +27,7 @@ OPTIONS_GROUP=	DOCUMENTS PLUGIN_APPLICATION PLUGIN_FORMATS \
 
 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
@@ -37,13 +37,14 @@ OPTIONS_GROUP_PLUGIN_FORMATS=	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 SRCONV STEREO
+OPTIONS_GROUP_PLUGIN_DSP_EFFECTS=	BS2B CROSSFADE LADSPA SOXR 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 JACK NULLOUT OSS OSS4 \
+		PULSEAUDIO QTMULTIMEDIA
 
 PLUGIN_PLAYLIST_DESC=	Playlist operation
 OPTIONS_GROUP_PLUGIN_PLAYLIST=	COPYPASTE DIR_ASSOC FILEOPS HAL \
@@ -59,9 +60,9 @@ 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 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 SOXR STATICON STEREO \
+		TRACKCHANGE TWOPANELDIALOG UDISKS2 VORBIS WAVPACK WILDMIDI
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
@@ -80,7 +81,7 @@ 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
+		libsoxr.so:audio/libsoxr
 JACK_BUILD_DEPENDS=	jackit>=0.121.2:audio/jack
 JACK_CMAKE_ON=	-DUSE_JACK:BOOL=TRUE
 JACK_CMAKE_OFF=	-DUSE_JACK:BOOL=FALSE
@@ -98,6 +99,11 @@ PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 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=	QT5=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 +143,8 @@ ENCA_LIB_DEPENDS=	libenca.so:converters/enca
 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 +219,10 @@ NULLOUT_DESC=	Support null output
 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/libsoxr
+SOXR_CMAKE_ON=	-DUSE_SOXR:BOOL=TRUE
+SOXR_CMAKE_OFF=	-DUSE_SOXR:BOOL=FALSE
 
 CROSSFADE_DESC=	Support cross-fade effect
 CROSSFADE_CMAKE_ON=	-DUSE_CROSSFADE:BOOL=TRUE
@@ -309,6 +315,10 @@ QMMP_DIALOG_DESC=	An original dialog
 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 <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMPLAYER1} || ${PORT_OPTIONS:MMPLAYER2}
diff --git a/multimedia/qmmp-qt5/distinfo b/multimedia/qmmp-qt5/distinfo
index aee48024bbf1..e7aee667b7d3 100644
--- a/multimedia/qmmp-qt5/distinfo
+++ b/multimedia/qmmp-qt5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464704487
-SHA256 (qmmp-1.0.10.tar.bz2) = 02bcd01b1d8f6ca8b805a5deaeaa059ee44a38fafd20bec7ee3560a021250ee3
-SIZE (qmmp-1.0.10.tar.bz2) = 1107784
+TIMESTAMP = 1466523629
+SHA256 (qmmp-1.1.0.tar.bz2) = 38205304dde2c490276513ed039654a9125098b4986a76d2832f217ecf7c8f71
+SIZE (qmmp-1.1.0.tar.bz2) = 1126581
diff --git a/multimedia/qmmp-qt5/pkg-descr b/multimedia/qmmp-qt5/pkg-descr
index 430fa5542183..49177f06d894 100644
--- a/multimedia/qmmp-qt5/pkg-descr
+++ b/multimedia/qmmp-qt5/pkg-descr
@@ -6,12 +6,12 @@ Supported formats:
 	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,
diff --git a/multimedia/qmmp-qt5/pkg-plist b/multimedia/qmmp-qt5/pkg-plist
index fc69aa5b57c0..d2d4a2e5ea76 100644
--- a/multimedia/qmmp-qt5/pkg-plist
+++ b/multimedia/qmmp-qt5/pkg-plist
@@ -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/libseekoption.so
 lib/qmmp/CommandLineOptions/libstatusoption.so
 %%LADSPA%%lib/qmmp/Effect/libladspa.so
 %%BS2B%%lib/qmmp/Effect/libbs2b.so
-%%SRCONV%%lib/qmmp/Effect/libsrconverter.so
+%%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
@@ -103,6 +105,7 @@ lib/qmmp/CommandLineOptions/libstatusoption.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