kmplayer: update to 0.12.0b

QT5/KF5 version.

12 files changed, 201 insertions, 114 deletions

diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 3f8d362e262..ef3974dae9b 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,30 +1,50 @@
-# $NetBSD: Makefile,v 1.143 2021/05/24 19:53:13 wiz Exp $
+# $NetBSD: Makefile,v 1.144 2021/08/31 12:06:22 markd Exp $
 #
 
-DISTNAME=	kmplayer-0.11.3d
-PKGREVISION=	69
+DISTNAME=	kmplayer-0.12.0b
 CATEGORIES=	multimedia kde
-MASTER_SITES=	https://kmplayer.kde.org/pkgs/
+MASTER_SITES=	${MASTER_SITE_KDE:=kmplayer/0.12/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	https://kmplayer.kde.org/
 COMMENT=	KDE frontend to mplayer
+LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1 AND gnu-fdl-v1.2
 
-BUILD_DEPENDS+=		automoc4>=0.9.87:../../devel/automoc4
-DEPENDS+=		mplayer>=1.0rc3:../../multimedia/mplayer
-DEPENDS+=		mencoder>=1.0rc3:../../multimedia/mencoder
+BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
+DEPENDS+=	kinit>=5.19.0:../../x11/kinit
+DEPENDS+=	mplayer>=1.0rc3:../../multimedia/mplayer
+DEPENDS+=	mencoder>=1.0rc3:../../multimedia/mencoder
 
-USE_TOOLS+=		msgfmt perl pkg-config
-USE_LANGUAGES=		c c++
+USE_TOOLS+=	msgfmt perl pkg-config
 
-LDFLAGS.DragonFly+=	-lgmodule-2.0
+SUBST_CLASSES+=		fix-moc
+SUBST_STAGE.fix-moc=	post-configure
+SUBST_MESSAGE.fix-moc=	Cleaning up MOC includes
+SUBST_FILES.fix-moc=	_KDE_build/src/CMakeFiles/*_autogen.dir/AutogenInfo.json
+SUBST_NOOP_OK.fix-moc=	yes
+SUBST_SED.fix-moc=	-e 's;"${PREFIX}/include",;;g'
 
-.include "../../x11/gtk2/buildlink3.mk"
+SUBST_CLASSES+=		xdg
+SUBST_STAGE.xdg=	pre-configure
+SUBST_MESSAGE.xdg=	Install via examples dir.
+SUBST_FILES.xdg=	src/CMakeLists.txt
+SUBST_SED.xdg=		-e 's:{CONFIG_INSTALL_DIR}:{KDE_INSTALL_XDG_EX_DIR}:'
+
+MAKE_DIRS+=	${PKG_SYSCONFDIR}/xdg
+CONF_FILES+=	${PREFIX}/share/examples/kde-xdg/kmplayerrc \
+		${PKG_SYSCONFDIR}/xdg/kmplayerrc
+
+.include "../../meta-pkgs/kde/applications.mk"
+
+.include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../multimedia/kmediaplayer/buildlink3.mk"
+.include "../../multimedia/phonon-qt5/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../meta-pkgs/kde4/kde4.mk"
-.include "../../multimedia/xine-lib/buildlink3.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/kdelibs4support/buildlink3.mk"
+.include "../../x11/xcb-util-cursor/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/kmplayer/PLIST b/multimedia/kmplayer/PLIST
index c65ddc6cfd9..dbda021da70 100644
--- a/multimedia/kmplayer/PLIST
+++ b/multimedia/kmplayer/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.22 2012/11/23 20:28:03 markd Exp $
+@comment $NetBSD: PLIST,v 1.23 2021/08/31 12:06:22 markd Exp $
 bin/kmplayer
 bin/knpplayer
 bin/kphononplayer
-lib/kde4/libkmplayerpart.so
-lib/libkdeinit4_kmplayer.so
+lib/libkdeinit5_kmplayer.so
 lib/libkmplayercommon.so
-share/applications/kde4/kmplayer.desktop
-share/doc/kde/HTML/en/kmplayer/common
-share/doc/kde/HTML/en/kmplayer/index.cache.bz2
-share/doc/kde/HTML/en/kmplayer/index.docbook
+qt5/plugins/kmplayerpart.so
+share/applications/kmplayer.desktop
+share/doc/HTML/en/kmplayer/index.cache.bz2
+share/doc/HTML/en/kmplayer/index.docbook
+share/examples/kde-xdg/kmplayerrc
 share/icons/hicolor/128x128/apps/kmplayer.png
 share/icons/hicolor/16x16/apps/kmplayer.png
 share/icons/hicolor/22x22/apps/kmplayer.png
@@ -16,20 +16,19 @@ share/icons/hicolor/32x32/apps/kmplayer.png
 share/icons/hicolor/48x48/apps/kmplayer.png
 share/icons/hicolor/64x64/apps/kmplayer.png
 share/icons/hicolor/scalable/apps/kmplayer.svgz
-share/kde/apps/kmplayer/blip-api.xsl
-share/kde/apps/kmplayer/bookmarks.xml
-share/kde/apps/kmplayer/find-media.sh
-share/kde/apps/kmplayer/generators/blip-tv.xml
-share/kde/apps/kmplayer/generators/find-media.xml
-share/kde/apps/kmplayer/generators/shoutcast.xml
-share/kde/apps/kmplayer/generators/youtube-query.xml
-share/kde/apps/kmplayer/kmplayerpartui.rc
-share/kde/apps/kmplayer/kmplayerui.rc
-share/kde/apps/kmplayer/pluginsinfo
-share/kde/apps/kmplayer/shoutcast.xsl
-share/kde/apps/kmplayer/youtube.xsl
-share/kde/config/kmplayerrc
-share/kde4/services/kmplayer_part.desktop
+share/kmplayer/blip-api.xsl
+share/kmplayer/bookmarks.xml
+share/kmplayer/find-media.sh
+share/kmplayer/generators/blip-tv.xml
+share/kmplayer/generators/find-media.xml
+share/kmplayer/generators/shoutcast.xml
+share/kmplayer/generators/youtube-query.xml
+share/kmplayer/pluginsinfo
+share/kmplayer/shoutcast.xsl
+share/kmplayer/youtube.xsl
+share/kservices5/kmplayer_part.desktop
+share/kxmlgui5/kmplayer/kmplayerpartui.rc
+share/kxmlgui5/kmplayer/kmplayerui.rc
 share/locale/bg/LC_MESSAGES/kmplayer.mo
 share/locale/bs/LC_MESSAGES/kmplayer.mo
 share/locale/ca/LC_MESSAGES/kmplayer.mo
diff --git a/multimedia/kmplayer/distinfo b/multimedia/kmplayer/distinfo
index 3a80039b66f..927f0d6401b 100644
--- a/multimedia/kmplayer/distinfo
+++ b/multimedia/kmplayer/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.26 2016/03/23 10:04:49 markd Exp $
+$NetBSD: distinfo,v 1.27 2021/08/31 12:06:22 markd Exp $
 
-SHA1 (kmplayer-0.11.3d.tar.bz2) = f43651d4252cf6d878b5b014c1e5e9b18b2e31c4
-RMD160 (kmplayer-0.11.3d.tar.bz2) = 39cf21c28c176697632d60b8f2993e78a9e3dd0f
-SHA512 (kmplayer-0.11.3d.tar.bz2) = c2f0fa1864eecd9a0bf3039639aad41bc36bc6ff8742a8e9714c6df72dd4ee63f80c36036a0582ee8464b48ce22eb96814600ddb199c61fda0b87cfd4c457797
-Size (kmplayer-0.11.3d.tar.bz2) = 573173 bytes
-SHA1 (patch-CMakeLists.txt) = e2dc0ffbddfc72c0c395056c66a26bc1555b2958
-SHA1 (patch-aa) = 85d6f4f17a2c8afff505298f62b3105979a9e9f1
-SHA1 (patch-ab) = 975524f4ef0163d47c452f16ab98016acebead09
-SHA1 (patch-src_CMakeLists.txt) = cafeb1b1869455068880443d767e0101906990d3
-SHA1 (patch-src_kmplayershared.h) = b314dc90f44fc5154dcfcb4fa889008d78b59980
+SHA1 (kmplayer-0.12.0b.tar.bz2) = c86d65dcdf94a4844c71515eb07bb702a99b7329
+RMD160 (kmplayer-0.12.0b.tar.bz2) = 070d85dc5c6fb86e16dfd1a7ece2a8a3ae16fac6
+SHA512 (kmplayer-0.12.0b.tar.bz2) = d34c496d0c24c6d5c1bb675b83fac60da5c9672e4076aed72bac2e9b333e88d031076e7e386ec7b61ae8ece88870f6187c61f483f425aa78edd1e443c7f2e882
+Size (kmplayer-0.12.0b.tar.bz2) = 599496 bytes
+SHA1 (patch-src_CMakeLists.txt) = 407d76078b00e172dc0f33bab7530ab7e6df6d8e
+SHA1 (patch-src_kmplayer.desktop) = 7750eecc3925890b7ce50e4f01f960ce13057e54
+SHA1 (patch-src_kmplayer__part.h) = 229debbc8db20a4bf1e6a896b778ab37a7ebe54b
+SHA1 (patch-src_npplayer.cpp) = 95a25760b43f4ebe4ec4b1a4030a561ece8c1fff
+SHA1 (patch-src_viewarea.cpp) = 3fb9ce6c6d3dcf065df7f609ebe1f9033e1d7d9b
diff --git a/multimedia/kmplayer/patches/patch-CMakeLists.txt b/multimedia/kmplayer/patches/patch-CMakeLists.txt
deleted file mode 100644
index e941fc7621c..00000000000
--- a/multimedia/kmplayer/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2016/03/23 10:04:49 markd Exp $
-
-Build with recent cmake
-
---- CMakeLists.txt.orig	2015-12-22 17:31:21.000000000 +0000
-+++ CMakeLists.txt
-@@ -1,3 +1,4 @@
-+cmake_minimum_required(VERSION 2.8.9)
- project(kmplayer)
- 
- cmake_policy(VERSION 2.6)
-@@ -57,6 +58,7 @@ if(NOT WIN32)
- 
- endif(NOT WIN32)
- 
-+include(CheckIncludeFiles)
- 
- check_include_files(stdint.h HAVE_STDINT_H)
- 
diff --git a/multimedia/kmplayer/patches/patch-aa b/multimedia/kmplayer/patches/patch-aa
deleted file mode 100644
index 7c40432a014..00000000000
--- a/multimedia/kmplayer/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2010/10/27 07:29:21 markd Exp $
-
---- src/mediaobject.cpp.orig	2010-10-02 19:47:03.000000000 +0000
-+++ src/mediaobject.cpp
-@@ -417,7 +417,7 @@ KDE_NO_EXPORT void MediaInfo::killWGet (
- /**
-  * Gets contents from url and puts it in m_data
-  */
--KDE_NO_EXPORT bool MediaInfo::wget (const QString &str, const QString &domain) {
-+bool MediaInfo::wget (const QString &str, const QString &domain) {
-     clearData ();
-     url = str;
- 
diff --git a/multimedia/kmplayer/patches/patch-ab b/multimedia/kmplayer/patches/patch-ab
deleted file mode 100644
index eb62dcb7d5b..00000000000
--- a/multimedia/kmplayer/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2010/04/10 04:09:22 markd Exp $
-
---- src/kmplayerplaylist.cpp.orig	2010-04-06 08:40:08.000000000 +0000
-+++ src/kmplayerplaylist.cpp
-@@ -367,7 +367,7 @@ void TreeNode<Node>::appendChild (Node *
- }
- 
- template <>
--KDE_NO_EXPORT void TreeNode<Node>::insertBefore (Node *c, Node *b) {
-+void TreeNode<Node>::insertBefore (Node *c, Node *b) {
-     ASSERT (!c->parentNode ());
-     static_cast <Node *> (this)->document()->m_tree_version++;
-     insertBeforeImpl (c, b);
diff --git a/multimedia/kmplayer/patches/patch-src_CMakeLists.txt b/multimedia/kmplayer/patches/patch-src_CMakeLists.txt
index 4fa0f98acd3..af0e7784019 100644
--- a/multimedia/kmplayer/patches/patch-src_CMakeLists.txt
+++ b/multimedia/kmplayer/patches/patch-src_CMakeLists.txt
@@ -1,15 +1,36 @@
-$NetBSD: patch-src_CMakeLists.txt,v 1.1 2016/03/23 10:04:49 markd Exp $
+$NetBSD: patch-src_CMakeLists.txt,v 1.2 2021/08/31 12:06:22 markd Exp $
 
-Build with recent cmake
+From 7dafda636033d23436ea72c45967af78f54d76fb Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 17 Apr 2018 12:07:04 +0200
+Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)
 
---- src/CMakeLists.txt.orig	2012-06-10 12:35:46.000000000 +0000
+Test Plan: Built fine with Qt 5.11_beta3.
+
+Reviewers: pino, vriezen
+
+Differential Revision: https://phabricator.kde.org/D12272
+---
+ src/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f675d9ae..57af1ed4 100644
+--- src/CMakeLists.txt
 +++ src/CMakeLists.txt
-@@ -13,7 +13,7 @@ IF (KMPLAYER_WITH_CAIRO)
-     MESSAGE("have cairo cflags:${optionalCFlags} ldflags:${optionalLinkFlags}")
- endif (KMPLAYER_WITH_CAIRO)
+@@ -161,9 +161,9 @@ qt5_add_dbus_adaptor(kphononplayer_SRCS org.kde.kmplayer.streamslave.xml
  
--add_definitions(-DQT3_SUPPORT -DKDE3_SUPPORT -DKMPLAYER_VERSION_STRING=\\"${KMPLAYER_VERSION_STRING}\\")
-+add_definitions(-DQT3_SUPPORT -DKDE3_SUPPORT -DKMPLAYER_VERSION_STRING="\\\"${KMPLAYER_VERSION_STRING}\\\"")
+ add_executable(kphononplayer ${kphononplayer_SRCS})
  
- ADD_DEFINITIONS(${CAIROCFlags})
+-qt5_use_modules(kphononplayer Core DBus Widgets X11Extras)
+-
+-target_link_libraries(kphononplayer Phonon::phonon4qt5 ${XCB_LIBRARIES})
++target_link_libraries(kphononplayer Phonon::phonon4qt5 ${XCB_LIBRARIES}
++    Qt5::Core Qt5::DBus Qt5::Widgets Qt5::X11Extras
++)
  
+ install(TARGETS kphononplayer ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+-- 
+GitLab
+
diff --git a/multimedia/kmplayer/patches/patch-src_kmplayer.desktop b/multimedia/kmplayer/patches/patch-src_kmplayer.desktop
new file mode 100644
index 00000000000..0d1b089eec3
--- /dev/null
+++ b/multimedia/kmplayer/patches/patch-src_kmplayer.desktop
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_kmplayer.desktop,v 1.1 2021/08/31 12:06:22 markd Exp $
+
+From 2126d76b8f16381e576de779b94b5b4555e562c2 Mon Sep 17 00:00:00 2001
+From: Luigi Toscano <luigi.toscano@tiscali.it>
+Date: Sat, 13 May 2017 21:13:43 +0200
+Subject: [PATCH] Fix .desktop: Qt5 apps accept qwindowtitle, not caption
+
+---
+ src/org.kde.kmplayer.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/org.kde.kmplayer.desktop b/src/org.kde.kmplayer.desktop
+index fcc5255d..2b5435cd 100644
+--- src/kmplayer.desktop
++++ src/kmplayer.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Type=Application
+-Exec=kmplayer -caption %c %i %U
++Exec=kmplayer -qwindowtitle %c %i %U
+ Icon=kmplayer
+ X-DocPath=kmplayer/index.html
+ Comment=KDE interface for MPlayer
+-- 
+GitLab
+
diff --git a/multimedia/kmplayer/patches/patch-src_kmplayer__part.h b/multimedia/kmplayer/patches/patch-src_kmplayer__part.h
new file mode 100644
index 00000000000..fba701a1b0d
--- /dev/null
+++ b/multimedia/kmplayer/patches/patch-src_kmplayer__part.h
@@ -0,0 +1,44 @@
+$NetBSD: patch-src_kmplayer__part.h,v 1.1 2021/08/31 12:06:22 markd Exp $
+
+From 3def65075c09af4961cd399e8e78ed78cca72e65 Mon Sep 17 00:00:00 2001
+From: Wolfgang Bauer <wbauer@tmo.at>
+Date: Wed, 11 Oct 2017 22:16:02 +0200
+Subject: [PATCH] Fix build with Qt 5.9
+
+Summary:
+moc 5.9 errors out when building:
+Error: Plugin Metadata file "" could not be opened: file to open is a directory
+
+Same issue and fix as https://phabricator.kde.org/D5392 for khtml.
+
+CCBUG: 377490
+
+Test Plan: builds fine now with Qt 5.9.0rc and also earlier versions.
+
+Reviewers: vriezen, pino
+
+Reviewed By: pino
+
+Subscribers: pino
+
+Differential Revision: https://phabricator.kde.org/D5985
+---
+ src/kmplayer_part.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kmplayer_part.h b/src/kmplayer_part.h
+index f90f85d1..0fddbaa1 100644
+--- src/kmplayer_part.h
++++ src/kmplayer_part.h
+@@ -36,7 +36,7 @@ namespace KMPlayer {
+ 
+ class KMPlayerFactory : public KPluginFactory {
+     Q_OBJECT
+-    Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory" FILE "")
++    Q_PLUGIN_METADATA(IID "org.kde.KPluginFactory")
+     Q_INTERFACES(KPluginFactory)
+ public:
+     KMPlayerFactory();
+-- 
+GitLab
+
diff --git a/multimedia/kmplayer/patches/patch-src_kmplayershared.h b/multimedia/kmplayer/patches/patch-src_kmplayershared.h
deleted file mode 100644
index 9e60a6cf46c..00000000000
--- a/multimedia/kmplayer/patches/patch-src_kmplayershared.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_kmplayershared.h,v 1.1 2012/12/25 21:06:31 joerg Exp $
-
---- src/kmplayershared.h.orig	2012-12-25 18:21:29.000000000 +0000
-+++ src/kmplayershared.h
-@@ -214,8 +214,8 @@ struct WeakPtr {
-     // operator bool () const { return data && !!data->ptr; }
-     bool operator == (const WeakPtr<T> & w) const { return data == w.data; }
-     bool operator == (const SharedPtr<T> & s) const { return data == s.data; }
--    bool operator == (const T * t) const { return (!t && !data) || (data && data.ptr == t); }
--    bool operator == (T * t) const { return (!t && !data) || (data && data.ptr == t); }
-+    bool operator == (const T * t) const { return (!t && !data) || (data && data->ptr == t); }
-+    bool operator == (T * t) const { return (!t && !data) || (data && data->ptr == t); }
-     bool operator != (const WeakPtr<T> & w) const { return data != w.data; }
-     bool operator != (const SharedPtr<T> & s) const { return data != s.data; }
-     operator T * () { return data ? data->ptr : 0L; }
diff --git a/multimedia/kmplayer/patches/patch-src_npplayer.cpp b/multimedia/kmplayer/patches/patch-src_npplayer.cpp
new file mode 100644
index 00000000000..9f007e256c2
--- /dev/null
+++ b/multimedia/kmplayer/patches/patch-src_npplayer.cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_npplayer.cpp,v 1.1 2021/08/31 12:06:22 markd Exp $
+
+fix build against glib 2.68.3
+
+--- src/npplayer.cpp.orig	2016-09-24 15:29:58.000000000 +0000
++++ src/npplayer.cpp
+@@ -21,6 +21,7 @@
+ http://devedge-temp.mozilla.org/library/manuals/2002/plugin/1.0/
+ http://dbus.freedesktop.org/doc/dbus/libdbus-tutorial.html
+ */
++#include <glib.h>
+ extern "C" {
+ #include <unistd.h>
+ #include <string.h>
+@@ -32,7 +33,6 @@ extern "C" {
+ #include <fcntl.h>
+ 
+ #include <glib/gprintf.h>
+-#include <glib.h>
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+ 
diff --git a/multimedia/kmplayer/patches/patch-src_viewarea.cpp b/multimedia/kmplayer/patches/patch-src_viewarea.cpp
new file mode 100644
index 00000000000..1953efb12a2
--- /dev/null
+++ b/multimedia/kmplayer/patches/patch-src_viewarea.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_viewarea.cpp,v 1.1 2021/08/31 12:06:22 markd Exp $
+
+from FreeBSD port
+
+--- src/viewarea.cpp.orig	2016-09-24 15:29:58.000000000 +0000
++++ src/viewarea.cpp
+@@ -2535,7 +2535,7 @@ void VideoOutput::useIndirectWidget (boo
+             if (!m_plain_window) {
+                 xcb_screen_t* scr = m_view->viewArea()->d->screen_of_display(connection, QX11Info::appScreen());
+                 m_plain_window = xcb_generate_id(connection);
+-                uint32_t values[] = { scr->black_pixel, m_input_mask };
++                uint32_t values[] = { scr->black_pixel, static_cast<uint32_t>(m_input_mask) };
+ #if QT_VERSION >= 0x050600
+                 int devicew = (int)(width() * devicePixelRatioF());
+                 int deviceh = (int)(height() * devicePixelRatioF());