Date: Wed, 25 Oct 2017 14:25:50 +0200\r
Subject: build with new rtmidi lib.\r
\r
---- a/Makefile.am\r
-+++ b/Makefile.am\r
-@@ -70,13 +70,13 @@ endif\r
- if LINUX\r
- \r
- # Add preprocessor flags to enable ALSA, Pulse and JACK in RtAudio.\r
--cppFlags += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__\r
-+cppFlags += $(RTMIDI_CFLAGS)\r
- \r
- # Don't stop on JUCE's unused functions.\r
- cxxFlags += -Wno-error=unused-function\r
- \r
- ldAdd += -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm -ljack -lasound \\r
-- -lpthread -ldl -lpulse-simple -lpulse -lsamplerate -lrtmidi -ljansson \\r
-+ -lpthread -ldl -lpulse-simple -lpulse -lsamplerate $(RTMIDI_LIBS) -ljansson \\r
- -lfreetype\r
- \r
- endif\r
---- a/configure.ac\r
-+++ b/configure.ac\r
-@@ -118,23 +118,7 @@ AC_CHECK_HEADER(\r
- )\r
- AC_LANG_POP\r
- \r
--if test "x$os" = "xosx"; then\r
-- AC_LANG_PUSH([C++])\r
-- AC_CHECK_HEADER(\r
-- [RtMidi.h],\r
-- [],\r
-- [AC_MSG_ERROR([library 'rtMidi' not found!])]\r
-- )\r
-- AC_LANG_POP\r
--else\r
-- AC_LANG_PUSH([C++])\r
-- AC_CHECK_HEADER(\r
-- [rtmidi/RtMidi.h],\r
-- [],\r
-- [AC_MSG_ERROR([library 'rtMidi' not found!])]\r
-- )\r
-- AC_LANG_POP\r
--fi\r
-+PKG_CHECK_MODULES([RTMIDI], [rtmidi])\r
- \r
- \r
- AC_LANG_PUSH([C++])\r
+--- 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++])
+++ /dev/null
-From: =?utf-8?b?SmFyb23DrXIgTWlrZcWh?= <mira.mikes@seznam.cz>
-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 <catch.hpp>
-
-
- 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 <catch.hpp>
---- 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 <catch.hpp>
-
-
- 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 <catch.hpp>
-
-
- 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 <catch.hpp>
-
-
- 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 <catch.hpp>
-
-
- using std::vector;
---- giada.orig/tests/wave.cpp
-+++ giada/tests/wave.cpp
-@@ -1,6 +1,6 @@
- #include <memory>
- #include "../src/core/wave.h"
--#include "catch/single_include/catch.hpp"
-+#include <catch.hpp>
-
-
- 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 <catch.hpp>
-
-
- 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 <catch.hpp>
-
-
- 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 <catch.hpp>
-
-
- using std::string;
+++ /dev/null
-Description: Fix FTBFS on some archs.
-Author: James Cowgill <jcowgill@debian.org>
-jcowgill@debian.org
-Forwarded: Giada LoopMachine <giadaloopmachine@gmail.com>
-
-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. */
-
projects / giada.git / commitdiff