QMMP: bump version

This commit is contained in:
Gerasim Troeglazov
2021-06-28 20:35:47 +10:00
parent 178f98a83c
commit 3c6f1a2808
2 changed files with 22 additions and 22 deletions

View File

@@ -1,11 +1,11 @@
From b9068f455125b4139aef8b4ca4af5272506c49ec Mon Sep 17 00:00:00 2001
From 452aa33b8cd84d5049fe6f992dad7df8dc899485 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 5 Feb 2021 11:00:36 +1000
Date: Sun, 30 May 2021 21:53:22 +1000
Subject: Add haiku support
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f82eda..3750da9 100644
index 0cbcd8b..c2a0ee7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,7 +63,7 @@ find_package(Qt5DBus 5.4.0)
@@ -17,7 +17,7 @@ index 7f82eda..3750da9 100644
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
set(CMAKE_CXX_STANDARD 11)
@@ -241,7 +241,7 @@ PRINT_SUMMARY ("Two-panel File File Dialog ............" USE_TWO_PANEL_DIALOG 1)
@@ -243,7 +243,7 @@ PRINT_SUMMARY ("Two-panel File File Dialog ............" USE_TWO_PANEL_DIALOG 1)
MESSAGE("")
MESSAGE("Advanced:")
@@ -25,9 +25,9 @@ index 7f82eda..3750da9 100644
+PRINT_SUMMARY ("Skinned user interface ................" USE_SKINNED 1)
PRINT_SUMMARY ("Simple user interface (QSUI) .........." USE_QSUI 1)
PRINT_SUMMARY ("Automatic charset detection ..........." USE_ENCA ENCA_FOUND)
PRINT_SUMMARY ("Directory association ................." USE_DIR_ASSOC 1)
PRINT_SUMMARY ("MPEG plugin with LibRCD support ......." USE_LIBRCD LIBRCD_FOUND)
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 53c9e72..7d3eb51 100644
index 579e8b0..3cc71b0 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -30,6 +30,10 @@
@@ -87,10 +87,10 @@ index 0134f73..8cbc33c 100644
install(TARGETS gme DESTINATION ${PLUGIN_DIR}/Input)
ENDIF(GME_FOUND)
diff --git a/src/plugins/Output/CMakeLists.txt b/src/plugins/Output/CMakeLists.txt
index 60c2066..5eac3bc 100644
index 867fe49..3881ec7 100644
--- a/src/plugins/Output/CMakeLists.txt
+++ b/src/plugins/Output/CMakeLists.txt
@@ -9,6 +9,7 @@ SET(USE_DSOUND TRUE CACHE BOOL "enable/disable DirectSound plugin")
@@ -10,6 +10,7 @@ SET(USE_DSOUND TRUE CACHE BOOL "enable/disable DirectSound plugin")
SET(USE_QTMULTIMEDIA TRUE CACHE BOOL "enable/disable Qt Multimedia output plugin")
SET(USE_WASAPI TRUE CACHE BOOL "enable/disable WASAPI plugin")
SET(USE_SHOUT TRUE CACHE BOOL "enable/disable Icecast plugin")
@@ -98,7 +98,7 @@ index 60c2066..5eac3bc 100644
IF(USE_ALSA)
add_subdirectory(alsa)
@@ -53,3 +54,7 @@ ENDIF(USE_WASAPI)
@@ -58,3 +59,7 @@ ENDIF(USE_WASAPI)
IF(USE_SHOUT)
add_subdirectory(shout)
ENDIF(USE_SHOUT)
@@ -173,7 +173,7 @@ index 0000000..86849a8
+INSTALLS += target
diff --git a/src/plugins/Output/mediakit/outputmediakit.cpp b/src/plugins/Output/mediakit/outputmediakit.cpp
new file mode 100644
index 0000000..baf7326
index 0000000..b5108a7
--- /dev/null
+++ b/src/plugins/Output/mediakit/outputmediakit.cpp
@@ -0,0 +1,137 @@
@@ -544,10 +544,10 @@ index ca25b54..7670cdb 100644
IF(USE_QSUI)
add_subdirectory(qsui)
diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
index a1347fa..bf190cd 100644
index 8c51aa2..bca6f64 100644
--- a/src/plugins/Ui/qsui/mainwindow.cpp
+++ b/src/plugins/Ui/qsui/mainwindow.cpp
@@ -317,6 +317,7 @@ void MainWindow::showSettings()
@@ -320,6 +320,7 @@ void MainWindow::showSettings()
QSUiSettings *simpleSettings = new QSUiSettings(this);
confDialog->addPage(tr("Appearance"), simpleSettings, QIcon(":/qsui/qsui_settings.png"));
confDialog->addPage(tr("Shortcuts"), new HotkeyEditor(this), QIcon(":/qsui/qsui_shortcuts.png"));
@@ -556,7 +556,7 @@ index a1347fa..bf190cd 100644
simpleSettings->writeSettings();
confDialog->deleteLater();
diff --git a/src/plugins/Ui/skinned/CMakeLists.txt b/src/plugins/Ui/skinned/CMakeLists.txt
index 6e2e14d..36916b3 100644
index 63dc385..f202f88 100644
--- a/src/plugins/Ui/skinned/CMakeLists.txt
+++ b/src/plugins/Ui/skinned/CMakeLists.txt
@@ -5,11 +5,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
@@ -571,7 +571,7 @@ index 6e2e14d..36916b3 100644
SET(skinned_SRCS
fft.c
balancebar.cpp
@@ -95,10 +90,7 @@ QT5_WRAP_UI(skinned_UIS_H ${skinned_UIS})
@@ -96,10 +91,7 @@ QT5_WRAP_UI(skinned_UIS_H ${skinned_UIS})
# the UI file won't be wrapped!
include_directories(${CMAKE_CURRENT_BINARY_DIR})
@@ -584,7 +584,7 @@ index 6e2e14d..36916b3 100644
-install(FILES scripts/kwin.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/qmmp${APP_NAME_SUFFIX}/scripts)
-ENDIF(X11_FOUND)
diff --git a/src/plugins/Ui/skinned/display.cpp b/src/plugins/Ui/skinned/display.cpp
index ca836dd..2da7c10 100644
index 34749d4..d9b0d45 100644
--- a/src/plugins/Ui/skinned/display.cpp
+++ b/src/plugins/Ui/skinned/display.cpp
@@ -344,7 +344,9 @@ void MainDisplay::mousePressEvent(QMouseEvent *e)
@@ -598,10 +598,10 @@ index ca836dd..2da7c10 100644
PixmapWidget::mousePressEvent(e);
}
diff --git a/src/plugins/Ui/skinned/mainwindow.cpp b/src/plugins/Ui/skinned/mainwindow.cpp
index 5bef7a1..8571253 100644
index 94afe4f..4bca5ee 100644
--- a/src/plugins/Ui/skinned/mainwindow.cpp
+++ b/src/plugins/Ui/skinned/mainwindow.cpp
@@ -361,6 +361,7 @@ void MainWindow::showSettings()
@@ -358,6 +358,7 @@ void MainWindow::showSettings()
SkinnedSettings *skinnedSettings = new SkinnedSettings(this);
confDialog->addPage(tr("Appearance"), skinnedSettings, QIcon(":/skinned/interface.png"));
confDialog->addPage(tr("Shortcuts"), new HotkeyEditor(this), QIcon(":/skinned/shortcuts.png"));
@@ -610,10 +610,10 @@ index 5bef7a1..8571253 100644
skinnedSettings->writeSettings();
confDialog->deleteLater();
diff --git a/src/plugins/Ui/skinned/skinreader.cpp b/src/plugins/Ui/skinned/skinreader.cpp
index 96df4d7..21eb68a 100644
index f4fc93f..44fa6e1 100644
--- a/src/plugins/Ui/skinned/skinreader.cpp
+++ b/src/plugins/Ui/skinned/skinreader.cpp
@@ -49,7 +49,7 @@ void SkinReader::generateThumbs()
@@ -50,7 +50,7 @@ void SkinReader::generateThumbs()
QDir dir(Qmmp::configDir() + "/skins");
dir.setFilter( QDir::Files | QDir::Hidden | QDir::NoSymLinks);
QFileInfoList f = dir.entryInfoList();
@@ -623,7 +623,7 @@ index 96df4d7..21eb68a 100644
#else
dir.setPath(Qmmp::dataPath() + "/skins");
diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp
index 8151fd4..739a005 100644
index cc752bb..3683c35 100644
--- a/src/qmmp/qmmp.cpp
+++ b/src/qmmp/qmmp.cpp
@@ -54,6 +54,8 @@ QString Qmmp::configDir()
@@ -648,5 +648,5 @@ index 8151fd4..739a005 100644
#else
QDir dir(fallbackPath);
--
2.30.0
2.30.2

View File

@@ -6,7 +6,7 @@ COPYRIGHT="2006-2021 Qmmp Development Team"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://qmmp.ylsoftware.com/files/qmmp-$portVersion.tar.bz2"
CHECKSUM_SHA256="f513774357836ad4983fa216c84cf5db634284faebec48c461733838917fd664"
CHECKSUM_SHA256="2f796bdbfeee4c1226541e746bcfea3d5b983a559081529e4c86a2c792026be7"
PATCHES="qmmp-$portVersion.patchset"
ADDITIONAL_FILES="
qmmp.rdef.in