haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

QMPlay2: bump vresion

Browse Source
This commit is contained in:
Sergei Reznikov
2018-04-09 13:39:12 +03:00
parent 88c3d1d2f9
commit b1dec6dde4
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
media-video/qmplay2/patches/qmplay2-17.10.24.patchset → media-video/qmplay2/patches/qmplay2-18.04.01.patchset
View File

@@ -1,36 +1,37 @@
From d6124aea2107519f759dc7ff90902f6ceb58c585 Mon Sep 17 00:00:00 2001
From ba1d6bca5acbbc5c0ee129f624d8ddbc80477706 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 13 Oct 2015 02:56:37 +0000
Date: Mon, 9 Apr 2018 13:08:13 +0300
Subject: Add haiku support
diff --git a/src/gui/Main.cpp b/src/gui/Main.cpp
index 2fcea50..0ba765c 100644
index 9765360..dddd5df 100644
--- a/src/gui/Main.cpp
+++ b/src/gui/Main.cpp
@@ -456,6 +456,9 @@ int main(int argc, char *argv[])
@@ -512,6 +512,9 @@ int main(int argc, char *argv[])
signal(SIGTERM, signal_handler);
atexit(exitProcedure);
+#ifdef Q_OS_HAIKU
+ setenv("HOME", "/boot/home", 1);
+#endif
#if (defined(Q_OS_MAC) || defined(Q_OS_WIN)) && (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
#endif
@@ -544,7 +547,7 @@ int main(int argc, char *argv[])
#ifndef Q_OS_WIN
QGuiApplication::setAttribute(Qt::AA_ShareOpenGLContexts);
@@ -582,7 +585,7 @@ int main(int argc, char *argv[])
}
if (!cmakeBuildFound)
{
-#if !defined Q_OS_WIN && !defined Q_OS_MAC && !defined Q_OS_ANDROID
+#if !defined Q_OS_WIN && !defined Q_OS_MAC && !defined Q_OS_ANDROID && !defined Q_OS_HAIKU
-#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"))
diff --git a/src/gui/MainWidget.cpp b/src/gui/MainWidget.cpp
index c64cba3..adf936d 100644
index 8183ebb..0f405c5 100644
--- a/src/gui/MainWidget.cpp
+++ b/src/gui/MainWidget.cpp
@@ -158,7 +158,7 @@ MainWidget::MainWidget(QPair<QStringList, QStringList> &arguments)
@@ -145,7 +145,7 @@ MainWidget::MainWidget(QList<QPair<QString, QString>> &arguments) :
setIconSize({22, 22});
SettingsWidget::InitSettings();
@@ -40,7 +41,7 @@ index c64cba3..adf936d 100644
#else
settings.init("MainWidget/WidgetsLocked", true);
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 7abeac2..7afaf02 100644
index dea774c..f001534 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -12,7 +12,7 @@ TARGET = QMPlay2
@@ -53,7 +54,7 @@ index 7abeac2..7afaf02 100644
RESOURCES += resources.qrc
diff --git a/src/modules/FFmpeg/FFmpeg.pro b/src/modules/FFmpeg/FFmpeg.pro
index 7939af0..f5f8f32 100644
index 8a4fadc..cb82d5f 100644
--- a/src/modules/FFmpeg/FFmpeg.pro
+++ b/src/modules/FFmpeg/FFmpeg.pro
@@ -27,7 +27,7 @@ DEPENDPATH += . ../../qmplay2/headers
@@ -173,6 +174,7 @@ 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
@@ -702,19 +704,19 @@ index 6e853ea..d0f6c21 100644
packagesExist(libpulse-simple): SUBDIRS += PulseAudio
diff --git a/src/qmplay2/QMPlay2Core.cpp b/src/qmplay2/QMPlay2Core.cpp
index 9506f86..2bb12ee 100644
index 09ee075..d77af21 100644
--- a/src/qmplay2/QMPlay2Core.cpp
+++ b/src/qmplay2/QMPlay2Core.cpp
@@ -167,7 +167,7 @@ void QMPlay2CoreClass::init(bool loadModules, bool modulesInSubdirs, const QStri
@@ -189,7 +189,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/";
#elif defined(Q_OS_MAC)
#elif defined(Q_OS_MACOS)
settingsDir = Functions::cleanPath(QStandardPaths::standardLocations(QStandardPaths::DataLocation).value(0, settingsDir));
@@ -363,6 +363,11 @@ QStringList QMPlay2CoreClass::getModules(const QString &type, int typeLen) const
@@ -384,6 +384,11 @@ QStringList QMPlay2CoreClass::getModules(const QString &type, int typeLen) const
#elif defined Q_OS_WIN
if (type == "videoWriters")
defaultModules << "OpenGL 2" << "DirectDraw";
@@ -727,5 +729,5 @@ index 9506f86..2bb12ee 100644
if (type == "decoders")
defaultModules << "FFmpeg Decoder";
--
2.12.2
2.16.2

6
media-video/qmplay2/qmplay2-17.10.24.recipe → media-video/qmplay2/qmplay2-18.04.01.recipe
View File

@@ -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-2017 Błażej Szczygieł"
COPYRIGHT="2010-2018 Błażej Szczygieł"
LICENSE="GNU GPL v3"
REVISION="1"
SOURCE_URI="https://github.com/zaps166/QMPlay2/releases/download/$portVersion/QMPlay2-src-$portVersion.tar.xz"
CHECKSUM_SHA256="527f5f848aaefa4b5c7ddbce2f86ce46ffdc76be2890635106a2eaa9a8736b41"
CHECKSUM_SHA256="cf4d3232038b5040cb850fc75d736e91e738dc9842a58d9c29788b835730b26c"
SOURCE_DIR="QMPlay2-src-$portVersion"
PATCHES="qmplay2-$portVersion.patchset"
ADDITIONAL_FILES="
@@ -95,5 +95,5 @@ INSTALL()
cp -R app/lib $appsDir/QMPlay2
mv $appsDir/QMPlay2/lib/qmplay2/modules $appsDir/QMPlay2/
addAppDeskbarSymlink $appsDir/QMPlay2/QMPlay2 QMPlay2
addAppDeskbarSymlink $appsDir/QMPlay2/QMPlay2
}