From 6b8fb97d168eb292db4628e2ae0adbec4eee2f29 Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig=20=28Debian/GNU=29?= Date: Mon, 30 Aug 2021 16:08:02 +0200 Subject: [PATCH] Refresh paches --- debian/patches/01-spelling-fixes.patch | 4 +- debian/patches/02-rtmidi-pkgconfig.patch | 86 ------------------ debian/patches/03-system-rtaudio.patch | 111 +++++++---------------- debian/patches/04-system-json.patch | 44 ++++----- debian/patches/series | 1 - 5 files changed, 59 insertions(+), 187 deletions(-) delete mode 100644 debian/patches/02-rtmidi-pkgconfig.patch diff --git a/debian/patches/01-spelling-fixes.patch b/debian/patches/01-spelling-fixes.patch index 3da8d53..bb6c599 100644 --- a/debian/patches/01-spelling-fixes.patch +++ b/debian/patches/01-spelling-fixes.patch @@ -7,7 +7,7 @@ Last-Update: 2020-04-02 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- giada.orig/src/glue/channel.cpp +++ giada/src/glue/channel.cpp -@@ -235,7 +235,7 @@ +@@ -207,7 +207,7 @@ errors = true; if (errors) @@ -15,4 +15,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ + v::gdAlert("Some files weren't loaded successfully."); } - + /* -------------------------------------------------------------------------- */ diff --git a/debian/patches/02-rtmidi-pkgconfig.patch b/debian/patches/02-rtmidi-pkgconfig.patch deleted file mode 100644 index 7d27c1b..0000000 --- a/debian/patches/02-rtmidi-pkgconfig.patch +++ /dev/null @@ -1,86 +0,0 @@ -From: James Cowgill -Date: Wed, 25 Oct 2017 14:25:50 +0200 -Subject: build with new rtmidi lib. - ---- - Makefile.am | 7 ++++--- - configure.ac | 18 +----------------- - 2 files changed, 5 insertions(+), 20 deletions(-) - ---- giada.orig/Makefile.am -+++ giada/Makefile.am -@@ -386,9 +386,10 @@ - -D__WINDOWS_ASIO__ \ - -D__WINDOWS_WASAPI__ \ - -D__WINDOWS_DS__ -+cppFlags += $(RTMIDI_CFLAGS) - - ldAdd += -ldsound -lwsock32 -lm -lfltk -lwininet -lgdi32 -lshell32 -lvfw32 \ -- -lrpcrt4 -luuid -lcomctl32 -lws2_32 -lsndfile -lsamplerate -lrtmidi \ -+ -lrpcrt4 -luuid -lcomctl32 -lws2_32 -lsndfile -lsamplerate $(RTMIDI_LIBS) \ - -lsetupapi -limm32 -lglu32 -lshell32 -lversion \ - -lopengl32 -loleaut32 -lshlwapi -lcomdlg32 -lflac -lvorbis -logg -lvorbisenc \ - -lole32 -lwinmm -lksuser -lmfplat -lmfuuid -lwmcodecdspuuid -@@ -402,9 +403,10 @@ - - # 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 -lrtmidi \ -+ -lpthread -ldl -lpulse-simple -lpulse -lsamplerate $(RTMIDI_LIBS) \ - -lfreetype -lfontconfig -lXrender -lXfixes -lXcursor -lXinerama - - endif -@@ -413,9 +415,10 @@ - - # 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 -lrtmidi \ -+ -lpthread -lpulse-simple -lpulse -lsamplerate $(RTMIDI_LIBS) \ - -lfreetype - - endif -@@ -428,9 +431,9 @@ - cppFlags += -D__MACOSX_CORE__ - - # -ObjC++: Juce requires to build some Objective C code --cxxFlags += -ObjC++ -+cppFlags += $(RTMIDI_CFLAGS) - --ldAdd += -lsndfile -lfltk -lrtmidi -lsamplerate -lm -lpthread \ -+ldAdd += -lsndfile -lfltk $(RTMIDI_LIBS) -lsamplerate -lm -lpthread \ - -lFLAC -logg -lvorbis -lvorbisenc -lopus - - ldFlags += -framework CoreAudio -framework Cocoa -framework Carbon \ ---- giada.orig/configure.ac -+++ giada/configure.ac -@@ -123,23 +123,7 @@ - ) - AC_LANG_POP - --if test "x$os" = "xosx"; then -- AC_LANG_PUSH([C++]) -- AC_CHECK_HEADER( -- [RtMidi.h], -- [], -- [AC_MSG_ERROR([library 'rtMidi' not found!])] -- ) -- AC_LANG_POP --else -- AC_LANG_PUSH([C++]) -- AC_CHECK_HEADER( -- [rtmidi/RtMidi.h], -- [], -- [AC_MSG_ERROR([library 'rtMidi' not found!])] -- ) -- AC_LANG_POP --fi -+PKG_CHECK_MODULES([RTMIDI], [rtmidi]) - - AC_LANG_PUSH([C++]) - AC_CHECK_HEADER( diff --git a/debian/patches/03-system-rtaudio.patch b/debian/patches/03-system-rtaudio.patch index e49b4b8..05d5931 100644 --- a/debian/patches/03-system-rtaudio.patch +++ b/debian/patches/03-system-rtaudio.patch @@ -1,103 +1,62 @@ -Description: include system-provided RtAudio header - rather than the one that is (not) shipped in src/deps/ +Description: Use system-provided RtAudio Author: IOhannes m zmölnig Origin: Debian Forwarded: not-needed -Last-Update: 2021-02-02 +Last-Update: 2021-08-30 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- giada.orig/src/core/kernelAudio.cpp +++ giada/src/core/kernelAudio.cpp -@@ -27,7 +27,7 @@ - * -------------------------------------------------------------------------- */ - - --#include "deps/rtaudio/RtAudio.h" -+#include "rtaudio/RtAudio.h" - #include "utils/log.h" - #include "glue/main.h" +@@ -33,7 +33,7 @@ + #include "core/mixerHandler.h" #include "core/model/model.h" ---- giada.orig/src/core/mixer.cpp -+++ giada/src/core/mixer.cpp -@@ -27,7 +27,7 @@ - - #include - #include + #include "core/recManager.h" -#include "deps/rtaudio/RtAudio.h" +#include "rtaudio/RtAudio.h" + #include "glue/main.h" + #include "mixer.h" #include "utils/log.h" - #include "utils/math.h" - #include "core/model/model.h" --- giada.orig/src/core/mixer.h +++ giada/src/core/mixer.h @@ -32,7 +32,7 @@ - #include - #include - #include --#include "deps/rtaudio/RtAudio.h" -+#include "rtaudio/RtAudio.h" - #include "core/ringBuffer.h" #include "core/recorder.h" + #include "core/ringBuffer.h" #include "core/types.h" ---- giada.orig/src/gui/elems/config/tabAudio.cpp -+++ giada/src/gui/elems/config/tabAudio.cpp -@@ -26,7 +26,7 @@ - +-#include "deps/rtaudio/RtAudio.h" ++#include "rtaudio/RtAudio.h" + #include - #include + namespace giada::m +--- giada.orig/src/glue/config.cpp ++++ giada/src/glue/config.cpp +@@ -28,7 +28,7 @@ + #include "core/conf.h" + #include "core/const.h" + #include "core/kernelAudio.h" -#include "deps/rtaudio/RtAudio.h" +#include "rtaudio/RtAudio.h" + + namespace giada::c::config + { +--- giada.orig/src/gui/elems/config/tabAudio.cpp ++++ giada/src/gui/elems/config/tabAudio.cpp +@@ -27,7 +27,7 @@ + #include "tabAudio.h" #include "core/const.h" - #include "core/conf.h" #include "core/kernelAudio.h" +-#include "deps/rtaudio/RtAudio.h" ++#include "rtaudio/RtAudio.h" + #include "gui/elems/basics/box.h" + #include "gui/elems/basics/button.h" + #include "gui/elems/basics/check.h" --- giada.orig/src/utils/ver.cpp +++ giada/src/utils/ver.cpp -@@ -28,7 +28,7 @@ - #include +@@ -26,7 +26,7 @@ + + #include "ver.h" #include "core/const.h" - #include -#include "deps/rtaudio/RtAudio.h" +#include "rtaudio/RtAudio.h" - #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 + #include + #include - endif diff --git a/debian/patches/04-system-json.patch b/debian/patches/04-system-json.patch index 526b914..ce0f7af 100644 --- a/debian/patches/04-system-json.patch +++ b/debian/patches/04-system-json.patch @@ -7,45 +7,45 @@ Last-Update: 2020-04-02 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- giada.orig/src/core/midiMapConf.cpp +++ giada/src/core/midiMapConf.cpp -@@ -30,7 +30,7 @@ - #include - #include - #include +@@ -26,7 +26,7 @@ + + #include "midiMapConf.h" + #include "const.h" -#include "deps/json/single_include/nlohmann/json.hpp" +#include "nlohmann/json.hpp" - #include "utils/string.h" - #include "utils/log.h" #include "utils/fs.h" + #include "utils/log.h" + #include "utils/string.h" --- giada.orig/src/core/conf.cpp +++ giada/src/core/conf.cpp -@@ -29,7 +29,7 @@ - #include - #include - #include +@@ -27,7 +27,7 @@ + #include "conf.h" + #include "core/const.h" + #include "core/types.h" -#include "deps/json/single_include/nlohmann/json.hpp" +#include "nlohmann/json.hpp" #include "utils/fs.h" #include "utils/log.h" - #include "core/const.h" + #include --- giada.orig/src/core/init.cpp +++ giada/src/core/init.cpp -@@ -35,7 +35,7 @@ - #include // For XInitThreads - #endif - #include +@@ -54,7 +54,7 @@ + #include "core/sequencer.h" + #include "core/wave.h" + #include "core/waveManager.h" -#include "deps/json/single_include/nlohmann/json.hpp" +#include "nlohmann/json.hpp" - #include "gui/updater.h" - #include "utils/log.h" - #include "utils/fs.h" + #include "glue/main.h" + #include "gui/dialogs/mainWindow.h" + #include "gui/dialogs/warnings.h" --- giada.orig/src/core/patch.cpp +++ giada/src/core/patch.cpp @@ -26,7 +26,7 @@ - - #include + #include "patch.h" + #include "core/mixer.h" -#include "deps/json/single_include/nlohmann/json.hpp" +#include "nlohmann/json.hpp" - #include "utils/math.h" #include "utils/log.h" - #include "core/mixer.h" + #include "utils/math.h" + #include diff --git a/debian/patches/series b/debian/patches/series index f5dc3b2..71bba89 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 01-spelling-fixes.patch -02-rtmidi-pkgconfig.patch 03-system-rtaudio.patch 04-system-json.patch -- 2.30.2