mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 06:58:57 +02:00
QMPlay2: bump version
This commit is contained in:
Gerasim Troeglazov
@@ -1,11 +1,11 @@
|
||||
From 34dc0d642c106ca26633d731de53bf4250436b46 Mon Sep 17 00:00:00 2001
|
||||
From 05b0ece22464f2510cf91ecd35417e83d13733f2 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Tue, 9 Mar 2021 12:01:25 +1000
|
||||
Date: Sun, 27 Jun 2021 23:45:17 +1000
|
||||
Subject: Add haiku support
|
||||
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f7b46f0..7212ab8 100644
|
||||
index 1146667..1cec2aa 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -78,6 +78,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
||||
@@ -26,8 +26,8 @@ index f7b46f0..7212ab8 100644
|
||||
+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()
|
||||
@@ -163,7 +166,7 @@ else()
|
||||
|
||||
@@ -166,7 +169,7 @@ else()
|
||||
set(USE_YOUTUBEDL OFF)
|
||||
endif()
|
||||
|
||||
@@ -37,7 +37,7 @@ index f7b46f0..7212ab8 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 2ebd731..6513dba 100644
|
||||
index 284c2c5..2e59957 100644
|
||||
--- a/src/gui/Main.cpp
|
||||
+++ b/src/gui/Main.cpp
|
||||
@@ -610,6 +610,10 @@ int main(int argc, char *argv[])
|
||||
@@ -71,7 +71,7 @@ index 2ebd731..6513dba 100644
|
||||
return 0;
|
||||
}
|
||||
diff --git a/src/gui/MainWidget.cpp b/src/gui/MainWidget.cpp
|
||||
index e75c98d..4333f23 100644
|
||||
index 884e1e5..dd223bf 100644
|
||||
--- a/src/gui/MainWidget.cpp
|
||||
+++ b/src/gui/MainWidget.cpp
|
||||
@@ -150,7 +150,7 @@ MainWidget::MainWidget(QList<QPair<QString, QString>> &arguments)
|
||||
@@ -732,41 +732,6 @@ index 0000000..24b4ebd
|
||||
+<RCC><qresource>
|
||||
+ <file alias="MediaKit">MediaKit.png</file>
|
||||
+</qresource></RCC>
|
||||
diff --git a/src/qmplay2/QMPlay2Core.cpp b/src/qmplay2/QMPlay2Core.cpp
|
||||
index 3685f2b..04bc1d4 100644
|
||||
--- a/src/qmplay2/QMPlay2Core.cpp
|
||||
+++ b/src/qmplay2/QMPlay2Core.cpp
|
||||
@@ -215,7 +215,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_MACOS)
|
||||
settingsDir = Functions::cleanPath(QStandardPaths::standardLocations(QStandardPaths::DataLocation).value(0, settingsDir));
|
||||
@@ -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";
|
||||
+#elif defined Q_OS_HAIKU
|
||||
+ if ( type == "videoWriters" )
|
||||
+ defaultModules << "QPainter";
|
||||
+ else if ( type == "audioWriters" )
|
||||
+ defaultModules << "MediaKit";
|
||||
#endif
|
||||
if (type == "decoders")
|
||||
defaultModules << "FFmpeg Decoder";
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
||||
From 96c5a6eae78d74dd5a3dbfe2b520cb745e073a00 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 16 May 2021 23:14:06 +1000
|
||||
Subject: Remove const for fix build
|
||||
|
||||
|
||||
diff --git a/src/qmplay2/IPC_Unix.cpp b/src/qmplay2/IPC_Unix.cpp
|
||||
index bac1b16..2bc3175 100644
|
||||
--- a/src/qmplay2/IPC_Unix.cpp
|
||||
@@ -780,49 +745,40 @@ index bac1b16..2bc3175 100644
|
||||
ioctl(m_priv->fd, FIONBIO, &on);
|
||||
m_priv->socketNotifier = new QSocketNotifier(m_priv->fd, QSocketNotifier::Read, this);
|
||||
connect(m_priv->socketNotifier, SIGNAL(activated(int)), this, SLOT(socketReadActive()));
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
||||
From 52aae66a0243e19c1d109bd0acfaf6fd47cbf4ef Mon Sep 17 00:00:00 2001
|
||||
From: Simon Vogl <simon.vogl@gmx.net>
|
||||
Date: Thu, 1 Apr 2021 21:56:04 +0000
|
||||
Subject: Fix YouTube Search for QMPlay2.
|
||||
|
||||
This patch is required to fix QMPlay2's YouTube Search function by using an empty Cookie.
|
||||
|
||||
diff --git a/src/modules/Extensions/YouTube.cpp b/src/modules/Extensions/YouTube.cpp
|
||||
index 78ee675..c67c343 100644
|
||||
--- a/src/modules/Extensions/YouTube.cpp
|
||||
+++ b/src/modules/Extensions/YouTube.cpp
|
||||
@@ -501,7 +501,7 @@ void YouTube::search()
|
||||
if (lastTitle != title || sender() == searchE || sender() == searchB || qobject_cast<QAction *>(sender()))
|
||||
{
|
||||
m_currPage = 1;
|
||||
- searchReply = net.start(getYtUrl(title, m_sortByIdx));
|
||||
+ searchReply = net.start(getYtUrl(title, m_sortByIdx), QByteArray(), "Cookie: \r\n");
|
||||
diff --git a/src/qmplay2/QMPlay2Core.cpp b/src/qmplay2/QMPlay2Core.cpp
|
||||
index b0bc28e..402b81b 100644
|
||||
--- a/src/qmplay2/QMPlay2Core.cpp
|
||||
+++ b/src/qmplay2/QMPlay2Core.cpp
|
||||
@@ -45,7 +45,7 @@
|
||||
#include <powrprof.h>
|
||||
#elif defined Q_OS_MACOS
|
||||
#include <QOperatingSystemVersion>
|
||||
-#elif !defined Q_OS_ANDROID
|
||||
+#elif !defined Q_OS_ANDROID && !defined Q_OS_HAIKU
|
||||
#include <QDBusConnection>
|
||||
#include <QDBusInterface>
|
||||
#endif
|
||||
@@ -236,7 +236,7 @@ void QMPlay2CoreClass::init(bool loadModules, bool modulesInSubdirs, const QStri
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -886,7 +886,7 @@ void YouTube::setSearchResults(const QJsonObject &jsonObj, bool isContinuation)
|
||||
{
|
||||
tWI->setDisabled(true);
|
||||
|
||||
- auto linkReply = net.start(url);
|
||||
+ auto linkReply = net.start(url, QByteArray(), "Cookie: \r\n");
|
||||
linkReply->setProperty("tWI", QVariant::fromValue((void *)tWI));
|
||||
linkReplies += linkReply;
|
||||
}
|
||||
--
|
||||
2.30.2
|
||||
|
||||
|
||||
From 6e6269e47145e20c2a5b6153e5ec2e85a96ad618 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 16 May 2021 23:34:03 +1000
|
||||
Subject: Use system youtube-dl
|
||||
|
||||
|
||||
-#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_MACOS)
|
||||
settingsDir = Functions::cleanPath(QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).value(0));
|
||||
@@ -484,6 +484,11 @@ QStringList QMPlay2CoreClass::getModules(const QString &type, int typeLen) const
|
||||
#elif defined Q_OS_WIN
|
||||
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";
|
||||
diff --git a/src/qmplay2/YouTubeDL.cpp b/src/qmplay2/YouTubeDL.cpp
|
||||
index 3319df0..8f6567f 100644
|
||||
--- a/src/qmplay2/YouTubeDL.cpp
|
||||
@@ -6,9 +6,9 @@ MyFreeMP3 browser."
|
||||
HOMEPAGE="http://zaps166.sourceforge.net"
|
||||
COPYRIGHT="2010-2021 Błażej Szczygieł"
|
||||
LICENSE="GNU GPL v3"
|
||||
REVISION="3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/zaps166/QMPlay2/archive/$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="5416a48de694e1fc21a1c68f7d4102b2e9386140ba04c92421815c2191dcc51a"
|
||||
CHECKSUM_SHA256="a1139f50d87393e37ce9263a1afbd2d5064f6f0ad35a5f5a513094eeef27fc62"
|
||||
SOURCE_DIR="QMPlay2-$portVersion"
|
||||
PATCHES="qmplay2-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="
|
||||
Reference in New Issue
Block a user