From 9bc08616e5a046614a9110f8d8ff764426497f06 Mon Sep 17 00:00:00 2001 From: Dennis Braun Date: Thu, 24 Sep 2020 21:23:53 +0200 Subject: [PATCH] Update rtmidi patch --- debian/patches/02-rtmidi-pkgconfig.patch | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/debian/patches/02-rtmidi-pkgconfig.patch b/debian/patches/02-rtmidi-pkgconfig.patch index 2148d17..8e45175 100644 --- a/debian/patches/02-rtmidi-pkgconfig.patch +++ b/debian/patches/02-rtmidi-pkgconfig.patch @@ -7,9 +7,11 @@ Subject: build with new rtmidi lib. configure.ac | 18 +----------------- 2 files changed, 5 insertions(+), 20 deletions(-) +Index: giada/Makefile.am +=================================================================== --- giada.orig/Makefile.am +++ giada/Makefile.am -@@ -366,9 +366,10 @@ +@@ -385,9 +385,10 @@ cppFlags += \ -D__WINDOWS_ASIO__ \ -D__WINDOWS_WASAPI__ \ -D__WINDOWS_DS__ @@ -21,7 +23,7 @@ Subject: build with new rtmidi lib. -lsetupapi -limm32 -lglu32 -lshell32 -lversion \ -lopengl32 -loleaut32 -lshlwapi -lcomdlg32 -lflac -lvorbis -logg -lvorbisenc \ -lole32 -lwinmm -lksuser -lmfplat -lmfuuid -lwmcodecdspuuid -@@ -382,9 +383,10 @@ +@@ -401,9 +402,10 @@ if LINUX # Add preprocessor flags to enable ALSA, Pulse and JACK in RtAudio. cppFlags += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__ @@ -33,7 +35,7 @@ Subject: build with new rtmidi lib. -lfreetype -lfontconfig -lXrender -lXfixes -lXcursor -lXinerama endif -@@ -393,9 +395,10 @@ +@@ -412,9 +414,10 @@ if FREEBSD # Add preprocessor flags to enable ALSA, Pulse and JACK in RtAudio. cppFlags += -D__LINUX_PULSE__ -D__UNIX_JACK__ @@ -45,20 +47,23 @@ Subject: build with new rtmidi lib. -lfreetype endif -@@ -409,8 +412,9 @@ +@@ -427,9 +430,9 @@ sourcesExtra += src/utils/cocoa.mm src/u + cppFlags += -D__MACOSX_CORE__ # -ObjC++: Juce requires to build some Objective C code - cxxFlags += -ObjC++ +-cxxFlags += -ObjC++ +cppFlags += $(RTMIDI_CFLAGS) -ldAdd += -lsndfile -lfltk -lrtmidi -lsamplerate -lm -lpthread \ +ldAdd += -lsndfile -lfltk $(RTMIDI_LIBS) -lsamplerate -lm -lpthread \ - -lFLAC -logg -lvorbis -lvorbisenc + -lFLAC -logg -lvorbis -lvorbisenc -lopus ldFlags += -framework CoreAudio -framework Cocoa -framework Carbon \ +Index: giada/configure.ac +=================================================================== --- giada.orig/configure.ac +++ giada/configure.ac -@@ -123,23 +123,7 @@ +@@ -123,23 +123,7 @@ AC_CHECK_HEADER( ) AC_LANG_POP -- 2.30.2