From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
Date: Wed, 28 Aug 2019 07:19:01 +0000 (+0200)
Subject: Build against system installation of RtAudio
X-Git-Tag: archive/raspbian/2.5.1+ds-1+rpi1~1^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=29daaa76a3e03f655e7a1aaf1437b51d35ce750b;p=jacktrip.git

Build against system installation of RtAudio

Origin: https://github.com/jcacerec/jacktrip/commit/83fbb337
Applied-Upstream: 83fbb337266e4ba17828db746955a2b83ae0248d
Reviewed-by: IOhannes m zmölnig
Last-Update: 2015-06-28

rather than using the included copy (which has been stripped
away for the Debian package anyhow)
Last-Update: 2015-06-28
Gbp-Pq: Name system-rtaudio.patch
---

diff --git a/src/jacktrip.pro b/src/jacktrip.pro
index bd95a2b..0a786d8 100644
--- a/src/jacktrip.pro
+++ b/src/jacktrip.pro
@@ -36,20 +36,24 @@ macx {
   LIBS += -framework CoreAudio -framework CoreFoundation
   DEFINES += __MAC_OSX__
   }
-linux-g++ {
-  message(Linux)
-  LIBS += -lasound
+
+linux-g++ | linux-g++-64 {
+  LIBS += -lrtaudio
   QMAKE_CXXFLAGS += -D__LINUX_ALSA__ #-D__LINUX_OSS__ #RtAudio Flags
   QMAKE_CXXFLAGS += -g -O2
   DEFINES += __LINUX__
   }
+
+linux-g++ {
+  message(Linux)
+  QMAKE_CXXFLAGS += -D__LINUX_ALSA__ #-D__LINUX_OSS__ #RtAudio Flags
+  }
+
 linux-g++-64 {
   message(Linux 64bit)
-  LIBS += -lasound
   QMAKE_CXXFLAGS += -fPIC -D__LINUX_ALSA__ #-D__LINUX_OSS__ #RtAudio Flags
-  QMAKE_CXXFLAGS += -g -O2
-  DEFINES += __LINUX__
   }
+
 win32 {
   message(win32)
   CONFIG += x86 console
@@ -68,14 +72,6 @@ QMAKE_CLEAN += -r ./jacktrip ./jacktrip_debug ./release ./debug
 target.path = /usr/bin
 INSTALLS += target
 
-#INCLUDEPATH += ../externals/includes/rtaudio-4.0.7
-#DEPENDPATH += ../externals/includes/rtaudio-4.0.7
-win32 {
-  INCLUDEPATH += ../externals/includes/rtaudio-4.0.7/include
-  INCLUDEPATH += ../externals/includes
-  DEPENDPATH += ../externals/includes/rtaudio-4.0.7/include
-  DEPENDPATH += ../externals/includes
-}
 
 # Input
 HEADERS += DataProtocol.h \
@@ -124,9 +120,17 @@ SOURCES += JackAudioInterface.cpp
 }
 
 # RtAduio Input
-HEADERS += ../externals/includes/rtaudio-4.0.7/RtAudio.h \
-           ../externals/includes/rtaudio-4.0.7/RtError.h
-SOURCES += ../externals/includes/rtaudio-4.0.7/RtAudio.cpp
+win32 {
+  INCLUDEPATH += ../externals/rtaudio-4.1.1/include
+  DEPENDPATH += ../externals/rtaudio-4.1.1/include
+}
+macx | win32 {
+INCLUDEPATH += ../externals/rtaudio-4.1.1/
+DEPENDPATH += ../externals/rtaudio-4.1.1/
+HEADERS += ../externals/rtaudio-4.1.1/RtAudio.h
+SOURCES += ../externals/rtaudio-4.1.1/RtAudio.cpp
+}
+
 win32 {
 HEADERS += asio.h \
            asiodrivers.h \