[SCM] giada/master: Patches deleted/refreshed.

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

The following commit has been merged in the master branch:
commit 8ef68497932ae4e1b5d723435f1d9fbb63a2b331
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Jan 15 18:58:15 2017 +0100

    Patches deleted/refreshed.

diff --git a/debian/patches/02-rtmidi-pkgconfig.patch b/debian/patches/02-rtmidi-pkgconfig.patch
index 8cc8412..3397434 100644
--- a/debian/patches/02-rtmidi-pkgconfig.patch
+++ b/debian/patches/02-rtmidi-pkgconfig.patch
@@ -6,7 +6,7 @@ Index: giada/Makefile.am
 ===================================================================
 --- giada.orig/Makefile.am
 +++ giada/Makefile.am
-@@ -189,9 +189,9 @@ giada_SOURCES += src/deps/rtaudio-mod/Rt
+@@ -211,9 +211,9 @@ giada_SOURCES += src/deps/rtaudio-mod/Rt
  # -Wno-error=vla: mute rtAudio error on variable length array
  # -Wno-error=misleading-indentation: mute JUCE warnings on GCC6
  giada_CXXFLAGS += -Wno-error=vla -Wno-error=misleading-indentation
@@ -18,7 +18,7 @@ Index: giada/Makefile.am
    -lfreetype
  endif
  
-@@ -281,7 +281,7 @@ src/deps/juce/juce_gui_extra/juce_gui_ex
+@@ -303,7 +303,7 @@ src/deps/juce/modules/juce_gui_extra/juc
  endif
  
  giada_tests_LDADD = -ljansson -lsndfile -lsamplerate -lfltk -lXext -lX11 -lXft \
diff --git a/debian/patches/05-fix_FTBFS.patch b/debian/patches/05-fix_FTBFS.patch
deleted file mode 100644
index 862553a..0000000
--- a/debian/patches/05-fix_FTBFS.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-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 9de2ad7..bfef84f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 02-rtmidi-pkgconfig.patch
-05-fix_FTBFS.patch

-- 
giada packaging