multimediz/qmmp-*qt5>: update qmmp to 1.6.0 release

4 files changed, 116 insertions, 100 deletions

diff --git a/multimedia/qmmp-qt5/Makefile b/multimedia/qmmp-qt5/Makefile
index 8652ff513182..08e33d6cd8e8 100644
--- a/multimedia/qmmp-qt5/Makefile
+++ b/multimedia/qmmp-qt5/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	qmmp
-PORTVERSION=	1.5.4
+PORTVERSION=	1.6.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/${PORTNAME}/${PORTVERSION:R}/ \
 	SF/qmmp-dev/${PORTNAME}/${PORTVERSION:R}/
@@ -33,7 +33,7 @@ OPTIONS_GROUP_DOCUMENTS=	DOCS DOXYGEN
 
 PLUGIN_FORMATS_DESC=	Support various media formats
 OPTIONS_GROUP_PLUGIN_FORMATS=	ARCHIVE CDDA FAAD FFMPEG FLAC GME \
-		MAD MODPLUG MPG123 MUSEPACK OPUS SNDFILE VORBIS WAVPACK WILDMIDI
+		MAD MPG123 MUSEPACK OPUS SNDFILE VORBIS WAVPACK WILDMIDI XMP
 
 PLUGIN_DSP_EFFECTS_DESC=	DSP effects
 OPTIONS_GROUP_PLUGIN_DSP_EFFECTS=	BS2B CROSSFADE LADSPA SOXR STEREO
@@ -47,7 +47,7 @@ OPTIONS_GROUP_PLUGIN_OUTPUT=	ALSA JACK NULLOUT OSS OSS4 \
 
 PLUGIN_PLAYLIST_DESC=	Playlist operation
 OPTIONS_GROUP_PLUGIN_PLAYLIST=	COPYPASTE DIR_ASSOC FILEOPS HAL \
-		TRACKCHANGE UDISKS2
+		TRACKCHANGE UDISKS
 
 PLUGIN_NETWORKING_DESC=	Features via the Net
 OPTIONS_GROUP_PLUGIN_NETWORKING=	COVER CURL LYRICS MMS SB SCROBBLER
@@ -58,10 +58,10 @@ 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 HISTORY HOTKEY JACK KDENOTIFY LADSPA LYRICS MAD \
-		MMS MODPLUG MPG123 MPRIS MPLAYER MUSEPACK NOTIFIER NULLOUT \
+		MMS MPG123 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
+		TRACKCHANGE TWOPANELDIALOG UDISKS VORBIS WAVPACK WILDMIDI XMP
 
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
@@ -123,9 +123,6 @@ GME_CMAKE_BOOL=	USE_GME
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 FFMPEG_CMAKE_BOOL=	USE_FFMPEG
 
-MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
-MODPLUG_CMAKE_BOOL=	USE_MODPLUG
-
 FAAD_LIB_DEPENDS=	libfaad.so:audio/faad \
 		libtag.so:audio/taglib
 FAAD_CMAKE_BOOL=	USE_AAC
@@ -195,6 +192,10 @@ VORBIS_CMAKE_BOOL=	USE_VORBIS
 WAVPACK_LIB_DEPENDS=	libwavpack.so:audio/wavpack
 WAVPACK_CMAKE_BOOL=	USE_WAVPACK
 
+XMP_DESC=		Support various module formats using libxmp
+XMP_LIB_DEPENDS=	libxmp.so:audio/libxmp
+XMP_CMAKE_BOOL=	USE_XMP
+
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CMAKE_BOOL=	USE_CURL
 
@@ -281,11 +282,11 @@ KDENOTIFY_CMAKE_BOOL=	USE_KDENOTIFY
 TRACKCHANGE_DESC=	Enable to run external command each track
 TRACKCHANGE_CMAKE_BOOL=	USE_TRACKCHANGE
 
-UDISKS2_DESC=	Support removable disc detection using UDisks
-UDISKS2_RUN_DEPENDS=	bsdisks:sysutils/bsdisks
-UDISKS2_USES=	qt:5
-UDISKS2_USE=	QT=dbus
-UDISKS2_CMAKE_BOOL=	USE_UDISKS2
+UDISKS_DESC=	Support removable disc detection using UDisks
+UDISKS_RUN_DEPENDS=	bsdisks:sysutils/bsdisks
+UDISKS_USES=	qt:5
+UDISKS_USE=	QT=dbus
+UDISKS_CMAKE_BOOL=	USE_UDISKS
 
 QMMP_DIALOG_DESC=	An original dialog
 QMMP_DIALOG_CMAKE_BOOL=	USE_QMMP_DIALOG
@@ -293,7 +294,7 @@ QMMP_DIALOG_CMAKE_BOOL=	USE_QMMP_DIALOG
 TWOPANELDIALOG_DESC=	File dialog by two-panel selector
 TWOPANELDIALOG_CMAKE_BOOL=	USE_TWO_PANEL_DIALOG
 
-PLIST_SUB+=	SHLIB_VER=${PORTVERSION:C/-.*//} LIB_SUFFX=-${PORTVERSION:R}
+PLIST_SUB+=	SHLIB_VER=${PORTVERSION:C/-.*//} LIB_SUFFX=-${PORTVERSION:R} BIN_SUFFX=-${PORTVERSION:R:R}
 
 PATHFIX_CMAKELISTSTXT=	\\"CMakeLists.txt -exec grep -l /pkgconfig {} +\\"
 PORTDOCS=	README README.RUS AUTHORS
diff --git a/multimedia/qmmp-qt5/distinfo b/multimedia/qmmp-qt5/distinfo
index f0f4f46d0cf0..002f85250b6d 100644
--- a/multimedia/qmmp-qt5/distinfo
+++ b/multimedia/qmmp-qt5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1648561142
-SHA256 (qmmp-1.5.4.tar.bz2) = 72aafa616c10f5ac2fe9a34ef2ea3e5f71b7a0668aecb76589e39d3a4ba50f3c
-SIZE (qmmp-1.5.4.tar.bz2) = 1388941
+TIMESTAMP = 1652821042
+SHA256 (qmmp-1.6.0.tar.bz2) = cf720d4ecd05046fcfa7d469b033b6a89b8e7aa29b6bcabe131b54d9eba5b071
+SIZE (qmmp-1.6.0.tar.bz2) = 1364512
diff --git a/multimedia/qmmp-qt5/files/patch-src_plugins_General_CMakeLists.txt b/multimedia/qmmp-qt5/files/patch-src_plugins_General_CMakeLists.txt
new file mode 100644
index 000000000000..51383a06f0dc
--- /dev/null
+++ b/multimedia/qmmp-qt5/files/patch-src_plugins_General_CMakeLists.txt
@@ -0,0 +1,15 @@
+--- src/plugins/General/CMakeLists.txt.orig	2022-05-16 19:29:52 UTC
++++ src/plugins/General/CMakeLists.txt
+@@ -50,9 +50,9 @@ ENDIF(USE_HAL AND Qt5DBus_FOUND)
+ add_subdirectory(hal)
+ ENDIF(USE_HAL AND Qt5DBus_FOUND)
+ 
+-IF(USE_UDISKS2 AND Qt5DBus_FOUND)
+-add_subdirectory(udisks2)
+-ENDIF(USE_UDISKS2 AND Qt5DBus_FOUND)
++IF(USE_UDISKS AND Qt5DBus_FOUND)
++add_subdirectory(udisks)
++ENDIF(USE_UDISKS AND Qt5DBus_FOUND)
+ 
+ IF(USE_HOTKEY AND Qt5X11Extras_FOUND)
+ add_subdirectory(hotkey)
diff --git a/multimedia/qmmp-qt5/pkg-plist b/multimedia/qmmp-qt5/pkg-plist
index 8a17ec793282..93f20a93a640 100644
--- a/multimedia/qmmp-qt5/pkg-plist
+++ b/multimedia/qmmp-qt5/pkg-plist
@@ -1,65 +1,65 @@
-bin/qmmp
-include/qmmp/abstractengine.h
-include/qmmp/audioconverter.h
-include/qmmp/audioparameters.h
-include/qmmp/buffer.h
-include/qmmp/channelmap.h
-include/qmmp/cueparser.h
-include/qmmp/decoder.h
-include/qmmp/decoderfactory.h
-include/qmmp/effect.h
-include/qmmp/effectfactory.h
-include/qmmp/enginefactory.h
-include/qmmp/eqsettings.h
-include/qmmp/inputsource.h
-include/qmmp/inputsourcefactory.h
-include/qmmp/metadatamanager.h
-include/qmmp/metadatamodel.h
-include/qmmp/output.h
-include/qmmp/outputfactory.h
-include/qmmp/qmmp_export.h
-include/qmmp/qmmp.h
-include/qmmp/qmmpsettings.h
-include/qmmp/soundcore.h
-include/qmmp/statehandler.h
-include/qmmp/tagmodel.h
-include/qmmp/trackinfo.h
-include/qmmp/visual.h
-include/qmmp/visualfactory.h
-include/qmmp/volume.h
-include/qmmp/volumehandler.h
-include/qmmpui/commandlinehandler.h
-include/qmmpui/commandlinemanager.h
-include/qmmpui/configdialog.h
-include/qmmpui/detailsdialog.h
-include/qmmpui/filedialog.h
-include/qmmpui/filedialogfactory.h
-include/qmmpui/general.h
-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
-include/qmmpui/playlistheadermodel.h
-include/qmmpui/playlistitem.h
-include/qmmpui/playlistmanager.h
-include/qmmpui/playlistmodel.h
-include/qmmpui/playlistparser.h
-include/qmmpui/playlisttrack.h
-include/qmmpui/qmmpui_export.h
-include/qmmpui/qmmpuisettings.h
-include/qmmpui/templateeditor.h
-include/qmmpui/uifactory.h
-include/qmmpui/uihelper.h
-include/qmmpui/uiloader.h
-lib/libqmmp.so
-lib/libqmmp.so.1
-lib/libqmmp.so.%%SHLIB_VER%%
-lib/libqmmpui.so
-lib/libqmmpui.so.1
-lib/libqmmpui.so.%%SHLIB_VER%%
+bin/qmmp%%BIN_SUFFX%%
+include/qmmp%%BIN_SUFFX%%/qmmp/abstractengine.h
+include/qmmp%%BIN_SUFFX%%/qmmp/audioconverter.h
+include/qmmp%%BIN_SUFFX%%/qmmp/audioparameters.h
+include/qmmp%%BIN_SUFFX%%/qmmp/buffer.h
+include/qmmp%%BIN_SUFFX%%/qmmp/channelmap.h
+include/qmmp%%BIN_SUFFX%%/qmmp/cueparser.h
+include/qmmp%%BIN_SUFFX%%/qmmp/decoder.h
+include/qmmp%%BIN_SUFFX%%/qmmp/decoderfactory.h
+include/qmmp%%BIN_SUFFX%%/qmmp/effect.h
+include/qmmp%%BIN_SUFFX%%/qmmp/effectfactory.h
+include/qmmp%%BIN_SUFFX%%/qmmp/enginefactory.h
+include/qmmp%%BIN_SUFFX%%/qmmp/eqsettings.h
+include/qmmp%%BIN_SUFFX%%/qmmp/inputsource.h
+include/qmmp%%BIN_SUFFX%%/qmmp/inputsourcefactory.h
+include/qmmp%%BIN_SUFFX%%/qmmp/metadatamanager.h
+include/qmmp%%BIN_SUFFX%%/qmmp/metadatamodel.h
+include/qmmp%%BIN_SUFFX%%/qmmp/output.h
+include/qmmp%%BIN_SUFFX%%/qmmp/outputfactory.h
+include/qmmp%%BIN_SUFFX%%/qmmp/qmmp_export.h
+include/qmmp%%BIN_SUFFX%%/qmmp/qmmp.h
+include/qmmp%%BIN_SUFFX%%/qmmp/qmmpsettings.h
+include/qmmp%%BIN_SUFFX%%/qmmp/soundcore.h
+include/qmmp%%BIN_SUFFX%%/qmmp/statehandler.h
+include/qmmp%%BIN_SUFFX%%/qmmp/tagmodel.h
+include/qmmp%%BIN_SUFFX%%/qmmp/trackinfo.h
+include/qmmp%%BIN_SUFFX%%/qmmp/visual.h
+include/qmmp%%BIN_SUFFX%%/qmmp/visualfactory.h
+include/qmmp%%BIN_SUFFX%%/qmmp/volume.h
+include/qmmp%%BIN_SUFFX%%/qmmp/volumehandler.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/commandlinehandler.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/commandlinemanager.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/configdialog.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/detailsdialog.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/filedialog.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/filedialogfactory.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/general.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/generalfactory.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/mediaplayer.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/metadataformatter.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/metadataformattermenu.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/playlistdownloader.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/playlistformat.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/playlistgroup.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/playlistheadermodel.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/playlistitem.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/playlistmanager.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/playlistmodel.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/playlistparser.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/playlisttrack.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/qmmpui_export.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/qmmpuisettings.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/templateeditor.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/uifactory.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/uihelper.h
+include/qmmp%%BIN_SUFFX%%/qmmpui/uiloader.h
+lib/libqmmp%%BIN_SUFFX%%.so
+lib/libqmmp%%BIN_SUFFX%%.so.1
+lib/libqmmp%%BIN_SUFFX%%.so.%%SHLIB_VER%%
+lib/libqmmpui%%BIN_SUFFX%%.so
+lib/libqmmpui%%BIN_SUFFX%%.so.1
+lib/libqmmpui%%BIN_SUFFX%%.so.%%SHLIB_VER%%
 lib/qmmp%%LIB_SUFFX%%/CommandLineOptions/libincdecvolumeoption.so
 lib/qmmp%%LIB_SUFFX%%/CommandLineOptions/libplaylistoption.so
 lib/qmmp%%LIB_SUFFX%%/CommandLineOptions/libseekoption.so
@@ -94,14 +94,13 @@ lib/qmmp%%LIB_SUFFX%%/General/libsleepinhibitor.so
 %%STATICON%%lib/qmmp%%LIB_SUFFX%%/General/libstatusicon.so
 %%SB%%lib/qmmp%%LIB_SUFFX%%/General/libstreambrowser.so
 %%TRACKCHANGE%%lib/qmmp%%LIB_SUFFX%%/General/libtrackchange.so
-%%UDISKS2%%lib/qmmp%%LIB_SUFFX%%/General/libudisks2.so
+%%UDISKS%%lib/qmmp%%LIB_SUFFX%%/General/libudisks.so
 %%FAAD%%lib/qmmp%%LIB_SUFFX%%/Input/libaac.so
 %%ARCHIVE%%lib/qmmp%%LIB_SUFFX%%/Input/libarchive.so
 %%CDDA%%lib/qmmp%%LIB_SUFFX%%/Input/libcdaudio.so
 %%CUE%%lib/qmmp%%LIB_SUFFX%%/Input/libcue.so
 %%FFMPEG%%lib/qmmp%%LIB_SUFFX%%/Input/libffmpeg.so
 %%FLAC%%lib/qmmp%%LIB_SUFFX%%/Input/libflac.so
-%%MODPLUG%%lib/qmmp%%LIB_SUFFX%%/Input/libmodplug.so
 %%GME%%lib/qmmp%%LIB_SUFFX%%/Input/libgme.so
 %%MUSEPACK%%lib/qmmp%%LIB_SUFFX%%/Input/libmpc.so
 %%MPEG%%lib/qmmp%%LIB_SUFFX%%/Input/libmpeg.so
@@ -111,6 +110,7 @@ lib/qmmp%%LIB_SUFFX%%/General/libsleepinhibitor.so
 %%VORBIS%%lib/qmmp%%LIB_SUFFX%%/Input/libvorbis.so
 %%WAVPACK%%lib/qmmp%%LIB_SUFFX%%/Input/libwavpack.so
 %%WILDMIDI%%lib/qmmp%%LIB_SUFFX%%/Input/libwildmidi.so
+%%XMP%%lib/qmmp%%LIB_SUFFX%%/Input/libxmp.so
 %%JACK%%lib/qmmp%%LIB_SUFFX%%/Output/libjack.so
 %%ALSA%%lib/qmmp%%LIB_SUFFX%%/Output/libalsa.so
 %%NULLOUT%%lib/qmmp%%LIB_SUFFX%%/Output/libnull.so
@@ -128,23 +128,23 @@ lib/qmmp%%LIB_SUFFX%%/PlayListFormats/libxspfplaylistformat.so
 %%QSUI%%lib/qmmp%%LIB_SUFFX%%/Ui/libqsui.so
 %%ANALYZER%%lib/qmmp%%LIB_SUFFX%%/Visual/libanalyzer.so
 %%PROJECTM%%lib/qmmp%%LIB_SUFFX%%/Visual/libprojectm.so
-libdata/pkgconfig/qmmp.pc
-libdata/pkgconfig/qmmpui.pc
-%%DIR_ASSOC%%share/applications/qmmp.desktop
-%%DIR_ASSOC%%share/applications/qmmp-dir.desktop
-%%DIR_ASSOC%%share/applications/qmmp-enqueue.desktop
-share/icons/hicolor/16x16/apps/qmmp.png
-share/icons/hicolor/32x32/apps/qmmp.png
-share/icons/hicolor/48x48/apps/qmmp.png
-share/icons/hicolor/56x56/apps/qmmp.png
-share/icons/hicolor/64x64/apps/qmmp.png
-share/icons/hicolor/128x128/apps/qmmp.png
-share/icons/hicolor/256x256/apps/qmmp.png
-share/icons/hicolor/scalable/apps/qmmp.svgz
-share/icons/hicolor/scalable/apps/qmmp-simple.svgz
-share/metainfo/qmmp.appdata.xml
-%%KDENOTIFY%%%%DATADIR%%/images/app_icon.png
-%%KDENOTIFY%%%%DATADIR%%/images/empty_cover.png
-%%DATADIR%%/scripts/kwin.sh
-share/solid/actions/qmmp-opencda.desktop
+libdata/pkgconfig/qmmp%%BIN_SUFFX%%.pc
+libdata/pkgconfig/qmmpui%%BIN_SUFFX%%.pc
+%%DIR_ASSOC%%share/applications/qmmp%%BIN_SUFFX%%.desktop
+%%DIR_ASSOC%%share/applications/qmmp-dir%%BIN_SUFFX%%.desktop
+%%DIR_ASSOC%%share/applications/qmmp-enqueue%%BIN_SUFFX%%.desktop
+share/icons/hicolor/16x16/apps/qmmp%%BIN_SUFFX%%.png
+share/icons/hicolor/32x32/apps/qmmp%%BIN_SUFFX%%.png
+share/icons/hicolor/48x48/apps/qmmp%%BIN_SUFFX%%.png
+share/icons/hicolor/56x56/apps/qmmp%%BIN_SUFFX%%.png
+share/icons/hicolor/64x64/apps/qmmp%%BIN_SUFFX%%.png
+share/icons/hicolor/128x128/apps/qmmp%%BIN_SUFFX%%.png
+share/icons/hicolor/256x256/apps/qmmp%%BIN_SUFFX%%.png
+share/icons/hicolor/scalable/apps/qmmp%%BIN_SUFFX%%.svgz
+share/icons/hicolor/scalable/apps/qmmp-simple%%BIN_SUFFX%%.svgz
+share/metainfo/qmmp%%BIN_SUFFX%%.appdata.xml
+%%KDENOTIFY%%%%DATADIR%%%%BIN_SUFFX%%/images/app_icon.png
+%%KDENOTIFY%%%%DATADIR%%%%BIN_SUFFX%%/images/empty_cover.png
+%%DATADIR%%%%BIN_SUFFX%%/scripts/kwin.sh
+share/solid/actions/qmmp-opencda%%BIN_SUFFX%%.desktop
 @comment Insert PLIST.doc here