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

Qmmp: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2017-11-28 13:09:00 +10:00
parent 21b79fefcb
commit fe1e1dc0c3
3 changed files with 168 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
media-sound/qmmp/patches/qmmp-1.1.12.patchset → media-sound/qmmp/patches/qmmp-1.2.0.patchset
View File

@@ -1,57 +1,66 @@
From 62ab55037c834ee901189b87f5d65248f8ae3365 Mon Sep 17 00:00:00 2001
From 03d33373f4542751aef3c00076fc56b48d397dc8 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 22 Nov 2017 16:41:34 +1000
Date: Tue, 28 Nov 2017 00:42:45 +1000
Subject: Fix build for Haiku
diff --git a/qmmp.pri b/qmmp.pri
index 1146cad..f46c649 100644
index 823eaa9..a8c8f90 100644
--- a/qmmp.pri
+++ b/qmmp.pri
@@ -7,7 +7,9 @@ OBJECTS_DIR=./.build/obj
RCC_DIR=./.build/rcc
@@ -13,7 +13,9 @@ RCC_DIR=./.build/rcc
#Defines
QT += widgets
DEFINES += QT_NO_CAST_FROM_BYTEARRAY QT_STRICT_ITERATORS
+unix:!haiku {
DEFINES += QMMP_WS_X11
+}
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050400
#Configuration
diff --git a/src/app/app.pro b/src/app/app.pro
index 2598cf8..cb5b47a 100644
index 3f7ba55..87e38a9 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -16,6 +16,7 @@ OBJECTS_DIR = ./.build/obj
QT += network
@@ -4,6 +4,7 @@ TEMPLATE = app
unix:TARGET = ../../bin/qmmp
win32:TARGET = ../../../bin/qmmp
+haiku:TARGET = ../../Qmmp
CONFIG += thread \
warn_on
QMAKE_LIBDIR += ../../lib \
QT += network
diff --git a/src/plugins/Effect/Effect.pro b/src/plugins/Effect/Effect.pro
index 417c06b..82a0c4f 100644
index 5a1cc69..800ad00 100644
--- a/src/plugins/Effect/Effect.pro
+++ b/src/plugins/Effect/Effect.pro
@@ -3,9 +3,11 @@ TEMPLATE = subdirs
@@ -2,11 +2,12 @@ include (../../../qmmp.pri)
TEMPLATE = subdirs
SUBDIRS += crossfade stereo
-
+!haiku {
contains(CONFIG, BS2B_PLUGIN):SUBDIRS += bs2b
contains(CONFIG, SOXR_PLUGIN):SUBDIRS += soxr
+}
contains(CONFIG, FILEWRITER_PLUGIN):SUBDIRS += filewriter
-unix {
+unix:!haiku {
contains(CONFIG, LADSPA_PLUGIN):SUBDIRS += ladspa
}
diff --git a/src/plugins/General/General.pro b/src/plugins/General/General.pro
index 03727ba..923aaf1 100644
index 03727ba..e5a9ecd 100644
--- a/src/plugins/General/General.pro
+++ b/src/plugins/General/General.pro
@@ -8,20 +8,20 @@ SUBDIRS += statusicon \
@@ -1,27 +1,27 @@
include(../../../qmmp.pri)
SUBDIRS += statusicon \
- notifier \
lyrics \
scrobbler \
fileops \
covermanager \
streambrowser \
trackchange \
@@ -60,6 +69,7 @@ index 03727ba..923aaf1 100644
rgscan
-unix:SUBDIRS += mpris \
+unix:!haiku:SUBDIRS += mpris \
+ notifier \
+ hotkey \
kdenotify \
converter \
@@ -77,7 +87,7 @@ index 03727ba..923aaf1 100644
TEMPLATE = subdirs
diff --git a/src/plugins/Input/Input.pro b/src/plugins/Input/Input.pro
index 887f126..c771588 100644
index eef4806..1262644 100644
--- a/src/plugins/Input/Input.pro
+++ b/src/plugins/Input/Input.pro
@@ -19,6 +19,7 @@ contains(CONFIG, FFMPEG_PLUGIN){
@@ -96,7 +106,7 @@ index 887f126..c771588 100644
unix{
@@ -42,8 +44,10 @@ contains(CONFIG, AAC_PLUGIN){
@@ -42,9 +44,11 @@ contains(CONFIG, AAC_PLUGIN){
}
@@ -106,9 +116,10 @@ index 887f126..c771588 100644
}
+}
}
contains(CONFIG, ARCHIVE_PLUGIN){
TAGLIB_VERSION = $$system("pkg-config --modversion taglib")
diff --git a/src/plugins/Output/Output.pro b/src/plugins/Output/Output.pro
index c60ea4c..ff8cf91 100644
index 1d745e4..194b25b 100644
--- a/src/plugins/Output/Output.pro
+++ b/src/plugins/Output/Output.pro
@@ -7,7 +7,7 @@ win32:SUBDIRS += wasapi
@@ -120,8 +131,8 @@ index c60ea4c..ff8cf91 100644
contains(CONFIG, JACK_PLUGIN){
SUBDIRS += jack
@@ -31,9 +31,13 @@ contains(CONFIG, OSS4_PLUGIN){
@@ -34,9 +34,13 @@ contains(CONFIG, SHOUT_PLUGIN){
}
}
+haiku{
@@ -136,20 +147,20 @@ index c60ea4c..ff8cf91 100644
}
}
diff --git a/src/plugins/Ui/skinned/skinned.pro b/src/plugins/Ui/skinned/skinned.pro
index bdad79b..f2a8843 100644
index 9e55ab2..4565cf3 100644
--- a/src/plugins/Ui/skinned/skinned.pro
+++ b/src/plugins/Ui/skinned/skinned.pro
@@ -128,7 +128,7 @@ win32:LIBS += -lqmmp0 -lqmmpui0
@@ -121,7 +121,7 @@ RESOURCES = resources/resources.qrc \
RESOURCES = resources/resources.qrc glare/glare.qrc
LIBS += $$QMMPUI_LIB
-unix{
+unix:!haiku{
isEmpty(LIB_DIR){
LIB_DIR = /lib
}
-unix {
+unix:!haiku {
target.path = $$LIB_DIR/qmmp/Ui
INSTALLS += target
PKGCONFIG += x11
diff --git a/src/plugins/Ui/skinned/symboldisplay.cpp b/src/plugins/Ui/skinned/symboldisplay.cpp
index 2fd5893..ea6f231 100644
index 49a6ce3..d5a6e33 100644
--- a/src/plugins/Ui/skinned/symboldisplay.cpp
+++ b/src/plugins/Ui/skinned/symboldisplay.cpp
@@ -32,7 +32,7 @@ SymbolDisplay::SymbolDisplay (QWidget *parent, int digits)
@@ -173,18 +184,35 @@ index e3f6d5e..1150b9a 100644
+ !haiku:SUBDIRS += projectm
}
diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
index 1805bf5..3eae194 100644
index f56e33e..a9e449c 100644
--- a/src/plugins/plugins.pri
+++ b/src/plugins/plugins.pri
@@ -1,5 +1,6 @@
include(../../qmmp.pri)
unix:PLUGINS_PREFIX=../../../../lib/qmmp
win32:PLUGINS_PREFIX=../../../../../bin/plugins
+haiku:PLUGINS_PREFIX=../../../../plugins
INCLUDEPATH += ../../../qmmp
CONFIG += hide_symbols
@@ -9,7 +9,7 @@ win32 {
QMMPUI_LIB = -lqmmpui0
}
-unix {
+unix:!haiku {
isEmpty(LIB_DIR){
LIB_DIR = /lib
}
@@ -18,6 +18,14 @@ unix {
QMMPUI_LIB = -lqmmpui
}
+haiku {
+ isEmpty(LIB_DIR){
+ LIB_DIR = /lib
+ }
+ PLUGINS_PREFIX=../../../../plugins
+ LIBS += -lqmmp
+ QMMPUI_LIB = -lqmmpui
+}
CONFIG += warn_on plugin lib thread link_pkgconfig hide_symbols
TEMPLATE = lib
diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp
index 777a290..92323d0 100644
index 44f404e..9b20982 100644
--- a/src/qmmp/qmmp.cpp
+++ b/src/qmmp/qmmp.cpp
@@ -56,6 +56,8 @@ const QString Qmmp::configDir()
@@ -206,15 +234,17 @@ index 777a290..92323d0 100644
#else
QDir dir(qApp->applicationDirPath() + "/../" LIB_DIR "/qmmp");
diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp
index 894191e..9aefb3a 100644
index de0e271..a8173f8 100644
--- a/src/qmmpui/configdialog.cpp
+++ b/src/qmmpui/configdialog.cpp
@@ -61,6 +61,9 @@ ConfigDialog::ConfigDialog (QWidget *parent) : QDialog (parent)
@@ -56,6 +56,11 @@ ConfigDialog::ConfigDialog (QWidget *parent) : QDialog (parent)
m_insert_row = 0;
setAttribute(Qt::WA_QuitOnClose, false);
setAttribute(Qt::WA_DeleteOnClose, false);
+#if defined(Q_OS_HAIKU)
+ hide();
+ setWindowModality(Qt::NonModal);
+ show();
+#endif
m_ui->preferencesButton->setEnabled(false);
m_ui->informationButton->setEnabled(false);
@@ -223,10 +253,10 @@ index 894191e..9aefb3a 100644
2.15.0
From 729994441ffae6ed2cd890069c9b658f7d1b77d0 Mon Sep 17 00:00:00 2001
From 7a227b91321efe994837f69705594382188c0463 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 22 Nov 2017 17:12:04 +1000
Subject: Add MidiaKit output plugin
Date: Tue, 28 Nov 2017 00:46:04 +1000
Subject: Add mediakit output plugin
diff --git a/src/plugins/Output/mediakit/CMakeLists.txt b/src/plugins/Output/mediakit/CMakeLists.txt
@@ -691,27 +721,3 @@ index 0000000..f678c61
--
2.15.0
From aaa5c57cb74e8a3bb3284d36e8894799eec9002e Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 22 Nov 2017 18:07:11 +1000
Subject: Disable ConfigDialog modality
diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp
index 9aefb3a..de9c651 100644
--- a/src/qmmpui/configdialog.cpp
+++ b/src/qmmpui/configdialog.cpp
@@ -62,7 +62,9 @@ ConfigDialog::ConfigDialog (QWidget *parent) : QDialog (parent)
setAttribute(Qt::WA_QuitOnClose, false);
setAttribute(Qt::WA_DeleteOnClose, false);
#if defined(Q_OS_HAIKU)
+ hide();
setWindowModality(Qt::NonModal);
+ show();
#endif
m_ui->preferencesButton->setEnabled(false);
m_ui->informationButton->setEnabled(false);
--
2.15.0