diff --git a/media-video/qmplay2/patches/qmplay2-20.12.16.patchset b/media-video/qmplay2/patches/qmplay2-21.03.09.patchset similarity index 95% rename from media-video/qmplay2/patches/qmplay2-20.12.16.patchset rename to media-video/qmplay2/patches/qmplay2-21.03.09.patchset index a63bf6db2..069951a0f 100644 --- a/media-video/qmplay2/patches/qmplay2-20.12.16.patchset +++ b/media-video/qmplay2/patches/qmplay2-21.03.09.patchset @@ -1,14 +1,14 @@ -From e20f83e18beb2fc6ac971acabb7a9c036e86f134 Mon Sep 17 00:00:00 2001 +From fde68ff35f7d915941c387c9eb64db3f3de632a3 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 20 Dec 2020 00:38:30 +1000 +Date: Tue, 9 Mar 2021 12:01:25 +1000 Subject: Add haiku support diff --git a/CMakeLists.txt b/CMakeLists.txt -index dc090a9..d634dd5 100644 +index f7b46f0..7212ab8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -81,6 +81,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") +@@ -78,6 +78,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") elseif(ANDROID) set(DEFAULT_ALSA OFF) set(DEFAULT_PORTAUDIO OFF) @@ -18,7 +18,7 @@ index dc090a9..d634dd5 100644 else() set(DEFAULT_ALSA OFF) set(DEFAULT_PORTAUDIO ON) -@@ -125,7 +128,7 @@ endif() +@@ -122,7 +125,7 @@ endif() option(USE_GLSLC "Compile Vulkan shaders" OFF) add_feature_info(GLSLC USE_GLSLC "Compile Vulkan shaders") @@ -27,7 +27,7 @@ index dc090a9..d634dd5 100644 option(USE_FREEDESKTOP_NOTIFICATIONS "Use Freedesktop notifications" ON) add_feature_info("Freedesktop notifications" USE_FREEDESKTOP_NOTIFICATIONS "Use Freedesktop notifications") endif() -@@ -166,7 +169,7 @@ else() +@@ -163,7 +166,7 @@ else() set(USE_YOUTUBEDL OFF) endif() @@ -37,10 +37,10 @@ index dc090a9..d634dd5 100644 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 a9e17fc..8873744 100644 +index 2ebd731..6513dba 100644 --- a/src/gui/Main.cpp +++ b/src/gui/Main.cpp -@@ -607,6 +607,10 @@ int main(int argc, char *argv[]) +@@ -610,6 +610,10 @@ int main(int argc, char *argv[]) checkForEGL(); #endif @@ -51,7 +51,7 @@ index a9e17fc..8873744 100644 QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); #ifndef USE_OPENGL QGuiApplication::setAttribute(Qt::AA_ForceRasterWidgets); -@@ -697,7 +701,7 @@ int main(int argc, char *argv[]) +@@ -706,7 +710,7 @@ int main(int argc, char *argv[]) } if (!cmakeBuildFound) { @@ -60,7 +60,7 @@ index a9e17fc..8873744 100644 sharePath = QCoreApplication::applicationDirPath() + "/../share/qmplay2"; libPath = QMPlay2CoreClass::getLibDir(); if (libPath.isEmpty() || !QDir(libPath).exists("qmplay2")) -@@ -903,5 +907,9 @@ int main(int argc, char *argv[]) +@@ -912,5 +916,9 @@ int main(int argc, char *argv[]) if (canDeleteApp) #endif delete qApp; @@ -71,7 +71,7 @@ index a9e17fc..8873744 100644 return 0; } diff --git a/src/gui/MainWidget.cpp b/src/gui/MainWidget.cpp -index 2fd0a65..73e4512 100644 +index e75c98d..4333f23 100644 --- a/src/gui/MainWidget.cpp +++ b/src/gui/MainWidget.cpp @@ -150,7 +150,7 @@ MainWidget::MainWidget(QList> &arguments) @@ -84,7 +84,7 @@ index 2fd0a65..73e4512 100644 #else settings.init("MainWidget/WidgetsLocked", true); diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt -index 33eb2d2..5574366 100644 +index 832b774..216e162 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -7,6 +7,9 @@ if(WIN32) @@ -97,8 +97,8 @@ index 33eb2d2..5574366 100644 else() set(MODULES_INSTALL_PATH "${CMAKE_INSTALL_LIBDIR}/qmplay2/modules") set(QMPLAY2_MODULE MODULE) -@@ -54,6 +57,10 @@ if(USE_PULSEAUDIO) - add_subdirectory(PulseAudio) +@@ -58,6 +61,10 @@ if(USE_PIPEWIRE) + add_subdirectory(PipeWire) endif() +if(HAIKU) @@ -733,10 +733,10 @@ index 0000000..24b4ebd + MediaKit.png + diff --git a/src/qmplay2/QMPlay2Core.cpp b/src/qmplay2/QMPlay2Core.cpp -index f459263..07c4e69 100644 +index 3685f2b..04bc1d4 100644 --- a/src/qmplay2/QMPlay2Core.cpp +++ b/src/qmplay2/QMPlay2Core.cpp -@@ -204,7 +204,7 @@ void QMPlay2CoreClass::init(bool loadModules, bool modulesInSubdirs, const QStri +@@ -215,7 +215,7 @@ void QMPlay2CoreClass::init(bool loadModules, bool modulesInSubdirs, const QStri settingsDir = QCoreApplication::applicationDirPath() + "/settings/"; else { @@ -745,7 +745,7 @@ index f459263..07c4e69 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)); -@@ -464,6 +464,11 @@ QStringList QMPlay2CoreClass::getModules(const QString &type, int typeLen) const +@@ -472,6 +472,11 @@ QStringList QMPlay2CoreClass::getModules(const QString &type, int typeLen) const #elif defined Q_OS_WIN if (type == "videoWriters") defaultModules << "OpenGL 2" << "DirectDraw"; @@ -758,5 +758,5 @@ index f459263..07c4e69 100644 if (type == "decoders") defaultModules << "FFmpeg Decoder"; -- -2.28.0 +2.30.0 diff --git a/media-video/qmplay2/qmplay2-20.12.16.recipe b/media-video/qmplay2/qmplay2-21.03.09.recipe similarity index 96% rename from media-video/qmplay2/qmplay2-20.12.16.recipe rename to media-video/qmplay2/qmplay2-21.03.09.recipe index 5755599e1..7e16e274a 100644 --- a/media-video/qmplay2/qmplay2-20.12.16.recipe +++ b/media-video/qmplay2/qmplay2-21.03.09.recipe @@ -4,11 +4,11 @@ supported by FFmpeg, libmodplug (including J2B and SFX). It also supports \ Audio CD, raw files, Rayman 2 music and chiptunes. It contains YouTube and \ MyFreeMP3 browser." HOMEPAGE="http://zaps166.sourceforge.net" -COPYRIGHT="2010-2020 Błażej Szczygieł" +COPYRIGHT="2010-2021 Błażej Szczygieł" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/zaps166/QMPlay2/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="7772cd108e42fce8cdb9670a364126123da1d4d424aa0a917c12c057652890aa" +CHECKSUM_SHA256="5416a48de694e1fc21a1c68f7d4102b2e9386140ba04c92421815c2191dcc51a" SOURCE_DIR="QMPlay2-$portVersion" PATCHES="qmplay2-$portVersion.patchset" ADDITIONAL_FILES="