From: Jaromír Mikeš <mira.mikes@seznam.cz>
Date: Mon, 4 Jul 2016 19:02:07 +0000 (+0200)
Subject: Add patch to build with new rtmidi lib.
X-Git-Tag: archive/raspbian/0.15.4+ds1-1+rpi1^2~141
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d0a29fe5c72c7f8c6686eda550aa812a74445648;p=giada.git

Add patch to build with new rtmidi lib.
---

diff --git a/debian/patches/rtmidi-pkgconfig.patch b/debian/patches/rtmidi-pkgconfig.patch
new file mode 100644
index 0000000..67ac15a
--- /dev/null
+++ b/debian/patches/rtmidi-pkgconfig.patch
@@ -0,0 +1,50 @@
+Description: build with new rtmidi lib.
+Author: James Cowgill <jcowgill@debian.org>
+Forwarded: no
+
+--- 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(
diff --git a/debian/patches/series b/debian/patches/series
index eec7100..024b9b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 drop_juce.patch
+rtmidi-pkgconfig.patch