From 01e8cbc402db7b9daaaf33702ecd728641134fef Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Fri, 19 Aug 2022 21:09:45 +0200 Subject: [PATCH] Patch to fix FTBFS with JUCE-7.0.2 --- debian/patches/juce-7_0_2.patch | 42 +++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 43 insertions(+) create mode 100644 debian/patches/juce-7_0_2.patch diff --git a/debian/patches/juce-7_0_2.patch b/debian/patches/juce-7_0_2.patch new file mode 100644 index 0000000..e223930 --- /dev/null +++ b/debian/patches/juce-7_0_2.patch @@ -0,0 +1,42 @@ +Description: fix build failures with JUCE-7.0.2 +Author: IOhannes m zmölnig +Origin: Debian +Bug: https://github.com/monocasual/giada/issues/604 +Last-Update: 2022-08-19 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- giada.orig/src/core/plugins/pluginHost.cpp ++++ giada/src/core/plugins/pluginHost.cpp +@@ -49,14 +49,15 @@ + + /* -------------------------------------------------------------------------- */ + +-bool PluginHost::Info::getCurrentPosition(CurrentPositionInfo& result) ++juce::Optional PluginHost::Info::getPosition() const + { +- result.bpm = m_sequencer.getBpm(); +- result.timeInSamples = m_sequencer.getCurrentFrame(); +- result.timeInSeconds = m_sequencer.getCurrentSecond(m_sampleRate); +- result.isPlaying = m_sequencer.isRunning(); ++ juce::Optional info; ++ info->setBpm (m_sequencer.getBpm()); ++ info->setTimeInSamples (m_sequencer.getCurrentFrame()); ++ info->setTimeInSeconds (m_sequencer.getCurrentSecond(m_sampleRate)); ++ info->setIsPlaying (m_sequencer.isRunning()); + +- return true; ++ return info; + } + + /* -------------------------------------------------------------------------- */ +--- giada.orig/src/core/plugins/pluginHost.h ++++ giada/src/core/plugins/pluginHost.h +@@ -60,7 +60,7 @@ + public: + Info(const Sequencer&, int sampleRate); + +- bool getCurrentPosition(CurrentPositionInfo& result) override; ++ juce::Optional getPosition() const override; + bool canControlTransport() override; + + private: diff --git a/debian/patches/series b/debian/patches/series index b43d5c6..0368458 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 04-system-json.patch RtAudio52.patch 06-system-jpg+png.patch +juce-7_0_2.patch -- 2.30.2