qmmp, revbump, build fixes, switch to newer flac (#10996)

This commit is contained in:
Schrijvers Luc
2024-08-31 09:44:56 +02:00
committed by GitHub
parent a3ae526a75
commit 4c3d827f3b
2 changed files with 40 additions and 11 deletions

View File

@@ -1,4 +1,4 @@
From bf79cb1967debdfc0b034190b5272be3826754bb Mon Sep 17 00:00:00 2001
From 24f5b1d3dc8349cc4501267274f22d8c1bf927f4 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 9 Jan 2022 00:21:32 +1000
Subject: Add haiku support
@@ -589,5 +589,31 @@ index 477deca..f411e69 100644
#else
QDir dir(fallbackPath);
--
2.30.2
2.45.2
From 083bea2fe0e953be8ccce0ca720517b210feb3d2 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 31 Aug 2024 09:16:51 +0200
Subject: Build fix
diff --git a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
index 8e4175f..14ce070 100644
--- a/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
+++ b/src/plugins/Input/ffmpeg/decoderffmpegfactory.cpp
@@ -299,9 +299,9 @@ QList<TrackInfo *> DecoderFFmpegFactory::createPlayList(const QString &path, Tra
if(title)
info->setValue(Qmmp::TITLE, QString::fromUtf8(title->value).trimmed());
if(year)
- info->setValue(Qmmp::YEAR, year->value);
+ info->setValue(Qmmp::YEAR, QString::fromUtf8(year->value).trimmed());
if(track)
- info->setValue(Qmmp::TRACK, track->value);
+ info->setValue(Qmmp::TRACK, QString::fromUtf8(track->value).trimmed());
if(in->nb_chapters > 1 && filePath.endsWith(".m4b", Qt::CaseInsensitive))
{
--
2.45.2

View File

@@ -4,7 +4,7 @@ The user interface is similar to winamp or xmms."
HOMEPAGE="http://qmmp.ylsoftware.com/"
COPYRIGHT="2006-2022 Qmmp Development Team"
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="https://qmmp.ylsoftware.com/files/qmmp/2.0/qmmp-$portVersion.tar.bz2"
CHECKSUM_SHA256="3786a687b366abec91e279772176b6881e44daa9102136026be765f903b9822e"
PATCHES="qmmp-$portVersion.patchset"
@@ -133,11 +133,10 @@ BUILD()
{
mkdir -p build
cd build
cmake .. $cmakeDirArgs \
-DCMAKE_INSTALL_PREFIX=$appsDir/Qmmp \
cmake .. -DCMAKE_BUILD_TYPE=RELEASE \
$cmakeDirArgs \
-DCMAKE_INSTALL_BINDIR=$appsDir/Qmmp \
-DPLUGIN_DIR=$appsDir/Qmmp/plugins \
-DCMAKE_BUILD_TYPE=RELEASE \
-DUSE_GNOMEHOTKEY=OFF \
-DUSE_HAL=OFF \
-DUSE_HOTKEY=OFF \
@@ -160,11 +159,7 @@ INSTALL()
mkdir -p $appsDir/Qmmp/skins
cp -f $portDir/additional-files/*.wsz $appsDir/Qmmp/skins
mv $appsDir/Qmmp/qmmp $appsDir/Qmmp/Qmmp
rm -rf $dataDir
fixPkgconfig
prepareInstalledDevelLibs libqmmp libqmmpui
packageEntries devel $developDir
rm -rf $dataDir/{applications,icons,metainfo,qmmp,solid}
local APP_SIGNATURE="application/x-vnd.qt5-qmmp"
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
@@ -181,4 +176,12 @@ INSTALL()
addResourcesToBinaries qmmp.rdef $appsDir/Qmmp/Qmmp
addAppDeskbarSymlink $appsDir/Qmmp/Qmmp
prepareInstalledDevelLibs \
libqmmp \
libqmmpui
fixPkgconfig
packageEntries devel \
$developDir
}