QMPlay2: bump version

2026-04-22 19:50:05 +02:00 · 2019-09-01 23:31:04 +10:00
parent 555a728d56
commit 710c5223c4
4 changed files with 175 additions and 221 deletions
--- a/media-video/qmplay2/additional-files/MediaKit.png
+++ b/media-video/qmplay2/additional-files/MediaKit.png
--- a/media-video/qmplay2/additional-files/qmplay2.rdef.in
+++ b/media-video/qmplay2/additional-files/qmplay2.rdef.in
@@ -22,17 +22,8 @@ resource file_types message {
 };

 resource vector_icon {
-	$"6E63696602012C165AF20314D77803000DB4D0B47BB4D0B47BB5A4B493B717B5"
-	$"6DB659B515BCBFB846C814BDF0C26CBB17C8CEBE53CA3FBF23C99BBE9CCA9ABF"
-	$"6BCA35C053CA92C00FC985C0E0C7E7C196C8ADC12DC276C452B78EC9BFBD01C7"
-	$"06B6C1CA20B523CAD9B601CAA4B4ACCAF9B426CA1EB421CA9DB41FC965B46DC7"
-	$"FBB44EC8B0B561C2E0B4A9B879B57FBD9BB485B770B428B55FB438B66BB41CB4"
-	$"F6B4D0B47BB466B48CB4D0B47B0209B627B6EDB6A3B714B640B838B6A7BACAB6"
-	$"89B97FB6F3BD1FB6E1C1D3B6F0BF7BB6D1C408B623C864B659C633B71AC816B8"
-	$"DBC716B7F4C787BC65C561C369C1D7BFF0C3ADC4D7C11DC7BDBFBFC64EC075C7"
-	$"1DBF3FC5A7BE96C65EBEEFC0EEBC47B790B783BC40B9E3B71CB7480209B627B6"
-	$"EDB640B838B6A3B714B790B783B71CB748BC40B9E3C5A7BE96C0EEBC47C65EBE"
-	$"EFC7BDBFBFC71DBF3FC64EC075C369C1D7C4D7C11DBFF0C3ADB8DBC716BC65C5"
-	$"61B7F4C787B623C864B71AC816B659C633B6E1C1D3B6D1C408B6F0BF7BB6A7BA"
-	$"CAB6F3BD1FB689B97F020A00020001000A01010200"
+	$"6E63696604020006023C72AB3B7EB0BC1B2B3CF34D49AD3B495A8E0058FF05FF"
+	$"049726032D8303050104017A030404AE29594032413240325D4853550604EA28"
+	$"284F4D29582C412C4B2C370A042828312356484F4D040A020201021001158402"
+	$"040A030100000A000101000A01010200"
 };
--- a/media-video/qmplay2/patches/qmplay2-19.08.27.patchset
+++ b/media-video/qmplay2/patches/qmplay2-19.08.27.patchset
@@ -1,74 +1,158 @@
-From afd157fc41e7fc192706168c41d41610f5e16892 Mon Sep 17 00:00:00 2001
+From 88801511a1276e4d284b0fe32be9ec8c5855f06a Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Mon, 9 Apr 2018 13:08:13 +0300
+Date: Sun, 1 Sep 2019 22:52:49 +1000
 Subject: Add haiku support


+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f6710ef..11d985a 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -36,6 +36,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ elseif(ANDROID)
+     set(DEFAULT_ALSA OFF)
+     set(DEFAULT_PORTAUDIO OFF)
+elseif(HAIKU)
+    set(DEFAULT_ALSA OFF)
+    set(DEFAULT_PORTAUDIO OFF)
+ else()
+     set(DEFAULT_ALSA OFF)
+     set(DEFAULT_PORTAUDIO ON)
+@@ -55,7 +58,7 @@ if(WIN32)
+     add_feature_info(CMD USE_CMD "Show CMD when running QMPlay2")
+ endif()
+ 
+-if(NOT WIN32 AND NOT APPLE AND NOT ANDROID)
+if(NOT WIN32 AND NOT APPLE AND NOT ANDROID AND NOT HAIKU)
+     option(USE_FREEDESKTOP_NOTIFICATIONS "Use Freedesktop notifications" ON)
+     add_feature_info("Freedesktop notifications" USE_FREEDESKTOP_NOTIFICATIONS "Use Freedesktop notifications")
+ endif()
+@@ -84,7 +87,7 @@ add_feature_info(Modplug USE_MODPLUG "Build with Modplug module")
+ option(USE_EXTENSIONS "Build with Extensions module" ON)
+ add_feature_info(Extensions USE_EXTENSIONS "Build with Extensions module")
+ 
+-if(USE_EXTENSIONS AND NOT WIN32 AND NOT APPLE AND NOT ANDROID)
+if(USE_EXTENSIONS AND NOT WIN32 AND NOT APPLE AND NOT ANDROID AND NOT HAIKU)
+     option(USE_MPRIS2 "Build Extensions with MPRIS2 support" ON)
+     add_feature_info(MPRIS2 USE_MPRIS2 "Build Extensions with MPRIS2 support")
+ endif()
 diff --git a/src/gui/Main.cpp b/src/gui/Main.cpp
-index 9765360..dddd5df 100644
+index 9c64652..cbe7316 100644
 --- a/src/gui/Main.cpp
 +++ b/src/gui/Main.cpp
-@@ -512,6 +512,9 @@ int main(int argc, char *argv[])
- 	signal(SIGTERM, signal_handler);
- 	atexit(exitProcedure);
+@@ -599,6 +599,10 @@ int main(int argc, char *argv[])
+     checkForEGL();
+ #endif
 
 +#ifdef Q_OS_HAIKU
 +	setenv("HOME", "/boot/home", 1);
 +#endif
- 	QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
+
+     QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 #ifndef Q_OS_WIN
- 	QGuiApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
-@@ -582,7 +585,7 @@ int main(int argc, char *argv[])
- 	}
- 	if (!cmakeBuildFound)
- 	{
+     QGuiApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
+@@ -684,7 +688,7 @@ int main(int argc, char *argv[])
+     }
+     if (!cmakeBuildFound)
+     {
 -#if !defined Q_OS_WIN && !defined Q_OS_MACOS && !defined Q_OS_ANDROID
 +#if !defined Q_OS_WIN && !defined Q_OS_MACOS && !defined Q_OS_ANDROID && !defined Q_OS_HAIKU
- 		sharePath = QCoreApplication::applicationDirPath() + "/../share/qmplay2";
- 		libPath = QMPlay2CoreClass::getLibDir();
- 		if (libPath.isEmpty() || !QDir(libPath).exists("qmplay2"))
+         sharePath = QCoreApplication::applicationDirPath() + "/../share/qmplay2";
+         libPath = QMPlay2CoreClass::getLibDir();
+         if (libPath.isEmpty() || !QDir(libPath).exists("qmplay2"))
+@@ -902,5 +906,9 @@ int main(int argc, char *argv[])
+     if (canDeleteApp)
+ #endif
+         delete qApp;
+
+#ifdef Q_OS_HAIKU
+	kill(::getpid(), SIGKILL);
+#endif
+     return 0;
+ }
 diff --git a/src/gui/MainWidget.cpp b/src/gui/MainWidget.cpp
-index 6f4e6bf..a514043 100644
+index 139dd2a..c9804c5 100644
 --- a/src/gui/MainWidget.cpp
 +++ b/src/gui/MainWidget.cpp
@@ -145,7 +145,7 @@ MainWidget::MainWidget(QList<QPair<QString, QString>> &arguments) :
- 		setIconSize({22, 22});
+         setIconSize({22, 22});
 
- 	SettingsWidget::InitSettings();
+     SettingsWidget::InitSettings();
 -#ifndef Q_OS_ANDROID
 +#if !defined Q_OS_ANDROID && !defined Q_OS_HAIKU
- 	settings.init("MainWidget/WidgetsLocked", false);
+     settings.init("MainWidget/WidgetsLocked", false);
 #else
- 	settings.init("MainWidget/WidgetsLocked", true);
-diff --git a/src/gui/gui.pro b/src/gui/gui.pro
-index dea774c..f001534 100644
--- a/src/gui/gui.pro
-+++ b/src/gui/gui.pro
-@@ -12,7 +12,7 @@ TARGET = QMPlay2
- 
- QMAKE_LIBDIR += ../../app/lib
- DESTDIR = ../../app/bin
-!android: LIBS += -lrt #For glibc < 2.17
-+!android:!haiku: LIBS += -lrt #For glibc < 2.17
- LIBS += -lqmplay2
- 
- RESOURCES += resources.qrc
-diff --git a/src/modules/FFmpeg/FFmpeg.pro b/src/modules/FFmpeg/FFmpeg.pro
-index 8a4fadc..cb82d5f 100644
--- a/src/modules/FFmpeg/FFmpeg.pro
-+++ b/src/modules/FFmpeg/FFmpeg.pro
-@@ -27,7 +27,7 @@ DEPENDPATH += . ../../qmplay2/headers
- HEADERS += FFmpeg.hpp FFDemux.hpp FFDec.hpp FFDecSW.hpp FFReader.hpp FFCommon.hpp FormatContext.hpp OggHelper.hpp OpenThr.hpp
- SOURCES += FFmpeg.cpp FFDemux.cpp FFDec.cpp FFDecSW.cpp FFReader.cpp FFCommon.cpp FormatContext.cpp OggHelper.cpp OpenThr.cpp
- 
-unix:!android {
-+unix:!android:!haiku {
- 	PKGCONFIG += libavdevice
- 	DEFINES   += QMPlay2_libavdevice
+     settings.init("MainWidget/WidgetsLocked", true);
+diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
+index 449882a..17b3da6 100644
+--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
+@@ -7,6 +7,9 @@ if(WIN32)
+ elseif(APPLE)
+     set(MODULES_INSTALL_PATH "${CMAKE_INSTALL_LIBDIR}/modules")
+     set(QMPLAY2_MODULE SHARED) # otherwise CMake uses ".so" extension
+elseif(HAIKU)
+    set(MODULES_INSTALL_PATH "modules")
+    set(QMPLAY2_MODULE MODULE)
+ else()
+     set(MODULES_INSTALL_PATH "${CMAKE_INSTALL_LIBDIR}/qmplay2/modules")
+     set(QMPLAY2_MODULE MODULE)
+@@ -60,6 +63,10 @@ if(USE_PULSEAUDIO)
+     add_subdirectory(PulseAudio)
+ endif()
 
+if(HAIKU)
+    add_subdirectory(MediaKit)
+endif()
+
+ if(USE_XVIDEO)
+     add_subdirectory(XVideo)
+ endif()
+diff --git a/src/modules/MediaKit/CMakeLists.txt b/src/modules/MediaKit/CMakeLists.txt
+new file mode 100644
+index 0000000..f94e365
+--- /dev/null
+++ b/src/modules/MediaKit/CMakeLists.txt
+@@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 3.1)
+project(MediaKit)
+
+set(MediaKit_HDR
+    MediaKit.hpp
+    MediaKitWriter.hpp
+    RingBuffer.hpp
+    SndPlayer.hpp
+)
+
+set(MediaKit_SRC
+    MediaKit.cpp
+    MediaKitWriter.cpp
+    RingBuffer.cpp
+    SndPlayer.cpp
+)
+
+set(MediaKit_RESOURCES
+    icon.qrc
+)
+
+include_directories(../../qmplay2/headers)
+
+add_library(${PROJECT_NAME} ${QMPLAY2_MODULE}
+    ${MediaKit_HDR}
+    ${MediaKit_SRC}
+    ${MediaKit_RESOURCES}
+)
+
+target_link_libraries(${PROJECT_NAME}
+    be
+    media
+    libqmplay2
+)
+
+install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${MODULES_INSTALL_PATH})
 diff --git a/src/modules/MediaKit/MediaKit.cpp b/src/modules/MediaKit/MediaKit.cpp
 new file mode 100644
-index 0000000..16e99c4
+index 0000000..cc9998b
 --- /dev/null
 +++ b/src/modules/MediaKit/MediaKit.cpp
@@ -0,0 +1,65 @@
@@ -115,15 +199,15 @@ index 0000000..16e99c4
 +ModuleSettingsWidget::ModuleSettingsWidget( Module &module ) :
 +	Module::SettingsWidget( module )
 +{
-+	enabledB = new QCheckBox( tr( "Włączony" ) );
+	enabledB = new QCheckBox( tr( "Enabled" ) );
 +	enabledB->setChecked( sets().getBool( "WriterEnabled" ) );
 +
-+	QLabel *delayL = new QLabel( tr( "Opóźnienie" ) + ": " );
+	QLabel *delayL = new QLabel( tr( "Delay" ) + ": " );
 +
 +	delayB = new QDoubleSpinBox;
 +	delayB->setRange( 0.01, 1.0 );
 +	delayB->setSingleStep( 0.01 );
-+	delayB->setSuffix( " " + tr( "sek" ) );
+	delayB->setSuffix( " " + tr( "sec" ) );
 +	delayB->setValue( sets().getDouble( "Delay" ) );
 +
 +	QGridLayout *layout = new QGridLayout( this );
@@ -139,10 +223,12 @@ index 0000000..16e99c4
 +}
 diff --git a/src/modules/MediaKit/MediaKit.hpp b/src/modules/MediaKit/MediaKit.hpp
 new file mode 100644
-index 0000000..16920f6
+index 0000000..ed89e32
 --- /dev/null
 +++ b/src/modules/MediaKit/MediaKit.hpp
-@@ -0,0 +1,31 @@
+@@ -0,0 +1,33 @@
+#pragma once
+
 +#include <Module.hpp>
 +
 +class MediaKit : public Module
@@ -174,36 +260,9 @@ index 0000000..16920f6
 +	QCheckBox *enabledB;
 +	QDoubleSpinBox *delayB;
 +};
-diff --git a/src/modules/MediaKit/MediaKit.pro b/src/modules/MediaKit/MediaKit.pro
-new file mode 100644
-index 0000000..bf0c648
--- /dev/null
-+++ b/src/modules/MediaKit/MediaKit.pro
-@@ -0,0 +1,21 @@
-+TEMPLATE = lib
-+CONFIG += plugin
-+
-+QT += widgets
-+
-+DESTDIR = ../../../app/lib/qmplay2/modules
-+
-+QMAKE_LIBDIR += ../../../app/lib
-+LIBS += -lqmplay2 -lmedia -lbe
-+
-+OBJECTS_DIR = build/obj
-+MOC_DIR = build/moc
-+RCC_DIR = build/rcc
-+
-+RESOURCES += icon.qrc
-+
-+INCLUDEPATH += . ../../qmplay2/headers
-+DEPENDPATH += . ../../qmplay2/headers
-+
-+HEADERS += MediaKit.hpp MediaKitoWriter.hpp SndPlayer.hpp RingBuffer.hpp
-+SOURCES += MediaKit.cpp MediaKitWriter.cpp SndPlayer.cpp RingBuffer.cpp
 diff --git a/src/modules/MediaKit/MediaKitWriter.cpp b/src/modules/MediaKit/MediaKitWriter.cpp
 new file mode 100644
-index 0000000..f8fad50
+index 0000000..a86e584
 --- /dev/null
 +++ b/src/modules/MediaKit/MediaKitWriter.cpp
@@ -0,0 +1,85 @@
@@ -259,7 +318,7 @@ index 0000000..f8fad50
 +		if ( !err )
 +			modParam( "delay", player.delay );
 +		else
-+			QMPlay2Core.logError( "MediaKitWriter :: " + tr ( "Nie można otworzyć strumienia wyjścia dźwięku" ) );
+			QMPlay2Core.logError( "MediaKitWriter :: " + tr ( "Cannot open audio output stream" ) );
 +	}
 +
 +	return readyWrite();
@@ -272,7 +331,7 @@ index 0000000..f8fad50
 +	err = !player.write( arr );
 +	if ( err )
 +	{
-+		QMPlay2Core.logError( "MediaKitWriter :: " + tr ( "Błąd podczas odtwarzania" ) );
+		QMPlay2Core.logError( "MediaKitWriter :: " + tr ( "Playback error" ) );
 +		return 0;
 +	}
 +
@@ -673,128 +732,31 @@ index 0000000..24b4ebd
 +<RCC><qresource>
 +	<file alias="MediaKit">MediaKit.png</file>
 +</qresource></RCC>
-diff --git a/src/modules/modules.pro b/src/modules/modules.pro
-index 6e853ea..d0f6c21 100644
--- a/src/modules/modules.pro
-+++ b/src/modules/modules.pro
-@@ -1,7 +1,7 @@
- TEMPLATE = subdirs
- SUBDIRS = FFmpeg Inputs Modplug Playlists Subtitles QPainter Extensions Visualizations AudioFilters VideoFilters CUVID
- 
-!contains(QT_CONFIG, opengles1): SUBDIRS += OpenGL2
-+!contains(QT_CONFIG, opengles1):!haiku: SUBDIRS += OpenGL2
- else: message("OpenGL doesn't work with OpenGL|ES 1.0")
- 
- !android: SUBDIRS += AudioCD Notify
-@@ -10,11 +10,14 @@ linux*: {
- 	!android: SUBDIRS += ALSA
- 	else: SUBDIRS += OpenSLES
- }
-+haiku {
-+	SUBDIRS += MediaKit
-+}
- else {
- 	SUBDIRS += PortAudio
- }
- 
-unix:!android {
-+unix:!android:!haiku {
- 	SUBDIRS += XVideo
- 
- 	packagesExist(libpulse-simple):	SUBDIRS += PulseAudio
 diff --git a/src/qmplay2/QMPlay2Core.cpp b/src/qmplay2/QMPlay2Core.cpp
-index 0216942..ec10a86 100644
+index 55f775d..044ea1f 100644
 --- a/src/qmplay2/QMPlay2Core.cpp
 +++ b/src/qmplay2/QMPlay2Core.cpp
-@@ -189,7 +189,7 @@ void QMPlay2CoreClass::init(bool loadModules, bool modulesInSubdirs, const QStri
- 		settingsDir = QCoreApplication::applicationDirPath() + "/settings/";
- 	else
- 	{
+@@ -201,7 +201,7 @@ void QMPlay2CoreClass::init(bool loadModules, bool modulesInSubdirs, const QStri
+         settingsDir = QCoreApplication::applicationDirPath() + "/settings/";
+     else
+     {
 -#if defined(Q_OS_WIN)
 +#if defined(Q_OS_WIN) || defined(Q_OS_HAIKU)
- 		settingsDir = QFileInfo(QSettings(QSettings::IniFormat, QSettings::UserScope, QString()).fileName()).absolutePath() + "/QMPlay2/";
+         settingsDir = QFileInfo(QSettings(QSettings::IniFormat, QSettings::UserScope, QString()).fileName()).absolutePath() + "/QMPlay2/";
 #elif defined(Q_OS_MACOS)
- 		settingsDir = Functions::cleanPath(QStandardPaths::standardLocations(QStandardPaths::DataLocation).value(0, settingsDir));
-@@ -386,6 +386,11 @@ QStringList QMPlay2CoreClass::getModules(const QString &type, int typeLen) const
+         settingsDir = Functions::cleanPath(QStandardPaths::standardLocations(QStandardPaths::DataLocation).value(0, settingsDir));
+@@ -392,6 +392,11 @@ QStringList QMPlay2CoreClass::getModules(const QString &type, int typeLen) const
 #elif defined Q_OS_WIN
- 	if (type == "videoWriters")
- 		defaultModules << "OpenGL 2" << "DirectDraw";
+     if (type == "videoWriters")
+         defaultModules << "OpenGL 2" << "DirectDraw";
 +#elif defined Q_OS_HAIKU
 +	if ( type == "videoWriters" )
 +		defaultModules << "QPainter";
 +	else if ( type == "audioWriters" )
 +		defaultModules << "MediaKit";
 #endif
- 	if (type == "decoders")
- 		defaultModules << "FFmpeg Decoder";
+     if (type == "decoders")
+         defaultModules << "FFmpeg Decoder";
 -- 
-2.19.1
-
-
-From ed1d574b0369ac6c7f3d82f161c94c284d9b64e4 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Wed, 21 Nov 2018 23:07:39 +1000
-Subject: Disable DBUS for Haiku
-
-
-diff --git a/src/qmplay2/qmplay2.pro b/src/qmplay2/qmplay2.pro
-index b23451d..0ea5840 100644
--- a/src/qmplay2/qmplay2.pro
-+++ b/src/qmplay2/qmplay2.pro
-@@ -31,7 +31,7 @@ DEPENDPATH  += . headers
- HEADERS += headers/QMPlay2Core.hpp headers/Functions.hpp headers/Settings.hpp headers/Module.hpp headers/ModuleParams.hpp headers/ModuleCommon.hpp headers/Playlist.hpp headers/Reader.hpp headers/Demuxer.hpp headers/Decoder.hpp headers/VideoFilters.hpp headers/VideoFilter.hpp headers/DeintFilter.hpp headers/AudioFilter.hpp headers/Writer.hpp headers/QMPlay2Extensions.hpp headers/LineEdit.hpp headers/Slider.hpp headers/QMPlay2OSD.hpp headers/InDockW.hpp headers/LibASS.hpp headers/ColorButton.hpp headers/ImgScaler.hpp headers/SndResampler.hpp headers/VideoWriter.hpp headers/SubsDec.hpp headers/ByteArray.hpp headers/TimeStamp.hpp headers/Packet.hpp headers/VideoFrame.hpp headers/StreamInfo.hpp headers/DockWidget.hpp headers/IOController.hpp headers/ChapterProgramInfo.hpp headers/PacketBuffer.hpp headers/Buffer.hpp headers/NetworkAccess.hpp headers/YouTubeDL.hpp headers/Notifies.hpp headers/NotifiesTray.hpp headers/Version.hpp headers/IPC.hpp headers/MkvMuxer.hpp PixelFormats.hpp headers/CPU.hpp headers/PixelFormats.hpp headers/HWAccelInterface.hpp headers/VideoAdjustment.hpp headers/CppUtils.hpp
- SOURCES +=         QMPlay2Core.cpp         Functions.cpp         Settings.cpp         Module.cpp         ModuleParams.cpp         ModuleCommon.cpp         Playlist.cpp         Reader.cpp         Demuxer.cpp         Decoder.cpp         VideoFilters.cpp         VideoFilter.cpp         DeintFilter.cpp         AudioFilter.cpp         Writer.cpp         QMPlay2Extensions.cpp         LineEdit.cpp         Slider.cpp         QMPlay2OSD.cpp         InDockW.cpp         LibASS.cpp         ColorButton.cpp         ImgScaler.cpp         SndResampler.cpp         VideoWriter.cpp         SubsDec.cpp                                                                        VideoFrame.cpp         StreamInfo.cpp         DockWidget.cpp                                                                 PacketBuffer.cpp         Buffer.cpp         NetworkAccess.cpp         YouTubeDL.cpp         Notifies.cpp         NotifiesTray.cpp         Version.cpp    IPC_Unix.cpp         MkvMuxer.cpp PixelFormats.cpp
- 
-unix:!android {
-+unix:!android:!haiku {
- 	QT += dbus
- 	DBUS_INTERFACES += org.freedesktop.Notifications.xml
- 	HEADERS += headers/NotifiesFreedesktop.hpp
-- 
-2.19.1
-
-
-From 64fd5eb0278661d1c6bd617b0400b23d7df5e5cb Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Tue, 26 Feb 2019 19:40:29 +1000
-Subject: Ugly hack for crash on exit
-
-
-diff --git a/src/gui/Main.cpp b/src/gui/Main.cpp
-index dddd5df..c3cbed9 100644
--- a/src/gui/Main.cpp
-+++ b/src/gui/Main.cpp
-@@ -803,5 +803,9 @@ int main(int argc, char *argv[])
- 	if (canDeleteApp)
- #endif
- 		delete qApp;
-+
-+#ifdef Q_OS_HAIKU
-+	kill(::getpid(), SIGKILL);
-+#endif
- 	return 0;
- }
-- 
-2.19.1
-
-
-From 8ec5b85a507b03d1b938efc28ce989aed2968abc Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Tue, 26 Feb 2019 19:40:45 +1000
-Subject: Fix typo
-
-
-diff --git a/src/modules/MediaKit/MediaKit.pro b/src/modules/MediaKit/MediaKit.pro
-index bf0c648..a1b39f0 100644
--- a/src/modules/MediaKit/MediaKit.pro
-+++ b/src/modules/MediaKit/MediaKit.pro
-@@ -17,5 +17,5 @@ RESOURCES += icon.qrc
- INCLUDEPATH += . ../../qmplay2/headers
- DEPENDPATH += . ../../qmplay2/headers
- 
-HEADERS += MediaKit.hpp MediaKitoWriter.hpp SndPlayer.hpp RingBuffer.hpp
-+HEADERS += MediaKit.hpp MediaKitWriter.hpp SndPlayer.hpp RingBuffer.hpp
- SOURCES += MediaKit.cpp MediaKitWriter.cpp SndPlayer.cpp RingBuffer.cpp
-- 
-2.19.1
+2.23.0

--- a/media-video/qmplay2/qmplay2-19.08.27.recipe
+++ b/media-video/qmplay2/qmplay2-19.08.27.recipe
@@ -4,11 +4,11 @@ supported by ffmpeg, libmodplug (including J2B and SFX). It also supports \
 Audio CD, raw files and Rayman 2 music. It contains YouTube and Prostoplee\
 r browser."
 HOMEPAGE="http://zaps166.sourceforge.net"
-COPYRIGHT="2010-2018 Błażej Szczygieł"
+COPYRIGHT="2010-2019 Błażej Szczygieł"
 LICENSE="GNU GPL v3"
-REVISION="4"
+REVISION="1"
 SOURCE_URI="https://github.com/zaps166/QMPlay2/archive/$portVersion.tar.gz"
-CHECKSUM_SHA256="ba9e594485e531f6a3fcd6fb579847daac61003b61463a24ae60381c61d4ea56"
+CHECKSUM_SHA256="7a6a06ad833fd32b07b3837198191ff98a1f28a5e9ad85008faea196de293c9f"
 SOURCE_DIR="QMPlay2-$portVersion"
 PATCHES="qmplay2-$portVersion.patchset"
 ADDITIONAL_FILES="
@@ -62,21 +62,23 @@ BUILD_REQUIRES="
 	devel:libtag$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:qmake$secondaryArchSuffix >= 5
 	cmd:lrelease$secondaryArchSuffix >= 5
 	"

 BUILD()
 {
 	cp $portDir/additional-files/MediaKit.png src/modules/MediaKit
-	qmake .
-	make $jobArgs
-
-	cd lang
-	lrelease *.ts
+	mkdir -p build
+	cd build
+	cmake .. \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=$appsDir/QMPlay2 \
+		-DUSE_OPENGL2=OFF
+	make -j4
 }

 INSTALL()
@@ -92,17 +94,16 @@ INSTALL()
 		-e "s|@MIDDLE@|$MIDDLE|" \
 		-e "s|@MINOR@|$MINOR|" \
 		-e "s|@LONG_INFO@|$LONG_INFO|" \
-		$portDir/additional-files/qmplay2.rdef.in > qmplay2.rdef
+		$portDir/additional-files/qmplay2.rdef.in > build/qmplay2.rdef

-	addResourcesToBinaries qmplay2.rdef app/bin/QMPlay2
+	cd build
+	make install

-	mkdir -p $appsDir/QMPlay2/lang
+	mv $appsDir/QMPlay2/share/qmplay2/lang $appsDir/QMPlay2
+	mv $appsDir/QMPlay2/bin/QMPlay2 $appsDir/QMPlay2/QMPlay2
+	rm -rf $appsDir/QMPlay2/{share,bin,include}

-	cp lang/*.qm $appsDir/QMPlay2/lang
-
-	cp app/bin/QMPlay2 $appsDir/QMPlay2
-	cp -R app/lib $appsDir/QMPlay2
-	mv $appsDir/QMPlay2/lib/qmplay2/modules $appsDir/QMPlay2/
+	addResourcesToBinaries qmplay2.rdef $appsDir/QMPlay2/QMPlay2

 	addAppDeskbarSymlink $appsDir/QMPlay2/QMPlay2
 }