more system RtAudio fixes

Gbp-Dch: ignore

diff --git a/debian/patches/03-system-rtaudio.patch b/debian/patches/03-system-rtaudio.patch
index 7b130b23e5d6d3a055fdf08bb9777674ef19ee34..e49b4b8c6e7da9eef374db3e57f31052589d0b6a 100644 (file)
--- a/debian/patches/03-system-rtaudio.patch
+++ b/debian/patches/03-system-rtaudio.patch
@@ -61,3 +61,43 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  #include "ver.h"
  
  
+--- giada.orig/Makefile.am
++++ giada/Makefile.am
+@@ -325,8 +325,7 @@
+       src/utils/ver.cpp                      \
+       src/utils/string.h                     \
+       src/utils/string.cpp                   \
+-      src/deps/rtaudio/RtAudio.h             \
+-      src/deps/rtaudio/RtAudio.cpp
++      $(empty)
+ sourcesTests =                   \
+       tests/main.cpp               \
+       tests/rcuList.cpp            \
+@@ -402,11 +401,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 $(RTMIDI_LIBS) \
++ldAdd += -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm \
++      -lpthread -ldl -lsamplerate $(RTMIDI_LIBS) \
+       -lfreetype -lfontconfig -lXrender -lXfixes -lXcursor -lXinerama
+ 
+ endif
+@@ -414,11 +412,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 $(RTMIDI_LIBS) \
++ldAdd += -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm \
++      -lpthread -lsamplerate $(RTMIDI_LIBS) \
+       -lfreetype
+ 
+ endif