From: Jaromír Mikeš Date: Mon, 21 Nov 2016 08:40:03 +0000 (+0100) Subject: Patch refreshed. X-Git-Tag: archive/raspbian/0.15.4+ds1-1+rpi1^2~125 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cfba843712bca72a854be77035d21eecd523d632;p=giada.git Patch refreshed. --- diff --git a/debian/patches/02-rtmidi-pkgconfig.patch b/debian/patches/02-rtmidi-pkgconfig.patch index 7e2c9c1..8cc8412 100644 --- a/debian/patches/02-rtmidi-pkgconfig.patch +++ b/debian/patches/02-rtmidi-pkgconfig.patch @@ -6,10 +6,10 @@ Index: giada/Makefile.am =================================================================== --- giada.orig/Makefile.am +++ giada/Makefile.am -@@ -183,9 +183,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 +@@ -189,9 +189,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 -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 \ @@ -18,7 +18,7 @@ Index: giada/Makefile.am -lfreetype endif -@@ -253,7 +253,7 @@ src/deps/juce/juce_gui_extra/juce_gui_ex +@@ -281,7 +281,7 @@ src/deps/juce/juce_gui_extra/juce_gui_ex endif giada_tests_LDADD = -ljansson -lsndfile -lsamplerate -lfltk -lXext -lX11 -lXft \