diff --git a/media-video/qmplay2/patches/qmplay2-20.12.07.patchset b/media-video/qmplay2/patches/qmplay2-20.12.16.patchset similarity index 96% rename from media-video/qmplay2/patches/qmplay2-20.12.07.patchset rename to media-video/qmplay2/patches/qmplay2-20.12.16.patchset index 23ea509c7..a63bf6db2 100644 --- a/media-video/qmplay2/patches/qmplay2-20.12.07.patchset +++ b/media-video/qmplay2/patches/qmplay2-20.12.16.patchset @@ -1,14 +1,14 @@ -From b421b98416a2dbb4cea7c3b89c65b2ff66efc752 Mon Sep 17 00:00:00 2001 +From e20f83e18beb2fc6ac971acabb7a9c036e86f134 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 3 May 2020 11:29:15 +1000 +Date: Sun, 20 Dec 2020 00:38:30 +1000 Subject: Add haiku support diff --git a/CMakeLists.txt b/CMakeLists.txt -index a786eb5..21cd6a7 100644 +index dc090a9..d634dd5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -67,6 +67,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") +@@ -81,6 +81,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") elseif(ANDROID) set(DEFAULT_ALSA OFF) set(DEFAULT_PORTAUDIO OFF) @@ -18,7 +18,7 @@ index a786eb5..21cd6a7 100644 else() set(DEFAULT_ALSA OFF) set(DEFAULT_PORTAUDIO ON) -@@ -108,7 +111,7 @@ endif() +@@ -125,7 +128,7 @@ endif() option(USE_GLSLC "Compile Vulkan shaders" OFF) add_feature_info(GLSLC USE_GLSLC "Compile Vulkan shaders") @@ -27,9 +27,9 @@ index a786eb5..21cd6a7 100644 option(USE_FREEDESKTOP_NOTIFICATIONS "Use Freedesktop notifications" ON) add_feature_info("Freedesktop notifications" USE_FREEDESKTOP_NOTIFICATIONS "Use Freedesktop notifications") endif() -@@ -134,7 +137,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") +@@ -166,7 +169,7 @@ else() + set(USE_YOUTUBEDL OFF) + endif() -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) @@ -71,10 +71,10 @@ index a9e17fc..8873744 100644 return 0; } diff --git a/src/gui/MainWidget.cpp b/src/gui/MainWidget.cpp -index 9e0a736..8f5fb72 100644 +index 2fd0a65..73e4512 100644 --- a/src/gui/MainWidget.cpp +++ b/src/gui/MainWidget.cpp -@@ -148,7 +148,7 @@ MainWidget::MainWidget(QList> &arguments) : +@@ -150,7 +150,7 @@ MainWidget::MainWidget(QList> &arguments) setIconSize({22, 22}); SettingsWidget::InitSettings(); @@ -733,7 +733,7 @@ index 0000000..24b4ebd + MediaKit.png + diff --git a/src/qmplay2/QMPlay2Core.cpp b/src/qmplay2/QMPlay2Core.cpp -index 092dcde..bed9ff7 100644 +index f459263..07c4e69 100644 --- a/src/qmplay2/QMPlay2Core.cpp +++ b/src/qmplay2/QMPlay2Core.cpp @@ -204,7 +204,7 @@ void QMPlay2CoreClass::init(bool loadModules, bool modulesInSubdirs, const QStri @@ -745,7 +745,7 @@ index 092dcde..bed9ff7 100644 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)); -@@ -460,6 +460,11 @@ QStringList QMPlay2CoreClass::getModules(const QString &type, int typeLen) const +@@ -464,6 +464,11 @@ QStringList QMPlay2CoreClass::getModules(const QString &type, int typeLen) const #elif defined Q_OS_WIN if (type == "videoWriters") defaultModules << "OpenGL 2" << "DirectDraw"; diff --git a/media-video/qmplay2/qmplay2-20.12.07.recipe b/media-video/qmplay2/qmplay2-20.12.16.recipe similarity index 97% rename from media-video/qmplay2/qmplay2-20.12.07.recipe rename to media-video/qmplay2/qmplay2-20.12.16.recipe index c52d48a62..5755599e1 100644 --- a/media-video/qmplay2/qmplay2-20.12.07.recipe +++ b/media-video/qmplay2/qmplay2-20.12.16.recipe @@ -8,7 +8,7 @@ COPYRIGHT="2010-2020 Błażej Szczygieł" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/zaps166/QMPlay2/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="5204d5611053fef6d6393ab812429819cbe9f17b40251e872126d9bbe14cdd16" +CHECKSUM_SHA256="7772cd108e42fce8cdb9670a364126123da1d4d424aa0a917c12c057652890aa" SOURCE_DIR="QMPlay2-$portVersion" PATCHES="qmplay2-$portVersion.patchset" ADDITIONAL_FILES="