From 7e5729c647bbf9b5f29b48f5a02e7faa5acc6bf2 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sun, 29 Sep 2024 14:19:46 +0200 Subject: [PATCH 1/2] sonic-visualiser: update to 5.2.1 --- .../sonic-visualiser/patches/svcore-fix.patch | 67 +++++++++++++++++++ srcpkgs/sonic-visualiser/template | 15 +++-- srcpkgs/sonic-visualiser/update | 3 +- 3 files changed, 76 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/sonic-visualiser/patches/svcore-fix.patch diff --git a/srcpkgs/sonic-visualiser/patches/svcore-fix.patch b/srcpkgs/sonic-visualiser/patches/svcore-fix.patch new file mode 100644 index 00000000000000..6d757a9c0d50a9 --- /dev/null +++ b/srcpkgs/sonic-visualiser/patches/svcore-fix.patch @@ -0,0 +1,67 @@ +from https://github.com/sonic-visualiser/sonic-visualiser/issues/112 +fixed in https://github.com/sonic-visualiser/svcore/commit/2dee776aad88060d41086c4fb0191ecb0bded86c + +diff --git a/data/model/EditableDenseThreeDimensionalModel.cpp b/data/model/EditableDenseThreeDimensionalModel.cpp +index da5ff904..7a621631 100644 +--- a/svcore/data/model/EditableDenseThreeDimensionalModel.cpp ++++ b/svcore/data/model/EditableDenseThreeDimensionalModel.cpp +@@ -458,10 +458,10 @@ EditableDenseThreeDimensionalModel::toXml(QTextStream &out, + Model::toXml + (out, indent, + QString("type=\"dense\" dimensions=\"3\" windowSize=\"%1\" yBinCount=\"%2\" minimum=\"%3\" maximum=\"%4\" dataset=\"%5\" startFrame=\"%6\" %7") +- .arg(m_resolution) +- .arg(m_yBinCount) +- .arg(m_minimum) +- .arg(m_maximum) ++ .arg(m_resolution.load()) ++ .arg(m_yBinCount.load()) ++ .arg(m_minimum.load()) ++ .arg(m_maximum.load()) + .arg(getExportId()) + .arg(m_startFrame) + .arg(extraAttributes)); +diff --git a/data/model/NoteModel.h b/data/model/NoteModel.h +index 8c3a421e..28e145c2 100644 +--- a/svcore/data/model/NoteModel.h ++++ b/svcore/data/model/NoteModel.h +@@ -403,8 +403,8 @@ class NoteModel : public Model, + .arg(m_events.getExportId()) + .arg(m_subtype == FLEXI_NOTE ? "flexinote" : "note") + .arg(m_valueQuantization) +- .arg(m_valueMinimum) +- .arg(m_valueMaximum) ++ .arg(m_valueMinimum.load()) ++ .arg(m_valueMaximum.load()) + .arg(encodeEntities(m_units)) + .arg(extraAttributes)); + +diff --git a/data/model/RegionModel.h b/data/model/RegionModel.h +index 916a0477..db021ae7 100644 +--- a/svcore/data/model/RegionModel.h ++++ b/svcore/data/model/RegionModel.h +@@ -335,8 +335,8 @@ class RegionModel : public Model, + .arg(m_events.getExportId()) + .arg("region") + .arg(m_valueQuantization) +- .arg(m_valueMinimum) +- .arg(m_valueMaximum) ++ .arg(m_valueMinimum.load()) ++ .arg(m_valueMaximum.load()) + .arg(encodeEntities(m_units)) + .arg(extraAttributes)); + +diff --git a/data/model/SparseTimeValueModel.h b/data/model/SparseTimeValueModel.h +index fe6e70cc..70335038 100644 +--- a/svcore/data/model/SparseTimeValueModel.h ++++ b/svcore/data/model/SparseTimeValueModel.h +@@ -342,8 +342,8 @@ class SparseTimeValueModel : public Model, + .arg("true") // always true after model reaches 100% - + // subsequent events are always notified + .arg(m_events.getExportId()) +- .arg(m_valueMinimum) +- .arg(m_valueMaximum) ++ .arg(m_valueMinimum.load()) ++ .arg(m_valueMaximum.load()) + .arg(encodeEntities(m_units)) + .arg(extraAttributes)); + diff --git a/srcpkgs/sonic-visualiser/template b/srcpkgs/sonic-visualiser/template index 554a1bff0fc89e..ac61a7468e4d03 100644 --- a/srcpkgs/sonic-visualiser/template +++ b/srcpkgs/sonic-visualiser/template @@ -1,17 +1,18 @@ # Template file for 'sonic-visualiser' pkgname=sonic-visualiser -version=4.5.2 -revision=4 +version=5.2.1 +revision=1 build_style=meson -hostmakedepends="pkg-config capnproto-devel qt5-host-tools" +hostmakedepends="pkg-config capnproto-devel qt6-base qt6-tools" makedepends="capnproto-devel jack-devel libfishsound-devel libid3tag-devel - liblo-devel liblrdf-devel libmad-devel liboggz-devel libsamplerate-devel - opusfile-devel portaudio-devel pulseaudio-devel qt5-svg-devel rubberband-devel - speex-devel sord-devel vamp-plugin-sdk-devel" + liblo-devel liblrdf-devel libmad-devel liboggz-devel libopusenc-devel + libsamplerate-devel opusfile-devel portaudio-devel pulseaudio-devel + qt6-svg-devel rubberband-devel sord-devel speex-devel vamp-plugin-sdk-devel" short_desc="Viewing and analysing the contents of music audio files" maintainer="newbluemoon " license="GPL-2.0-or-later" homepage="https://www.sonicvisualiser.org/" changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/default/CHANGELOG" distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz" -checksum=0816e1ba9e3f97af495ece2554186bccad1cf47090ff8a13f1d08322212db487 +checksum=2f338af0231e930539c5e5e04dac7c3384257866cc29fda112215f8c410898c9 +LDFLAGS+="-lopusenc" diff --git a/srcpkgs/sonic-visualiser/update b/srcpkgs/sonic-visualiser/update index c6bb05147b3c4b..a78243342d2889 100644 --- a/srcpkgs/sonic-visualiser/update +++ b/srcpkgs/sonic-visualiser/update @@ -1,2 +1 @@ -site="https://code.soundsoftware.ac.uk/projects/sonic-visualiser/files" -ignore="*pre*" +pkgname=sv From e07c001f73206760da9ff8e7347540314af5c132 Mon Sep 17 00:00:00 2001 From: newbluemoon Date: Sun, 21 Dec 2025 14:20:41 +0100 Subject: [PATCH 2/2] common: add qt host binaries to meson cross profile When cross building 32 bit qt6 packages on 64 bit hosts the qt6 host tools are not found, because the path is determined via pkgconfig which points to /usr/lib32. Adding the required binaries to the cross profile as a workaround to resolve this. --- common/build-helper/meson.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/build-helper/meson.sh b/common/build-helper/meson.sh index 69b30555fce672..4d94e7afbeaf0c 100644 --- a/common/build-helper/meson.sh +++ b/common/build-helper/meson.sh @@ -76,6 +76,8 @@ cat > "${XBPS_WRAPPERDIR}/meson/xbps_meson.cross" <<-EOF cups-config = '${XBPS_CROSS_BASE}/usr/bin/cups-config' qmake6 = 'qmake6' qmake5 = 'qmake5' + moc = '/usr/lib/qt6/libexec/moc' + rcc = '/usr/lib/qt6/libexec/rcc' [properties] needs_exe_wrapper = true