From: James Cowgill <jcowgill@debian.org>
Date: Wed, 25 Oct 2017 12:25:50 +0000 (+0200)
Subject: build with new rtmidi lib.
X-Git-Tag: archive/raspbian/0.15.4+ds1-1+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cb6976cf8505c090f9ae5d6fc13292b0663c9046;p=giada.git

build with new rtmidi lib.


Gbp-Pq: Name 02-rtmidi-pkgconfig.patch
---

diff --git a/Makefile.am b/Makefile.am
index e101bce..6b61ccb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -360,10 +360,10 @@ endif
 if LINUX
 
 # Add preprocessor flags to enable ALSA, Pulse and JACK in RtAudio.
-cppFlags += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__
+cppFlags += $(RTMIDI_CFLAGS)
 
 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
diff --git a/configure.ac b/configure.ac
index 9f772f6..a416559 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,23 +129,7 @@ AC_CHECK_HEADER(
 )
 AC_LANG_POP
 
-if test "x$os" = "xosx"; then
-	AC_LANG_PUSH([C++])
-	AC_CHECK_HEADER(
-		[RtMidi.h],
-		[],
-		[AC_MSG_ERROR([library 'rtMidi' not found!])]
-	)
-	AC_LANG_POP
-else
-	AC_LANG_PUSH([C++])
-	AC_CHECK_HEADER(
-		[rtmidi/RtMidi.h],
-		[],
-		[AC_MSG_ERROR([library 'rtMidi' not found!])]
-	)
-	AC_LANG_POP
-fi
+PKG_CHECK_MODULES([RTMIDI], [rtmidi])
 
 
 AC_LANG_PUSH([C++])