[SCM] giada/master: Numbering patches.

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

The following commit has been merged in the master branch:
commit 8c6b7827bef5f28577e0c38bf94c5e19b2adec72
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Jul 25 11:30:08 2016 +0200

    Numbering patches.

diff --git a/debian/patches/01-drop_juce.patch b/debian/patches/01-drop_juce.patch
new file mode 100644
index 0000000..fe35534
--- /dev/null
+++ b/debian/patches/01-drop_juce.patch
@@ -0,0 +1,44 @@
+Description: only use JUCE if VST is enabled
+ drop all references to JUCE is VST is disabled.
+Author: Debian
+Forwarded: http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/2016-May/051554.html
+Last-Update: 2016-05-17
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: giada/Makefile.am
+===================================================================
+--- giada.orig/Makefile.am
++++ giada/Makefile.am
+@@ -227,7 +227,10 @@ src/core/pluginHost.cpp      \
+ src/core/dataStorageIni.cpp  \
+ src/core/dataStorageJson.cpp \
+ src/utils/utils.cpp          \
+-src/utils/log.cpp            \
++src/utils/log.cpp
++
++if WITH_VST
++giada_tests_SOURCES +=        \
+ src/deps/juce/juce_audio_basics/juce_audio_basics.cpp         \
+ src/deps/juce/juce_audio_processors/juce_audio_processors.cpp \
+ src/deps/juce/juce_core/juce_core.cpp                         \
+@@ -236,6 +239,7 @@ src/deps/juce/juce_events/juce_events.cp
+ src/deps/juce/juce_graphics/juce_graphics.cpp                 \
+ src/deps/juce/juce_gui_basics/juce_gui_basics.cpp             \
+ src/deps/juce/juce_gui_extra/juce_gui_extra.cpp
++endif
+ 
+ giada_tests_LDADD = -ljansson -lsndfile -lsamplerate -lfltk -lXext -lX11 -lXft \
+   -lXpm -lm -ljack -lasound -lpthread -ldl -lpulse-simple -lpulse -lrtmidi \
+@@ -243,8 +247,11 @@ giada_tests_LDADD = -ljansson -lsndfile
+ 
+ giada_tests_CXXFLAGS = -std=c++11
+ 
+-giada_tests_CPPFLAGS = -I./src/deps/juce -I./src/deps/vst -I/usr/include \
++giada_tests_CPPFLAGS =
++if WITH_VST
++giada_tests_CPPFLAGS += -I./src/deps/juce -I./src/deps/vst -I/usr/include \
+                        -I/usr/include/freetype2
++endif
+ 
+ # make rename ------------------------------------------------------------------
+ 
diff --git a/debian/patches/02-rtmidi-pkgconfig.patch b/debian/patches/02-rtmidi-pkgconfig.patch
new file mode 100644
index 0000000..5dd2f1b
--- /dev/null
+++ b/debian/patches/02-rtmidi-pkgconfig.patch
@@ -0,0 +1,50 @@
+Description: build with new rtmidi lib.
+Author: James Cowgill <jcowgill at debian.org>
+Forwarded: <giadaloopmachine at gmail.com>
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -172,9 +172,9 @@ if LINUX
+ giada_SOURCES += src/deps/rtaudio-mod/RtAudio.h src/deps/rtaudio-mod/RtAudio.cpp
+ # mute rtAudio error on variable length array
+ giada_CXXFLAGS += -Wno-error=vla
+-giada_CPPFLAGS += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__
++giada_CPPFLAGS += $(RTMIDI_CFLAGS)
+ giada_LDADD = -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm -ljack -lasound \
+-  -lpthread -ldl -lpulse-simple -lpulse -lsamplerate -lrtmidi -ljansson \
++  -lpthread -ldl -lpulse-simple -lpulse -lsamplerate $(RTMIDI_LIBS) -ljansson \
+   -lfreetype
+ endif
+ 
+@@ -242,12 +242,12 @@ src/deps/juce/juce_gui_extra/juce_gui_ex
+ endif
+ 
+ giada_tests_LDADD = -ljansson -lsndfile -lsamplerate -lfltk -lXext -lX11 -lXft \
+-  -lXpm -lm -ljack -lasound -lpthread -ldl -lpulse-simple -lpulse -lrtmidi \
++  -lXpm -lm -ljack -lasound -lpthread -ldl -lpulse-simple -lpulse $(RTMIDI_LIBS) \
+   -lfreetype
+ 
+ giada_tests_CXXFLAGS = -std=c++11
+ 
+-giada_tests_CPPFLAGS =
++giada_tests_CPPFLAGS = $(RTMIDI_CFLAGS)
+ if WITH_VST
+ giada_tests_CPPFLAGS += -I./src/deps/juce -I./src/deps/vst -I/usr/include \
+                        -I/usr/include/freetype2
+--- a/configure.ac
++++ b/configure.ac
+@@ -106,13 +106,7 @@ AC_CHECK_HEADER(
+ )
+ AC_LANG_POP
+ 
+-AC_LANG_PUSH([C++])
+-AC_CHECK_HEADER(
+-	[RtMidi.h],
+-	[],
+-	[AC_MSG_ERROR([library 'rtMidi' not found!])]
+-)
+-AC_LANG_POP
++PKG_CHECK_MODULES([RTMIDI], [rtmidi])
+ 
+ AC_LANG_PUSH([C++])
+ AC_CHECK_HEADER(

-- 
giada packaging