mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
qmmp: bump to 2.2.5 (#12382)
This commit is contained in:
kenmays
GitHub
@@ -1,4 +1,4 @@
|
||||
From 8fb34a199e131b0466c80d8a02921a6a8ecfb833 Mon Sep 17 00:00:00 2001
|
||||
From b6af7410facfe75c20b255c42aaa4a355072ff65 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sat, 8 Mar 2025 23:09:49 +1000
|
||||
Subject: Fix for Haiku
|
||||
@@ -493,7 +493,7 @@ index 0000000..f678c61
|
||||
+ </qresource>
|
||||
+</RCC>
|
||||
diff --git a/src/plugins/Ui/qsui/qsuimainwindow.cpp b/src/plugins/Ui/qsui/qsuimainwindow.cpp
|
||||
index 3d2700a..01e87d5 100644
|
||||
index 74121a4..56abaef 100644
|
||||
--- a/src/plugins/Ui/qsui/qsuimainwindow.cpp
|
||||
+++ b/src/plugins/Ui/qsui/qsuimainwindow.cpp
|
||||
@@ -334,6 +334,7 @@ void QSUiMainWindow::showSettings()
|
||||
@@ -545,78 +545,12 @@ index 90c85bb..ce45d7f 100644
|
||||
2.48.1
|
||||
|
||||
|
||||
From d56844cf6b4d04820978cdc745c1a8fa2d1e101f Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 9 Mar 2025 07:03:03 +0000
|
||||
Subject: Fix build archive input plugin
|
||||
|
||||
|
||||
diff --git a/src/plugins/Input/archive/archivetagreader.cpp b/src/plugins/Input/archive/archivetagreader.cpp
|
||||
index 285b573..51777c6 100644
|
||||
--- a/src/plugins/Input/archive/archivetagreader.cpp
|
||||
+++ b/src/plugins/Input/archive/archivetagreader.cpp
|
||||
@@ -79,7 +79,7 @@ public:
|
||||
{
|
||||
return m_input->isOpen();
|
||||
}
|
||||
- virtual void seek(long offset, Position p = Beginning) override
|
||||
+ virtual void seek(TagLib::offset_t offset, Position p = Beginning)
|
||||
{
|
||||
switch (p)
|
||||
{
|
||||
@@ -99,15 +99,15 @@ public:
|
||||
m_input->seek(0);
|
||||
TagLib::IOStream::clear();
|
||||
}
|
||||
- virtual long tell() const override
|
||||
+ virtual TagLib::offset_t tell() const
|
||||
{
|
||||
return m_input->pos();
|
||||
}
|
||||
- virtual long length() override
|
||||
+ virtual TagLib::offset_t length()
|
||||
{
|
||||
return m_input->size();
|
||||
}
|
||||
- virtual void truncate(long) override
|
||||
+ virtual void truncate(TagLib::offset_t)
|
||||
{}
|
||||
|
||||
private:
|
||||
--
|
||||
2.48.1
|
||||
|
||||
|
||||
From 03bc9e1d8ff1a9bd410fa6cd898ac1ea13aab01e Mon Sep 17 00:00:00 2001
|
||||
From 3948fe172e78daa364d7f4b758d88ced08077561 Mon Sep 17 00:00:00 2001
|
||||
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
||||
Date: Sun, 9 Mar 2025 19:02:39 +1000
|
||||
Subject: Fix skins paths
|
||||
|
||||
|
||||
diff --git a/src/plugins/Ui/skinned/skinnedsettings.cpp b/src/plugins/Ui/skinned/skinnedsettings.cpp
|
||||
index a8f3061..96b38b3 100644
|
||||
--- a/src/plugins/Ui/skinned/skinnedsettings.cpp
|
||||
+++ b/src/plugins/Ui/skinned/skinnedsettings.cpp
|
||||
@@ -83,7 +83,7 @@ void SkinnedSettings::on_skinInstallButton_clicked()
|
||||
for(const QString &path : std::as_const(files))
|
||||
{
|
||||
QFile file(path);
|
||||
- file.copy(Qmmp::userDataPath() + u"/skins"_s + QFileInfo(path).fileName());
|
||||
+ file.copy(Qmmp::userDataPath() + u"/skins/"_s + QFileInfo(path).fileName());
|
||||
}
|
||||
loadSkins();
|
||||
}
|
||||
@@ -144,6 +144,10 @@ void SkinnedSettings::loadSkins()
|
||||
Qmmp::configDir() + QStringLiteral("/skins"),
|
||||
#if defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN)
|
||||
qApp->applicationDirPath() + QStringLiteral("/skins")
|
||||
+#elif defined(Q_OS_HAIKU)
|
||||
+ qApp->applicationDirPath() + QStringLiteral("/skins"),
|
||||
+ Qmmp::userDataPath() + QStringLiteral("/skins"),
|
||||
+ Qmmp::dataPath() + QStringLiteral("/skins")
|
||||
#else
|
||||
Qmmp::userDataPath() + QStringLiteral("/skins"),
|
||||
Qmmp::dataPath() + QStringLiteral("/skins"),
|
||||
diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp
|
||||
index ce45d7f..251310b 100644
|
||||
--- a/src/qmmp/qmmp.cpp
|
||||
@@ -4,9 +4,9 @@ The user interface is similar to winamp or xmms."
|
||||
HOMEPAGE="http://qmmp.ylsoftware.com/"
|
||||
COPYRIGHT="2006-2025 Qmmp Development Team"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://qmmp.ylsoftware.com/files/qmmp/2.2/qmmp-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="993e57d8e11b083bb6f246738505edf35d498ffe82a1936f3129b8bb09eab244"
|
||||
CHECKSUM_SHA256="58211f327ac385abbc7d75e6a5d8dd64bcdb5cc0f1119329f2927d1631097e18"
|
||||
PATCHES="qmmp-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="
|
||||
qmmp.rdef.in
|
||||
@@ -18,11 +18,14 @@ ADDITIONAL_FILES="
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
libVersion=$portVersion
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
qmmp$secondaryArchSuffix = $portVersion
|
||||
app:Qmmp$secondaryArchSuffix = $portVersion
|
||||
lib:libqmmp$secondaryArchSuffix = $portVersion
|
||||
lib:libqmmpui$secondaryArchSuffix = $portVersion
|
||||
app:Qmmp = $portVersion
|
||||
lib:libqmmp$secondaryArchSuffix = $libVersionCompat
|
||||
lib:libqmmpui$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -52,9 +55,15 @@ REQUIRES="
|
||||
lib:libogg$secondaryArchSuffix
|
||||
lib:libopus$secondaryArchSuffix
|
||||
lib:libopusfile$secondaryArchSuffix
|
||||
lib:libQt6Concurrent$secondaryArchSuffix
|
||||
lib:libQt6Core$secondaryArchSuffix
|
||||
lib:libQt6Gui$secondaryArchSuffix
|
||||
lib:libQt6Multimedia$secondaryArchSuffix
|
||||
lib:libQt6Network$secondaryArchSuffix
|
||||
lib:libQt6OpenGL$secondaryArchSuffix
|
||||
lib:libQt6Sql$secondaryArchSuffix
|
||||
lib:libQt6Widgets$secondaryArchSuffix
|
||||
lib:libQt6Xml$secondaryArchSuffix
|
||||
lib:libshout$secondaryArchSuffix
|
||||
lib:libsidplayfp$secondaryArchSuffix
|
||||
lib:libsndfile$secondaryArchSuffix
|
||||
@@ -70,8 +79,8 @@ REQUIRES="
|
||||
|
||||
PROVIDES_devel="
|
||||
qmmp${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libqmmp$secondaryArchSuffix = 0.0.0 compat >= 0
|
||||
devel:libqmmpui$secondaryArchSuffix = 0.0.0 compat >= 0
|
||||
devel:libqmmp$secondaryArchSuffix = $libVersionCompat
|
||||
devel:libqmmpui$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
qmmp$secondaryArchSuffix == $portVersion base
|
||||
@@ -104,10 +113,15 @@ BUILD_REQUIRES="
|
||||
devel:libopenal$secondaryArchSuffix
|
||||
devel:libopus$secondaryArchSuffix
|
||||
devel:libopusfile$secondaryArchSuffix
|
||||
devel:libQt6Concurrent$secondaryArchSuffix
|
||||
devel:libQt6Core$secondaryArchSuffix
|
||||
devel:libQt6Gui$secondaryArchSuffix
|
||||
devel:libQt6Widgets$secondaryArchSuffix
|
||||
devel:libQt6Multimedia$secondaryArchSuffix
|
||||
devel:libQt6Network$secondaryArchSuffix
|
||||
devel:libQt6OpenGL$secondaryArchSuffix
|
||||
devel:libQt6Sql$secondaryArchSuffix
|
||||
devel:libQt6Widgets$secondaryArchSuffix
|
||||
devel:libQt6Xml$secondaryArchSuffix
|
||||
devel:libshout$secondaryArchSuffix
|
||||
devel:libsidplayfp$secondaryArchSuffix
|
||||
devel:libsndfile$secondaryArchSuffix
|
||||
@@ -147,6 +161,7 @@ BUILD()
|
||||
-DCMAKE_INSTALL_LIBDIR=$libDir \
|
||||
-DCMAKE_INSTALL_DATADIR=$dataDir \
|
||||
-DPLUGIN_DIR=$appsDir/Qmmp/plugins \
|
||||
-DOPENGL_INCLUDE_DIR=`finddir B_SYSTEM_HEADERS_DIRECTORY`${secondaryArchSubDir} \
|
||||
-DUSE_GNOMEHOTKEY=OFF \
|
||||
-DUSE_HAL=OFF \
|
||||
-DUSE_HOTKEY=OFF \
|
||||
Reference in New Issue
Block a user