From 5c0a03068763cf4ad3b50950bf2f79862a86e7fa Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 3 May 2020 11:51:30 +1000 Subject: [PATCH] QMPlay2: bump version --- ....19.patchset => qmplay2-20.05.02.patchset} | 50 +++++++++---------- ...9.12.19.recipe => qmplay2-20.05.02.recipe} | 24 ++++----- 2 files changed, 37 insertions(+), 37 deletions(-) rename media-video/qmplay2/patches/{qmplay2-19.12.19.patchset => qmplay2-20.05.02.patchset} (93%) rename media-video/qmplay2/{qmplay2-19.12.19.recipe => qmplay2-20.05.02.recipe} (88%) diff --git a/media-video/qmplay2/patches/qmplay2-19.12.19.patchset b/media-video/qmplay2/patches/qmplay2-20.05.02.patchset similarity index 93% rename from media-video/qmplay2/patches/qmplay2-19.12.19.patchset rename to media-video/qmplay2/patches/qmplay2-20.05.02.patchset index c55a68d26..282d8b1f5 100644 --- a/media-video/qmplay2/patches/qmplay2-19.12.19.patchset +++ b/media-video/qmplay2/patches/qmplay2-20.05.02.patchset @@ -1,14 +1,14 @@ -From 88801511a1276e4d284b0fe32be9ec8c5855f06a Mon Sep 17 00:00:00 2001 +From d9031acc4ae269e8db40b793d9ae974c009055d2 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 1 Sep 2019 22:52:49 +1000 +Date: Sun, 3 May 2020 11:29:15 +1000 Subject: Add haiku support diff --git a/CMakeLists.txt b/CMakeLists.txt -index f6710ef..11d985a 100644 +index a786eb5..21cd6a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -36,6 +36,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") +@@ -67,6 +67,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") elseif(ANDROID) set(DEFAULT_ALSA OFF) set(DEFAULT_PORTAUDIO OFF) @@ -18,16 +18,16 @@ index f6710ef..11d985a 100644 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() +@@ -108,7 +111,7 @@ endif() + option(USE_GLSLC "Compile Vulkan shaders" OFF) + add_feature_info(GLSLC USE_GLSLC "Compile Vulkan shaders") -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") +@@ -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") @@ -37,10 +37,10 @@ index f6710ef..11d985a 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 9c64652..cbe7316 100644 +index a9e17fc..8873744 100644 --- a/src/gui/Main.cpp +++ b/src/gui/Main.cpp -@@ -599,6 +599,10 @@ int main(int argc, char *argv[]) +@@ -607,6 +607,10 @@ int main(int argc, char *argv[]) checkForEGL(); #endif @@ -49,9 +49,9 @@ index 9c64652..cbe7316 100644 +#endif + QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); - #ifndef Q_OS_WIN - QGuiApplication::setAttribute(Qt::AA_ShareOpenGLContexts); -@@ -684,7 +688,7 @@ int main(int argc, char *argv[]) + #ifndef USE_OPENGL + QGuiApplication::setAttribute(Qt::AA_ForceRasterWidgets); +@@ -697,7 +701,7 @@ int main(int argc, char *argv[]) } if (!cmakeBuildFound) { @@ -60,7 +60,7 @@ index 9c64652..cbe7316 100644 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[]) +@@ -903,5 +907,9 @@ int main(int argc, char *argv[]) if (canDeleteApp) #endif delete qApp; @@ -71,10 +71,10 @@ index 9c64652..cbe7316 100644 return 0; } diff --git a/src/gui/MainWidget.cpp b/src/gui/MainWidget.cpp -index 139dd2a..c9804c5 100644 +index 9e0a736..8f5fb72 100644 --- a/src/gui/MainWidget.cpp +++ b/src/gui/MainWidget.cpp -@@ -145,7 +145,7 @@ MainWidget::MainWidget(QList> &arguments) : +@@ -148,7 +148,7 @@ MainWidget::MainWidget(QList> &arguments) : setIconSize({22, 22}); SettingsWidget::InitSettings(); @@ -84,7 +84,7 @@ index 139dd2a..c9804c5 100644 #else settings.init("MainWidget/WidgetsLocked", true); diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt -index 449882a..17b3da6 100644 +index 33eb2d2..5574366 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -7,6 +7,9 @@ if(WIN32) @@ -97,7 +97,7 @@ index 449882a..17b3da6 100644 else() set(MODULES_INSTALL_PATH "${CMAKE_INSTALL_LIBDIR}/qmplay2/modules") set(QMPLAY2_MODULE MODULE) -@@ -60,6 +63,10 @@ if(USE_PULSEAUDIO) +@@ -54,6 +57,10 @@ if(USE_PULSEAUDIO) add_subdirectory(PulseAudio) endif() @@ -152,7 +152,7 @@ index 0000000..f94e365 +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..cc9998b +index 0000000..2fee2d5 --- /dev/null +++ b/src/modules/MediaKit/MediaKit.cpp @@ -0,0 +1,65 @@ @@ -561,7 +561,7 @@ index 0000000..4715632 +#endif diff --git a/src/modules/MediaKit/SndPlayer.cpp b/src/modules/MediaKit/SndPlayer.cpp new file mode 100644 -index 0000000..ca7ad89 +index 0000000..dafa355 --- /dev/null +++ b/src/modules/MediaKit/SndPlayer.cpp @@ -0,0 +1,103 @@ @@ -670,7 +670,7 @@ index 0000000..ca7ad89 +} diff --git a/src/modules/MediaKit/SndPlayer.hpp b/src/modules/MediaKit/SndPlayer.hpp new file mode 100644 -index 0000000..b0ca8c2 +index 0000000..63709b4 --- /dev/null +++ b/src/modules/MediaKit/SndPlayer.hpp @@ -0,0 +1,49 @@ @@ -733,10 +733,10 @@ index 0000000..24b4ebd + MediaKit.png + diff --git a/src/qmplay2/QMPlay2Core.cpp b/src/qmplay2/QMPlay2Core.cpp -index 55f775d..044ea1f 100644 +index 5cf8f56..4b48fe4 100644 --- a/src/qmplay2/QMPlay2Core.cpp +++ b/src/qmplay2/QMPlay2Core.cpp -@@ -201,7 +201,7 @@ void QMPlay2CoreClass::init(bool loadModules, bool modulesInSubdirs, const QStri +@@ -210,7 +210,7 @@ void QMPlay2CoreClass::init(bool loadModules, bool modulesInSubdirs, const QStri settingsDir = QCoreApplication::applicationDirPath() + "/settings/"; else { @@ -745,7 +745,7 @@ index 55f775d..044ea1f 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)); -@@ -392,6 +392,11 @@ QStringList QMPlay2CoreClass::getModules(const QString &type, int typeLen) const +@@ -409,6 +409,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 55f775d..044ea1f 100644 if (type == "decoders") defaultModules << "FFmpeg Decoder"; -- -2.23.0 +2.26.0 diff --git a/media-video/qmplay2/qmplay2-19.12.19.recipe b/media-video/qmplay2/qmplay2-20.05.02.recipe similarity index 88% rename from media-video/qmplay2/qmplay2-19.12.19.recipe rename to media-video/qmplay2/qmplay2-20.05.02.recipe index 643e577ba..5eb7d33ef 100644 --- a/media-video/qmplay2/qmplay2-19.12.19.recipe +++ b/media-video/qmplay2/qmplay2-20.05.02.recipe @@ -1,14 +1,14 @@ SUMMARY="A video and audio player which can play most formats and codecs" DESCRIPTION="QMPlay2 is a video and audio player. It can play all formats \ -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." +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-2019 Błażej Szczygieł" +COPYRIGHT="2010-2020 Błażej Szczygieł" LICENSE="GNU GPL v3" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/zaps166/QMPlay2/archive/$portVersion.tar.gz" -CHECKSUM_SHA256="621b8183e841fa0be24c19b24279014668b4089ebf04331d77b4c5ed97a9573e" +CHECKSUM_SHA256="4d8657307743093b25c0b995bcf3a8e4123eda350d8cef1a2e0d186328192854" SOURCE_DIR="QMPlay2-$portVersion" PATCHES="qmplay2-$portVersion.patchset" ADDITIONAL_FILES=" @@ -79,12 +79,15 @@ BUILD() cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$appsDir/QMPlay2 \ - -DUSE_OPENGL2=OFF - make -j4 + -DUSE_OPENGL=OFF + make $jobArgs } INSTALL() { + cd build + make install + local APP_SIGNATURE="application/x-vnd.QMPlay2" local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" @@ -96,10 +99,7 @@ INSTALL() -e "s|@MIDDLE@|$MIDDLE|" \ -e "s|@MINOR@|$MINOR|" \ -e "s|@LONG_INFO@|$LONG_INFO|" \ - $portDir/additional-files/qmplay2.rdef.in > build/qmplay2.rdef - - cd build - make install + $portDir/additional-files/qmplay2.rdef.in > qmplay2.rdef mv $appsDir/QMPlay2/share/qmplay2/lang $appsDir/QMPlay2 mv $appsDir/QMPlay2/bin/QMPlay2 $appsDir/QMPlay2/QMPlay2