[SCM] giada/master: Add patch to fix FTBFS.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ea53b40c4d30a19ca823d092bc5b7239fa137309
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Nov 22 23:43:31 2016 +0100

    Add patch to fix FTBFS.

diff --git a/debian/patches/05-fix_FTBFS.patch b/debian/patches/05-fix_FTBFS.patch
new file mode 100644
index 0000000..862553a
--- /dev/null
+++ b/debian/patches/05-fix_FTBFS.patch
@@ -0,0 +1,97 @@
+Description: Fix FTBFS
+Author: <giadaloopmachine at gmail.com> upstream
+Forwarded: not-needed
+
+Index: giada/src/core/kernelMidi.cpp
+===================================================================
+--- giada.orig/src/core/kernelMidi.cpp
++++ giada/src/core/kernelMidi.cpp
+@@ -39,7 +39,9 @@
+ #include "midiChannel.h"
+ #include "conf.h"
+ #include "midiMapConf.h"
+-#include "pluginHost.h"
++#ifdef WITH_VST
++  #include "pluginHost.h"
++#endif
+ #include "kernelMidi.h"
+ 
+ 
+@@ -48,8 +50,9 @@ extern Conf        G_Conf;
+ extern Mixer       G_Mixer;
+ extern KernelMidi  G_KernelMidi;
+ extern MidiMapConf G_MidiMap;
++#ifdef WITH_VST
+ extern PluginHost  G_PluginHost;
+-
++#endif
+ 
+ using std::string;
+ using std::vector;
+Index: giada/src/core/midiChannel.cpp
+===================================================================
+--- giada.orig/src/core/midiChannel.cpp
++++ giada/src/core/midiChannel.cpp
+@@ -30,18 +30,22 @@
+ #include "../utils/log.h"
+ #include "midiChannel.h"
+ #include "channel.h"
+-#include "pluginHost.h"
+ #include "patch_DEPR_.h"
+ #include "patch.h"
+ #include "conf.h"
+ #include "mixer.h"
++#ifdef WITH_VST
++  #include "pluginHost.h"
++#endif
+ #include "kernelMidi.h"
+ 
+ 
+ extern Recorder   G_Recorder;
+ extern KernelMidi G_KernelMidi;
+-extern PluginHost G_PluginHost;
+ extern Mixer      G_Mixer;
++#ifdef WITH_VST
++extern PluginHost G_PluginHost;
++#endif
+ 
+ 
+ MidiChannel::MidiChannel(int bufferSize, MidiMapConf *midiMapConf)
+@@ -335,17 +339,20 @@ void MidiChannel::receiveMidi(uint32_t m
+ {
+   if (!armed)
+     return;
++
++#ifdef WITH_VST
++
+   while (true) {
+     if (pthread_mutex_trylock(&G_PluginHost.mutex_midi) != 0)
+       continue;
+     gu_log("[Channel::processMidi] msg=%X\n", msg);
+-#ifdef WITH_VST
+     addVstMidiEvent(msg, 0);
+-#endif
+     pthread_mutex_unlock(&G_PluginHost.mutex_midi);
+     break;
+   }
+ 
++#endif
++
+ 	if (G_Recorder.canRec(this))
+ 		G_Recorder.rec(index, ACTION_MIDI, G_Mixer.actualFrame, msg);
+ }
+Index: giada/src/gui/dialogs/gd_about.cpp
+===================================================================
+--- giada.orig/src/gui/dialogs/gd_about.cpp
++++ giada/src/gui/dialogs/gd_about.cpp
+@@ -33,7 +33,9 @@
+ #include "../../core/kernelAudio.h"
+ #include "../../core/kernelMidi.h"
+ #include "../../core/graphics.h"
+-#include "../../deps/juce/config.h"
++#ifdef WITH_VST
++  #include "../../deps/juce/config.h"
++#endif
+ #include "../../utils/gui.h"
+ #include "../elems/ge_mixed.h"
+ #include "gd_about.h"
diff --git a/debian/patches/series b/debian/patches/series
index bfef84f..9de2ad7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 02-rtmidi-pkgconfig.patch
+05-fix_FTBFS.patch

-- 
giada packaging