[SCM] jacktrip/master: Patches to use system-installed RtAudio

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8669837a354150b6dbcc14e7a08446b2febd0032
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Sun Jun 28 22:09:14 2015 +0200

    Patches to use system-installed RtAudio

diff --git a/debian/patches/rtaudio411.patch b/debian/patches/rtaudio411.patch
new file mode 100644
index 0000000..bebb771
--- /dev/null
+++ b/debian/patches/rtaudio411.patch
@@ -0,0 +1,38 @@
+Description: made it compile with RtAudio-4.1.1
+ RtAudio has changed the exception class from RtError to RtAudioError
+Author: Juan-Pablo Caceres
+Origin: https://github.com/jcacerec/jacktrip/commit/83fbb337
+Applied-Upstream: 83fbb337266e4ba17828db746955a2b83ae0248d
+Reviewed-by: IOhannes m zmölnig
+Last-Update: 2015-06-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- jacktrip.orig/src/RtAudioInterface.cpp
++++ jacktrip/src/RtAudioInterface.cpp
+@@ -123,7 +123,7 @@
+                          sampleRate, &bufferFrames,
+                          &RtAudioInterface::wrapperRtAudioCallback, this, &options);
+   }
+-  catch ( RtError& e ) {
++  catch ( RtAudioError& e ) {
+     std::cout << '\n' << e.getMessage() << '\n' << std::endl;
+     exit( 0 );
+   }
+@@ -213,7 +213,7 @@
+ int RtAudioInterface::startProcess() const
+ {
+   try { mRtAudio->startStream(); }
+-  catch ( RtError& e ) {
++  catch ( RtAudioError& e ) {
+     std::cout << '\n' << e.getMessage() << '\n' << std::endl;
+     return(-1);
+   }
+@@ -225,7 +225,7 @@
+ int RtAudioInterface::stopProcess() const
+ {
+   try { mRtAudio->closeStream(); }
+-  catch ( RtError& e ) {
++  catch ( RtAudioError& e ) {
+     std::cout << '\n' << e.getMessage() << '\n' << std::endl;
+     return(-1);
+   }
diff --git a/debian/patches/series b/debian/patches/series
index c2e986b..81a75b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
+system-rtaudio.patch
+rtaudio411.patch
 remove_sflogo.patch
diff --git a/debian/patches/system-rtaudio.patch b/debian/patches/system-rtaudio.patch
new file mode 100644
index 0000000..255fb62
--- /dev/null
+++ b/debian/patches/system-rtaudio.patch
@@ -0,0 +1,79 @@
+Description: Build against system installation of RtAudio
+ rather than using the included copy (which has been stripped
+ away for the Debian package anyhow)
+Author: Juan-Pablo Caceres
+Origin: https://github.com/jcacerec/jacktrip/commit/83fbb337
+Applied-Upstream: 83fbb337266e4ba17828db746955a2b83ae0248d
+Reviewed-by: IOhannes m zmölnig
+Last-Update: 2015-06-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- jacktrip.orig/src/jacktrip.pro
++++ jacktrip/src/jacktrip.pro
+@@ -36,20 +36,24 @@
+   LIBS += -framework CoreAudio -framework CoreFoundation
+   DEFINES += __MAC_OSX__
+   }
+-linux-g++ {
+-  message(Linux)
+-  LIBS += -lasound
++
++linux-g++ | linux-g++-64 {
++  LIBS += -lasound -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 @@
+ 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 @@
+ }
+ 
+ # 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 \

-- 
jacktrip packaging