[SCM] giada/master: Refresh patch.

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

The following commit has been merged in the master branch:
commit d3311ddc264d1648e0d75c279d84ba0829f7e602
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Sep 2 10:03:37 2016 +0200

    Refresh patch.

diff --git a/debian/patches/02-rtmidi-pkgconfig.patch b/debian/patches/02-rtmidi-pkgconfig.patch
index 5dd2f1b..7e2c9c1 100644
--- a/debian/patches/02-rtmidi-pkgconfig.patch
+++ b/debian/patches/02-rtmidi-pkgconfig.patch
@@ -2,9 +2,11 @@ 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
+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
@@ -16,7 +18,7 @@ Forwarded: <giadaloopmachine at gmail.com>
    -lfreetype
  endif
  
-@@ -242,12 +242,12 @@ src/deps/juce/juce_gui_extra/juce_gui_ex
+@@ -253,7 +253,7 @@ src/deps/juce/juce_gui_extra/juce_gui_ex
  endif
  
  giada_tests_LDADD = -ljansson -lsndfile -lsamplerate -lfltk -lXext -lX11 -lXft \
@@ -25,14 +27,10 @@ Forwarded: <giadaloopmachine at gmail.com>
    -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
+Index: giada/configure.ac
+===================================================================
+--- giada.orig/configure.ac
++++ giada/configure.ac
 @@ -106,13 +106,7 @@ AC_CHECK_HEADER(
  )
  AC_LANG_POP
diff --git a/debian/patches/series b/debian/patches/series
index 578d9c7..0ad48f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-01-drop_juce.patch
+#01-drop_juce.patch
 02-rtmidi-pkgconfig.patch
-03-build_with_gcc6.patch
+#03-build_with_gcc6.patch

-- 
giada packaging