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

QMPlay2: enable chiptune module

Browse Source 
* fix some issues
This commit is contained in:
Gerasim Troeglazov
2019-02-26 19:49:58 +10:00
parent d1efbaab3b
commit b8fbc9ee7f
2 changed files with 51 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
media-video/qmplay2/patches/qmplay2-18.12.26.patchset
View File

@@ -1,4 +1,4 @@
From 93bfa2cc47f5bbf0aa0583401fd003999cbd2984 Mon Sep 17 00:00:00 2001
From afd157fc41e7fc192706168c41d41610f5e16892 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 9 Apr 2018 13:08:13 +0300
Subject: Add haiku support
@@ -28,7 +28,7 @@ index 9765360..dddd5df 100644
libPath = QMPlay2CoreClass::getLibDir();
if (libPath.isEmpty() || !QDir(libPath).exists("qmplay2"))
diff --git a/src/gui/MainWidget.cpp b/src/gui/MainWidget.cpp
index d4853ee..dc6ef54 100644
index 6f4e6bf..a514043 100644
--- a/src/gui/MainWidget.cpp
+++ b/src/gui/MainWidget.cpp
@@ -145,7 +145,7 @@ MainWidget::MainWidget(QList<QPair<QString, QString>> &arguments) :
@@ -731,7 +731,7 @@ index 0216942..ec10a86 100644
2.19.1
From d17a1672b1df7d372c8c3a6f4a82395fb18028a2 Mon Sep 17 00:00:00 2001
From ed1d574b0369ac6c7f3d82f161c94c284d9b64e4 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 21 Nov 2018 23:07:39 +1000
Subject: Disable DBUS for Haiku
@@ -753,3 +753,48 @@ index b23451d..0ea5840 100644
--
2.19.1
From 64fd5eb0278661d1c6bd617b0400b23d7df5e5cb Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 26 Feb 2019 19:40:29 +1000
Subject: Ugly hack for crash on exit
diff --git a/src/gui/Main.cpp b/src/gui/Main.cpp
index dddd5df..c3cbed9 100644
--- a/src/gui/Main.cpp
+++ b/src/gui/Main.cpp
@@ -803,5 +803,9 @@ int main(int argc, char *argv[])
if (canDeleteApp)
#endif
delete qApp;
+
+#ifdef Q_OS_HAIKU
+ kill(::getpid(), SIGKILL);
+#endif
return 0;
}
--
2.19.1
From 8ec5b85a507b03d1b938efc28ce989aed2968abc Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 26 Feb 2019 19:40:45 +1000
Subject: Fix typo
diff --git a/src/modules/MediaKit/MediaKit.pro b/src/modules/MediaKit/MediaKit.pro
index bf0c648..a1b39f0 100644
--- a/src/modules/MediaKit/MediaKit.pro
+++ b/src/modules/MediaKit/MediaKit.pro
@@ -17,5 +17,5 @@ RESOURCES += icon.qrc
INCLUDEPATH += . ../../qmplay2/headers
DEPENDPATH += . ../../qmplay2/headers
-HEADERS += MediaKit.hpp MediaKitoWriter.hpp SndPlayer.hpp RingBuffer.hpp
+HEADERS += MediaKit.hpp MediaKitWriter.hpp SndPlayer.hpp RingBuffer.hpp
SOURCES += MediaKit.cpp MediaKitWriter.cpp SndPlayer.cpp RingBuffer.cpp
--
2.19.1

4
media-video/qmplay2/qmplay2-18.12.26.recipe
View File

@@ -6,7 +6,7 @@ r browser."
HOMEPAGE="http://zaps166.sourceforge.net"
COPYRIGHT="2010-2018 Błażej Szczygieł"
LICENSE="GNU GPL v3"
REVISION="2"
REVISION="3"
SOURCE_URI="https://github.com/zaps166/QMPlay2/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="ba9e594485e531f6a3fcd6fb579847daac61003b61463a24ae60381c61d4ea56"
SOURCE_DIR="QMPlay2-$portVersion"
@@ -32,6 +32,7 @@ REQUIRES="
lib:libcddb$secondaryArchSuffix
lib:libcdio$secondaryArchSuffix >= 18
lib:libGL$secondaryArchSuffix
lib:libgme$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libQt5Core$secondaryArchSuffix
lib:libQt5DBus$secondaryArchSuffix
@@ -50,6 +51,7 @@ BUILD_REQUIRES="
devel:libavutil$secondaryArchSuffix
devel:libcddb$secondaryArchSuffix
devel:libcdio$secondaryArchSuffix >= 18
devel:libgme$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libQt5Core$secondaryArchSuffix
devel:libQt5DBus$secondaryArchSuffix