From: IOhannes m zmölnig Date: Tue, 2 Feb 2021 21:58:45 +0000 (+0100) Subject: more system RtAudio fixes X-Git-Tag: archive/raspbian/0.20.1+ds1-1+rpi1~1^2~62 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=558b48bbdd63cf1cc19924035fa6d382f1637d5f;p=giada.git more system RtAudio fixes Gbp-Dch: ignore --- diff --git a/debian/patches/03-system-rtaudio.patch b/debian/patches/03-system-rtaudio.patch index 7b130b2..e49b4b8 100644 --- 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