Skip to content

Commit 90f015e

Browse files
committed
sonic-visualiser: update to 5.2.1
1 parent e38fb07 commit 90f015e

File tree

3 files changed

+80
-9
lines changed

3 files changed

+80
-9
lines changed
Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
from https://github.com/sonic-visualiser/sonic-visualiser/issues/112
2+
fixed in https://github.com/sonic-visualiser/svcore/commit/2dee776aad88060d41086c4fb0191ecb0bded86c
3+
4+
diff --git a/data/model/EditableDenseThreeDimensionalModel.cpp b/data/model/EditableDenseThreeDimensionalModel.cpp
5+
index da5ff904..7a621631 100644
6+
--- a/svcore/data/model/EditableDenseThreeDimensionalModel.cpp
7+
+++ b/svcore/data/model/EditableDenseThreeDimensionalModel.cpp
8+
@@ -458,10 +458,10 @@ EditableDenseThreeDimensionalModel::toXml(QTextStream &out,
9+
Model::toXml
10+
(out, indent,
11+
QString("type=\"dense\" dimensions=\"3\" windowSize=\"%1\" yBinCount=\"%2\" minimum=\"%3\" maximum=\"%4\" dataset=\"%5\" startFrame=\"%6\" %7")
12+
- .arg(m_resolution)
13+
- .arg(m_yBinCount)
14+
- .arg(m_minimum)
15+
- .arg(m_maximum)
16+
+ .arg(m_resolution.load())
17+
+ .arg(m_yBinCount.load())
18+
+ .arg(m_minimum.load())
19+
+ .arg(m_maximum.load())
20+
.arg(getExportId())
21+
.arg(m_startFrame)
22+
.arg(extraAttributes));
23+
diff --git a/data/model/NoteModel.h b/data/model/NoteModel.h
24+
index 8c3a421e..28e145c2 100644
25+
--- a/svcore/data/model/NoteModel.h
26+
+++ b/svcore/data/model/NoteModel.h
27+
@@ -403,8 +403,8 @@ class NoteModel : public Model,
28+
.arg(m_events.getExportId())
29+
.arg(m_subtype == FLEXI_NOTE ? "flexinote" : "note")
30+
.arg(m_valueQuantization)
31+
- .arg(m_valueMinimum)
32+
- .arg(m_valueMaximum)
33+
+ .arg(m_valueMinimum.load())
34+
+ .arg(m_valueMaximum.load())
35+
.arg(encodeEntities(m_units))
36+
.arg(extraAttributes));
37+
38+
diff --git a/data/model/RegionModel.h b/data/model/RegionModel.h
39+
index 916a0477..db021ae7 100644
40+
--- a/svcore/data/model/RegionModel.h
41+
+++ b/svcore/data/model/RegionModel.h
42+
@@ -335,8 +335,8 @@ class RegionModel : public Model,
43+
.arg(m_events.getExportId())
44+
.arg("region")
45+
.arg(m_valueQuantization)
46+
- .arg(m_valueMinimum)
47+
- .arg(m_valueMaximum)
48+
+ .arg(m_valueMinimum.load())
49+
+ .arg(m_valueMaximum.load())
50+
.arg(encodeEntities(m_units))
51+
.arg(extraAttributes));
52+
53+
diff --git a/data/model/SparseTimeValueModel.h b/data/model/SparseTimeValueModel.h
54+
index fe6e70cc..70335038 100644
55+
--- a/svcore/data/model/SparseTimeValueModel.h
56+
+++ b/svcore/data/model/SparseTimeValueModel.h
57+
@@ -342,8 +342,8 @@ class SparseTimeValueModel : public Model,
58+
.arg("true") // always true after model reaches 100% -
59+
// subsequent events are always notified
60+
.arg(m_events.getExportId())
61+
- .arg(m_valueMinimum)
62+
- .arg(m_valueMaximum)
63+
+ .arg(m_valueMinimum.load())
64+
+ .arg(m_valueMaximum.load())
65+
.arg(encodeEntities(m_units))
66+
.arg(extraAttributes));
67+

srcpkgs/sonic-visualiser/template

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
# Template file for 'sonic-visualiser'
22
pkgname=sonic-visualiser
3-
version=4.5.2
4-
revision=3
3+
version=5.2.1
4+
revision=1
55
build_style=meson
6-
hostmakedepends="pkg-config capnproto-devel qt5-host-tools"
6+
hostmakedepends="pkg-config capnproto-devel qt6-base qt6-tools"
77
makedepends="capnproto-devel jack-devel libfishsound-devel libid3tag-devel
8-
liblo-devel liblrdf-devel libmad-devel liboggz-devel libsamplerate-devel
9-
opusfile-devel portaudio-devel pulseaudio-devel qt5-svg-devel rubberband-devel
10-
speex-devel sord-devel vamp-plugin-sdk-devel"
8+
liblo-devel liblrdf-devel libmad-devel liboggz-devel libopusenc-devel
9+
libsamplerate-devel opusfile-devel portaudio-devel pulseaudio-devel
10+
qt6-svg-devel rubberband-devel sord-devel speex-devel vamp-plugin-sdk-devel"
1111
short_desc="Viewing and analysing the contents of music audio files"
1212
maintainer="newbluemoon <blaumolch@mailbox.org>"
1313
license="GPL-2.0-or-later"
1414
homepage="https://www.sonicvisualiser.org/"
1515
changelog="https://raw.githubusercontent.com/sonic-visualiser/sonic-visualiser/default/CHANGELOG"
1616
distfiles="https://github.com/sonic-visualiser/sonic-visualiser/releases/download/sv_v${version}/sonic-visualiser-${version}.tar.gz"
17-
checksum=0816e1ba9e3f97af495ece2554186bccad1cf47090ff8a13f1d08322212db487
17+
checksum=2f338af0231e930539c5e5e04dac7c3384257866cc29fda112215f8c410898c9
18+
LDFLAGS+="-lopusenc"
19+
20+
if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
21+
nocross="meson tries to find qt6 host tool under target wordsize lib dir"
22+
fi

srcpkgs/sonic-visualiser/update

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
site="https://code.soundsoftware.ac.uk/projects/sonic-visualiser/files"
2-
ignore="*pre*"
1+
pkgname=sv

0 commit comments

Comments
 (0)