Bug#946917: muse: diff for NMU version 3.0.2+ds1-1.1
Control: tags 946917 + pending
Dear maintainer,
I've prepared an NMU for muse (versioned as 3.0.2+ds1-1.1) and uploaded
it to DELAYED/14. Please feel free to tell me if I should cancel it.
cu
Adrian
diff -Nru muse-3.0.2+ds1/debian/changelog muse-3.0.2+ds1/debian/changelog
--- muse-3.0.2+ds1/debian/changelog 2018-12-16 15:37:01.000000000 +0200
+++ muse-3.0.2+ds1/debian/changelog 2020-01-15 13:59:30.000000000 +0200
@@ -1,3 +1,12 @@
+muse (3.0.2+ds1-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Backport upstream fix for FTBFS with fluidsynth 2.
+ (Closes: #946917)
+ * Update Homepage and debian/watch for new upstream location.
+
+ -- Adrian Bunk <bunk@debian.org> Wed, 15 Jan 2020 13:59:30 +0200
+
muse (3.0.2+ds1-1) unstable; urgency=medium
* Team upload.
diff -Nru muse-3.0.2+ds1/debian/control muse-3.0.2+ds1/debian/control
--- muse-3.0.2+ds1/debian/control 2018-12-16 15:37:01.000000000 +0200
+++ muse-3.0.2+ds1/debian/control 2020-01-15 13:59:30.000000000 +0200
@@ -23,7 +23,7 @@
qtbase5-dev,
qttools5-dev
Standards-Version: 4.2.1
-Homepage: http://www.muse-sequencer.org/
+Homepage: https://github.com/muse-sequencer/muse
Vcs-Git: https://salsa.debian.org/multimedia-team/muse.git
Vcs-Browser: https://salsa.debian.org/multimedia-team/muse
diff -Nru muse-3.0.2+ds1/debian/patches/0001-fluidsynth-Follow-API-change-introduced-in-fluidsynt.patch muse-3.0.2+ds1/debian/patches/0001-fluidsynth-Follow-API-change-introduced-in-fluidsynt.patch
--- muse-3.0.2+ds1/debian/patches/0001-fluidsynth-Follow-API-change-introduced-in-fluidsynt.patch 1970-01-01 02:00:00.000000000 +0200
+++ muse-3.0.2+ds1/debian/patches/0001-fluidsynth-Follow-API-change-introduced-in-fluidsynt.patch 2020-01-15 13:55:52.000000000 +0200
@@ -0,0 +1,142 @@
+From 6e352b874ddffc6185e499cda12c1731d14a3708 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+Date: Wed, 17 Oct 2018 23:17:31 +0200
+Subject: fluidsynth: Follow API change introduced in fluidsynth 2.0.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+---
+ synti/fluidsynth/fluidsynti.cpp | 44 ++++++++++++++++++++++++++-
+ 1 file changed, 43 insertions(+), 1 deletion(-)
+
+diff --git a/muse3/synti/fluidsynth/fluidsynti.cpp b/muse3/synti/fluidsynth/fluidsynti.cpp
+index 11f51e57..75322d7e 100644
+--- a/synti/fluidsynth/fluidsynti.cpp
++++ b/synti/fluidsynth/fluidsynti.cpp
+@@ -155,16 +155,22 @@ FluidSynth::~FluidSynth()
+ std::cerr << DEBUG_ARGS << "Error unloading soundfont!" << fluid_synth_error(fluidsynth) << std::endl;
+ }
+
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ int err = delete_fluid_synth (fluidsynth);
++#else
++ delete_fluid_synth (fluidsynth);
++#endif
+ if(gui)
+ delete gui;
+
+ if (initBuffer)
+ delete [] initBuffer;
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ if (err == -1) {
+ std::cerr << DEBUG_ARGS << "error while destroying synth: " << fluid_synth_error(fluidsynth) << std::endl;
+ return;
+- }
++ }
++#endif
+ }
+
+ bool FluidSynth::init(const char* name)
+@@ -1368,7 +1374,11 @@ const char* FluidSynth::getPatchName(int i, int, bool /*drum*/) const
+ else {
+ fluid_preset_t *preset = fluid_synth_get_channel_preset(fluidsynth, i);
+ if (!preset) return "<unknown>";
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ return preset->get_name(preset);
++#else
++ return fluid_preset_get_name(preset);
++#endif
+ }
+ }
+ //---------------------------------------------------------
+@@ -1414,12 +1424,20 @@ const MidiPatch* FluidSynth::getFirstPatch (int channel) const
+ if (!channels[channel].drumchannel) {
+ for (unsigned bank = 0; bank < 128; ++bank) {
+ for (unsigned patch = 0; patch < 128; ++patch) {
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ preset = sfont->get_preset (sfont, bank, patch);
++#else
++ preset = fluid_sfont_get_preset (sfont, bank, patch);
++#endif
+ if (preset) {
+ midiPatch.hbank = bank;
+ midiPatch.lbank = 0xff; // Off
+ midiPatch.prog = patch;
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ midiPatch.name = preset->get_name (preset);
++#else
++ midiPatch.name = fluid_preset_get_name (preset);
++#endif
+ return &midiPatch;
+ }
+ }
+@@ -1429,12 +1447,20 @@ const MidiPatch* FluidSynth::getFirstPatch (int channel) const
+ else { //This is a drumchannel
+ int bank = 128;
+ for (unsigned patch = 0; patch < 128; ++patch) {
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ preset = sfont->get_preset (sfont, bank, patch);
++#else
++ preset = fluid_sfont_get_preset (sfont, bank, patch);
++#endif
+ if (preset) {
+ midiPatch.hbank = 0xff; // Off
+ midiPatch.lbank = 0xff; // Off
+ midiPatch.prog = patch;
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ midiPatch.name = preset->get_name(preset);
++#else
++ midiPatch.name = fluid_preset_get_name (preset);
++#endif
+ return &midiPatch;
+ }
+ }
+@@ -1466,13 +1492,21 @@ const MidiPatch* FluidSynth::getNextPatch (int channel, const MidiPatch* patch)
+
+ for (unsigned bank = patch->hbank; bank < 128; ++bank) {
+ for ( ; prog < 128; ++prog) {
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ preset = sfont->get_preset (sfont, bank, prog);
++#else
++ preset = fluid_sfont_get_preset (sfont, bank, prog);
++#endif
+ if (preset) {
+ //printf("Preset info: bank: %d prog: %d name: %s\n", bank, prog, preset->get_name(preset));
+ midiPatch.hbank = bank;
+ midiPatch.lbank = 0xff; // Off
+ midiPatch.prog = prog;
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ midiPatch.name = preset->get_name (preset);
++#else
++ midiPatch.name = fluid_preset_get_name (preset);
++#endif
+ return &midiPatch;
+ }
+ }
+@@ -1483,13 +1517,21 @@ const MidiPatch* FluidSynth::getNextPatch (int channel, const MidiPatch* patch)
+ unsigned bank = 128;
+ unsigned prog = patch->prog;
+ for (prog = patch->prog + 1; prog < 128; ++prog) {
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ preset = sfont->get_preset (sfont, bank, prog);
++#else
++ preset = fluid_sfont_get_preset (sfont, bank, prog);
++#endif
+ if (preset) {
+ //printf("Preset info: bank: %d prog: %d name: %s\n",bank, prog, preset->get_name(preset));
+ midiPatch.hbank = 0xff; // Off
+ midiPatch.lbank = 0xff; // Off
+ midiPatch.prog = prog;
++#if FLUIDSYNTH_VERSION_MAJOR < 2
+ midiPatch.name = preset->get_name (preset);
++#else
++ midiPatch.name = fluid_preset_get_name (preset);
++#endif
+ return &midiPatch;
+ }
+ }
+--
+2.20.1
+
diff -Nru muse-3.0.2+ds1/debian/patches/series muse-3.0.2+ds1/debian/patches/series
--- muse-3.0.2+ds1/debian/patches/series 2018-12-16 15:18:40.000000000 +0200
+++ muse-3.0.2+ds1/debian/patches/series 2020-01-15 13:59:30.000000000 +0200
@@ -2,3 +2,4 @@
0002-Add-f-option-to-desktop-file-Exec-key.patch
0003-Fixes-compile-issue-with-QButtonGroup.patch
0004-Added-missing-includes-needed-by-newer-Qt-5.11.patch
+0001-fluidsynth-Follow-API-change-introduced-in-fluidsynt.patch
diff -Nru muse-3.0.2+ds1/debian/watch muse-3.0.2+ds1/debian/watch
--- muse-3.0.2+ds1/debian/watch 2018-12-16 14:46:39.000000000 +0200
+++ muse-3.0.2+ds1/debian/watch 2020-01-15 13:59:30.000000000 +0200
@@ -1,3 +1,3 @@
version=4
opts=uversionmangle=s/(alpha|beta|rc)/~$1/,dversionmangle=s/@DEB_EXT@//,repacksuffix=+ds1 \
-https://sf.net/lmuse/ muse-.*/muse-(.*)\.tar\.gz
+https://github.com/muse-sequencer/muse/tags .*/muse-(.*)\.tar\.gz
Reply to: