From: IOhannes m zmölnig Date: Wed, 8 Jan 2020 12:34:39 +0000 (+0100) Subject: Refresh rtmidi patch (TODO: rtaudio & juce) X-Git-Tag: archive/raspbian/0.16.2.2+ds1-1+rpi1^2~19 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1b8f016d86bee8da070fac280e9ef2bd4848c34c;p=giada.git Refresh rtmidi patch (TODO: rtaudio & juce) --- diff --git a/debian/patches/02-rtmidi-pkgconfig.patch b/debian/patches/02-rtmidi-pkgconfig.patch index 0f5a869..426c60a 100644 --- a/debian/patches/02-rtmidi-pkgconfig.patch +++ b/debian/patches/02-rtmidi-pkgconfig.patch @@ -7,11 +7,9 @@ Subject: build with new rtmidi lib. configure.ac | 18 +----------------- 2 files changed, 5 insertions(+), 20 deletions(-) -diff --git a/Makefile.am b/Makefile.am -index 93e11fc..3c4b47e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -358,7 +358,7 @@ cppFlags += \ +--- giada.orig/Makefile.am ++++ giada/Makefile.am +@@ -366,7 +366,7 @@ -D__WINDOWS_DS__ ldAdd += -ldsound -lwsock32 -lm -lfltk -lwininet -lgdi32 -lshell32 -lvfw32 \ @@ -20,7 +18,7 @@ index 93e11fc..3c4b47e 100644 -lwinmm -lsetupapi -lksuser -ljansson -limm32 -lglu32 -lshell32 -lversion \ -lopengl32 -loleaut32 -lshlwapi -lcomdlg32 -lflac -lvorbis -logg -lvorbisenc -@@ -371,9 +371,10 @@ if LINUX +@@ -379,9 +379,10 @@ # Add preprocessor flags to enable ALSA, Pulse and JACK in RtAudio. cppFlags += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__ @@ -32,7 +30,7 @@ index 93e11fc..3c4b47e 100644 -lfreetype -lfontconfig -lXrender -lXfixes -lXcursor -lXinerama endif -@@ -388,7 +389,7 @@ cppFlags += -D__MACOSX_CORE__ +@@ -407,7 +408,7 @@ # -ObjC++: Juce requires to build some Objective C code cxxFlags += -ObjC++ @@ -41,11 +39,9 @@ index 93e11fc..3c4b47e 100644 -lFLAC -logg -lvorbis -lvorbisenc ldFlags += -framework CoreAudio -framework Cocoa -framework Carbon \ -diff --git a/configure.ac b/configure.ac -index 9f772f6..a416559 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -129,23 +129,7 @@ AC_CHECK_HEADER( +--- giada.orig/configure.ac ++++ giada/configure.ac +@@ -137,23 +137,7 @@ ) AC_LANG_POP