From d55e4e42f53dc2020beefe5b0c5f9226249f7a3c Mon Sep 17 00:00:00 2001
From: James Cowgill <jcowgill@debian.org>
Date: Wed, 25 Oct 2017 14:25:50 +0200
Subject: [PATCH] build with new rtmidi lib.

Gbp-Pq: Name 02-rtmidi-pkgconfig.patch
---
 Makefile.am  | 12 ++++++++----
 configure.ac | 18 +-----------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9bd86b9..9dcb68b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -366,9 +366,10 @@ cppFlags += \
 	-D__WINDOWS_ASIO__                           \
 	-D__WINDOWS_WASAPI__                         \
 	-D__WINDOWS_DS__
+cppFlags += $(RTMIDI_CFLAGS)
 
 ldAdd += -ldsound -lwsock32 -lm -lfltk -lwininet -lgdi32 -lshell32 -lvfw32 \
-	-lrpcrt4 -luuid -lcomctl32 -lws2_32 -lsndfile -lsamplerate -lrtmidi \
+	-lrpcrt4 -luuid -lcomctl32 -lws2_32 -lsndfile -lsamplerate $(RTMIDI_LIBS) \
 	-lsetupapi -limm32 -lglu32 -lshell32 -lversion \
 	-lopengl32 -loleaut32 -lshlwapi -lcomdlg32 -lflac -lvorbis -logg -lvorbisenc \
 	-lole32 -lwinmm -lksuser -lmfplat -lmfuuid -lwmcodecdspuuid
@@ -382,9 +383,10 @@ 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 \
+	-lpthread -ldl -lpulse-simple -lpulse -lsamplerate $(RTMIDI_LIBS) \
 	-lfreetype -lfontconfig -lXrender -lXfixes -lXcursor -lXinerama
 
 endif
@@ -393,9 +395,10 @@ if FREEBSD
 
 # Add preprocessor flags to enable ALSA, Pulse and JACK in RtAudio.
 cppFlags += -D__LINUX_PULSE__ -D__UNIX_JACK__
+cppFlags += $(RTMIDI_CFLAGS)
 
 ldAdd += -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm -ljack -lasound \
-	-lpthread -lpulse-simple -lpulse -lsamplerate -lrtmidi \
+	-lpthread -lpulse-simple -lpulse -lsamplerate $(RTMIDI_LIBS) \
 	-lfreetype
 
 endif
@@ -409,8 +412,9 @@ cppFlags += -D__MACOSX_CORE__
 
 # -ObjC++: Juce requires to build some Objective C code
 cxxFlags += -ObjC++
+cppFlags += $(RTMIDI_CFLAGS)
 
-ldAdd += -lsndfile -lfltk -lrtmidi -lsamplerate -lm -lpthread \
+ldAdd += -lsndfile -lfltk $(RTMIDI_LIBS) -lsamplerate -lm -lpthread \
 	-lFLAC -logg -lvorbis -lvorbisenc
 
 ldFlags += -framework CoreAudio -framework Cocoa -framework Carbon \
diff --git a/configure.ac b/configure.ac
index d7121b3..47d6337 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,23 +123,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++])
 AC_CHECK_HEADER(
-- 
2.30.2