From f4387c61cda26a3c5eca5280027ffb10fa4c426d Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Thu, 22 Mar 2018 14:24:30 +0100 Subject: [PATCH] Refreshed patches --- debian/patches/01-rtaudio5.patch | 2 +- debian/patches/02-rtmidi-pkgconfig.patch | 90 +++++++------- debian/patches/04-catch.patch | 114 ------------------ .../patches/05-fix_FTBS_on_some_archs.patch | 20 --- debian/patches/series | 2 - 5 files changed, 46 insertions(+), 182 deletions(-) delete mode 100644 debian/patches/04-catch.patch delete mode 100644 debian/patches/05-fix_FTBS_on_some_archs.patch diff --git a/debian/patches/01-rtaudio5.patch b/debian/patches/01-rtaudio5.patch index 713b217..bedf726 100644 --- a/debian/patches/01-rtaudio5.patch +++ b/debian/patches/01-rtaudio5.patch @@ -12,7 +12,7 @@ Subject: updated bundled and hacked RtAudio to RtAudio5 +++ giada/src/core/kernelAudio.cpp @@ -59,7 +59,7 @@ - jack_client_t *jackGetHandle() + jack_client_t* jackGetHandle() { - return static_cast(rtSystem->rtapi_->__HACK__getJackClient()); + return static_cast(rtSystem->GIADA_HACK__getJackClient()); diff --git a/debian/patches/02-rtmidi-pkgconfig.patch b/debian/patches/02-rtmidi-pkgconfig.patch index 68e8961..3564d2b 100644 --- a/debian/patches/02-rtmidi-pkgconfig.patch +++ b/debian/patches/02-rtmidi-pkgconfig.patch @@ -2,48 +2,48 @@ From: James Cowgill Date: Wed, 25 Oct 2017 14:25:50 +0200 Subject: build with new rtmidi lib. ---- a/Makefile.am -+++ b/Makefile.am -@@ -70,13 +70,13 @@ endif - 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) - - # Don't stop on JUCE's unused functions. - cxxFlags += -Wno-error=unused-function - - ldAdd += -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm -ljack -lasound \ -- -lpthread -ldl -lpulse-simple -lpulse -lsamplerate -lrtmidi -ljansson \ -+ -lpthread -ldl -lpulse-simple -lpulse -lsamplerate $(RTMIDI_LIBS) -ljansson \ - -lfreetype - - endif ---- a/configure.ac -+++ b/configure.ac -@@ -118,23 +118,7 @@ AC_CHECK_HEADER( - ) - 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++]) +--- giada.orig/Makefile.am ++++ giada/Makefile.am +@@ -76,13 +76,13 @@ + 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) + + # Don't stop on JUCE's unused functions. + cxxFlags += -Wno-error=unused-function + + ldAdd += -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm -ljack -lasound \ +- -lpthread -ldl -lpulse-simple -lpulse -lsamplerate -lrtmidi -ljansson \ ++ -lpthread -ldl -lpulse-simple -lpulse -lsamplerate $(RTMIDI_LIBS) -ljansson \ + -lfreetype + + endif +--- giada.orig/configure.ac ++++ giada/configure.ac +@@ -129,23 +129,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++]) diff --git a/debian/patches/04-catch.patch b/debian/patches/04-catch.patch deleted file mode 100644 index 8d2343a..0000000 --- a/debian/patches/04-catch.patch +++ /dev/null @@ -1,114 +0,0 @@ -From: =?utf-8?b?SmFyb23DrXIgTWlrZcWh?= -Date: Wed, 25 Oct 2017 14:25:50 +0200 -Subject: test with system-wide catch. - ---- - tests/conf.cpp | 2 +- - tests/main.cpp | 2 +- - tests/midiMapConf.cpp | 2 +- - tests/patch.cpp | 2 +- - tests/recorder.cpp | 2 +- - tests/utils.cpp | 2 +- - tests/wave.cpp | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - ---- giada.orig/tests/conf.cpp -+++ giada/tests/conf.cpp -@@ -1,6 +1,6 @@ - #include "../src/core/const.h" - #include "../src/core/conf.h" --#include "catch/single_include/catch.hpp" -+#include - - - using std::string; ---- giada.orig/tests/main.cpp -+++ giada/tests/main.cpp -@@ -1,3 +1,3 @@ - #define CATCH_CONFIG_MAIN - #define CATCH_CONFIG_FAST_COMPILE --#include "catch/single_include/catch.hpp" -+#include ---- giada.orig/tests/midiMapConf.cpp -+++ giada/tests/midiMapConf.cpp -@@ -1,6 +1,6 @@ - #include "../src/core/const.h" - #include "../src/core/midiMapConf.h" --#include "catch/single_include/catch.hpp" -+#include - - - using std::string; ---- giada.orig/tests/patch.cpp -+++ giada/tests/patch.cpp -@@ -1,6 +1,6 @@ - #include "../src/core/patch.h" - #include "../src/core/const.h" --#include "catch/single_include/catch.hpp" -+#include - - - using std::string; ---- giada.orig/tests/recorder.cpp -+++ giada/tests/recorder.cpp -@@ -1,6 +1,6 @@ - #include "../src/core/recorder.h" - #include "../src/core/const.h" --#include "catch/single_include/catch.hpp" -+#include - - - using std::string; ---- giada.orig/tests/utils.cpp -+++ giada/tests/utils.cpp -@@ -1,6 +1,6 @@ - #include "../src/utils/fs.h" - #include "../src/utils/string.h" --#include "catch/single_include/catch.hpp" -+#include - - - using std::vector; ---- giada.orig/tests/wave.cpp -+++ giada/tests/wave.cpp -@@ -1,6 +1,6 @@ - #include - #include "../src/core/wave.h" --#include "catch/single_include/catch.hpp" -+#include - - - using std::string; ---- giada.orig/tests/pluginHost.cpp -+++ giada/tests/pluginHost.cpp -@@ -5,7 +5,7 @@ - #if 0 - - #include "../src/core/pluginHost.h" --#include "catch/single_include/catch.hpp" -+#include - - - TEST_CASE("Test PluginHost class") ---- giada.orig/tests/waveFx.cpp -+++ giada/tests/waveFx.cpp -@@ -2,7 +2,7 @@ - #include "../src/core/const.h" - #include "../src/core/wave.h" - #include "../src/core/waveFx.h" --#include "catch/single_include/catch.hpp" -+#include - - - using std::string; ---- giada.orig/tests/waveManager.cpp -+++ giada/tests/waveManager.cpp -@@ -2,7 +2,7 @@ - #include "../src/core/waveManager.h" - #include "../src/core/wave.h" - #include "../src/core/const.h" --#include "catch/single_include/catch.hpp" -+#include - - - using std::string; diff --git a/debian/patches/05-fix_FTBS_on_some_archs.patch b/debian/patches/05-fix_FTBS_on_some_archs.patch deleted file mode 100644 index b2244f0..0000000 --- a/debian/patches/05-fix_FTBS_on_some_archs.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Fix FTBFS on some archs. -Author: James Cowgill -jcowgill@debian.org -Forwarded: Giada LoopMachine - -Index: giada/src/utils/string.cpp -=================================================================== ---- giada.orig/src/utils/string.cpp -+++ giada/src/utils/string.cpp -@@ -108,7 +108,9 @@ std::string gu_format(const char* format - /* Compute the size of the new expanded string (i.e. with replacement taken - into account). */ - -- size_t size = vsnprintf(nullptr, 0, format, args); -+ va_start(args, format); -+ size_t size = vsnprintf(nullptr, 0, format, args) + 1; -+ va_end(args); - - /* Create a new temporary char array to hold the new expanded string. */ - diff --git a/debian/patches/series b/debian/patches/series index 4560b8d..a5856f3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ 01-rtaudio5.patch 02-rtmidi-pkgconfig.patch -04-catch.patch -05-fix_FTBS_on_some_archs.patch -- 2.30.2