qmmp: Update to 1.4.2

Version 1.4.1
* fixed NetBSD build
* fixed 'jump to track' dialog delay
* fixed feature to disable formats in the ffmpeg plugin
* fixed some streams detection in the mpeg plugin
* fixed losing of equalizer settings
* fixed codec and bitrate displaying for IceCast streams
* fixed playback startup detection in the mpris plugin
* updated Russian translation
* updated Dutch translation (Heimen Stoffels)
* updated Galician translation (Delio Docampo Cordeiro)
* updated Polish translation (mrerexx)
* updated Portuguese translation (Sérgio Marques)
* updated Spanish translation (Joel Barrios)
* updated Turkish translation (abcmen)

Version 1.4.2
* fixed playlist updating
* fixed memory leak
* fixed kwin support
* fixed xing header parsing in the mpeg plugin
* updated Greek translation (Dimitrios Glentadakis)

5 files changed, 20 insertions, 53 deletions

diff --git a/audio/qmmp/Makefile b/audio/qmmp/Makefile
index 65e2e7c76a0..42f25797156 100644
--- a/audio/qmmp/Makefile
+++ b/audio/qmmp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2020/11/05 09:07:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.17 2020/12/03 22:32:41 nia Exp $
 
-DISTNAME=	qmmp-1.4.0
-PKGREVISION=	6
+DISTNAME=	qmmp-1.4.2
 CATEGORIES=	audio
 MASTER_SITES=	http://qmmp.ylsoftware.com/files/
 EXTRACT_SUFX=	.tar.bz2
@@ -23,13 +22,19 @@ CMAKE_ARGS+=	-DUSE_MAD=OFF
 # ??? seems to break playing some files
 CMAKE_ARGS+=	-DUSE_MPLAYER=OFF
 
-# XXX broken volume control
-CMAKE_ARGS+=	-DUSE_OSS=OFF
-CMAKE_ARGS+=	-DUSE_OSS4=OFF
-
 .include "../../mk/oss.buildlink3.mk"
 
 .if ${OSS_TYPE} != "none"
+PLIST_VARS+=		oss oss4
+.  if ${OPSYS} == "FreeBSD" || ${OPSYS} == "SunOS"
+PLIST.oss4=		yes
+CMAKE_ARGS+=		-DUSE_OSS=OFF
+CMAKE_ARGS+=		-DUSE_OSS4=ON
+.  else
+PLIST.oss=		yes
+CMAKE_ARGS+=		-DUSE_OSS=ON
+CMAKE_ARGS+=		-DUSE_OSS4=OFF
+.  endif
 SUBST_CLASSES+=		oss
 SUBST_STAGE.oss=	pre-build
 SUBST_MESSAGE.oss=	Correcting the path to OSS device.
diff --git a/audio/qmmp/PLIST b/audio/qmmp/PLIST
index 985fe6d3a9b..4e088f9ec46 100644
--- a/audio/qmmp/PLIST
+++ b/audio/qmmp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2020/05/16 18:51:46 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/12/03 22:32:41 nia Exp $
 bin/qmmp
 include/qmmp/abstractengine.h
 include/qmmp/audioconverter.h
@@ -111,6 +111,8 @@ lib/qmmp-1.4/Input/libwildmidi.so
 ${PLIST.alsa}lib/qmmp-1.4/Output/libalsa.so
 ${PLIST.jack}lib/qmmp-1.4/Output/libjack.so
 lib/qmmp-1.4/Output/libnull.so
+${PLIST.oss}lib/qmmp-1.4/Output/liboss.so
+${PLIST.oss4}lib/qmmp-1.4/Output/liboss4.so
 ${PLIST.pulse}lib/qmmp-1.4/Output/libpulseaudio.so
 lib/qmmp-1.4/Output/libqtmultimedia.so
 lib/qmmp-1.4/Output/libshout.so
diff --git a/audio/qmmp/distinfo b/audio/qmmp/distinfo
index 09c8f8992b8..c3bf8b12d97 100644
--- a/audio/qmmp/distinfo
+++ b/audio/qmmp/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2020/05/23 20:11:23 rillig Exp $
+$NetBSD: distinfo,v 1.5 2020/12/03 22:32:41 nia Exp $
 
-SHA1 (qmmp-1.4.0.tar.bz2) = a82bf6818eb7fe14bbbcdca24b25b814ea7418ca
-RMD160 (qmmp-1.4.0.tar.bz2) = 5749a728a1a0e00c42f796aabb5ba5a3846968c6
-SHA512 (qmmp-1.4.0.tar.bz2) = b4ae764c223e1ce28477e86493ba409429e191ff51ef11d9b7c4fa356f90e5ff7e390bc8d1dcaf7779b231d59bf668d64000ea196b4020a7255eeb009706643d
-Size (qmmp-1.4.0.tar.bz2) = 1293438 bytes
-SHA1 (patch-src_plugins_Ui_skinned_scripts_kwin_sh) = 18be957905c4a6247791673b7e40e631036c6618
-SHA1 (patch-src_plugins_Ui_skinned_symboldisplay.cpp) = d172068a4215c6dafb5b5c921bfabe71060be16f
+SHA1 (qmmp-1.4.2.tar.bz2) = c3b6c9bfe54e93b44d4f026060190a204c61cc30
+RMD160 (qmmp-1.4.2.tar.bz2) = 3eeb5ec87a3c7ef7e08c41e47dea5ebce1b045df
+SHA512 (qmmp-1.4.2.tar.bz2) = 00ed0c4bd74dc50294c9d8e717f249a577fb26f5d4eb93dbc42c6c79964188fd885ab577904dea5aec31db0d2b828d7038febca1ffdfd2f4bfe81f931bbed7ff
+Size (qmmp-1.4.2.tar.bz2) = 1295867 bytes
diff --git a/audio/qmmp/patches/patch-src_plugins_Ui_skinned_scripts_kwin_sh b/audio/qmmp/patches/patch-src_plugins_Ui_skinned_scripts_kwin_sh
deleted file mode 100644
index 3f5234e9224..00000000000
--- a/audio/qmmp/patches/patch-src_plugins_Ui_skinned_scripts_kwin_sh
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_plugins_Ui_skinned_scripts_kwin_sh,v 1.1 2020/05/23 20:11:23 rillig Exp $
-
-Fix shell portability.
-
---- src/plugins/Ui/skinned/scripts/kwin.sh.orig	2020-01-14 17:06:24.000000000 +0000
-+++ src/plugins/Ui/skinned/scripts/kwin.sh	2020-05-15 05:39:14.852611863 +0000
-@@ -19,10 +19,11 @@
- do
- 	# find qmmp window rule in KWin
-     match=`kreadconfig5 --file kwinrulesrc --group $i --key wmclass`
--    if [[ "${match,,}" = *"qmmp"* ]]; then
-+    case $match in
-+    *[Qq][Mm][Mm][Pp]*)
-         found=$i
-         break
--    fi
-+    esac
-     i=$((i+1))
- done
- 
diff --git a/audio/qmmp/patches/patch-src_plugins_Ui_skinned_symboldisplay.cpp b/audio/qmmp/patches/patch-src_plugins_Ui_skinned_symboldisplay.cpp
deleted file mode 100644
index 8748e734f8d..00000000000
--- a/audio/qmmp/patches/patch-src_plugins_Ui_skinned_symboldisplay.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_plugins_Ui_skinned_symboldisplay.cpp,v 1.1 2019/10/01 12:43:04 nia Exp $
-
-Avoid GNUism.
-
---- src/plugins/Ui/skinned/symboldisplay.cpp.orig	2019-08-27 19:32:14.000000000 +0000
-+++ src/plugins/Ui/skinned/symboldisplay.cpp
-@@ -32,11 +32,7 @@ SymbolDisplay::SymbolDisplay (QWidget *p
-     connect (m_skin, SIGNAL (skinChanged()), this, SLOT (draw()));
-     draw();
-     for (int i=0; i<m_digits; ++i)
--#if defined(Q_OS_FREEBSD) || defined(Q_OS_WIN) || defined (Q_OS_MAC)
-         m_max += 9 * (int) pow(10,i);
--#else
--        m_max += 9 * (int) exp10(i);
--#endif
- }
- 
- SymbolDisplay::~SymbolDisplay()