-Description: Patch-in dependency library 'geompp'
- 'geompp' is a GPL-3 licensed header-only helper-library by giada-upstream
- that is only referenced via a gitmodule; we include it via quilt
-Author: Giovanni A. Zuliani | Monocasual
+From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
+Date: Fri, 17 Dec 2021 10:37:21 +0100
+Subject: Patch-in dependency library 'geompp'
+
Origin: upstream
Forwarded: not-needed
Last-Update: 2021-08-30
+
+'geompp' is a GPL-3 licensed header-only helper-library by giada-upstream
+that is only referenced via a gitmodule; we include it via quilt
+Last-Update: 2021-08-30
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ src/deps/geompp/src/line.hpp | 81 +++++++++++++++
+ src/deps/geompp/src/point.hpp | 80 ++++++++++++++
+ src/deps/geompp/src/range.hpp | 61 +++++++++++
+ src/deps/geompp/src/rect.hpp | 236 ++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 458 insertions(+)
+ create mode 100644 src/deps/geompp/src/line.hpp
+ create mode 100644 src/deps/geompp/src/point.hpp
+ create mode 100644 src/deps/geompp/src/range.hpp
+ create mode 100644 src/deps/geompp/src/rect.hpp
+
+diff --git a/src/deps/geompp/src/line.hpp b/src/deps/geompp/src/line.hpp
+new file mode 100644
+index 0000000..5ca16fe
--- /dev/null
-+++ giada/src/deps/geompp/src/line.hpp
++++ b/src/deps/geompp/src/line.hpp
@@ -0,0 +1,81 @@
+/* -----------------------------------------------------------------------------
+ *
+
+#endif
\ No newline at end of file
+diff --git a/src/deps/geompp/src/point.hpp b/src/deps/geompp/src/point.hpp
+new file mode 100644
+index 0000000..5b80b6b
--- /dev/null
-+++ giada/src/deps/geompp/src/point.hpp
++++ b/src/deps/geompp/src/point.hpp
@@ -0,0 +1,80 @@
+/* -----------------------------------------------------------------------------
+ *
+} // namespace geompp
+
+#endif
+diff --git a/src/deps/geompp/src/range.hpp b/src/deps/geompp/src/range.hpp
+new file mode 100644
+index 0000000..80dbe2d
--- /dev/null
-+++ giada/src/deps/geompp/src/range.hpp
++++ b/src/deps/geompp/src/range.hpp
@@ -0,0 +1,61 @@
+/* -----------------------------------------------------------------------------
+ *
+} // namespace geompp
+
+#endif
+diff --git a/src/deps/geompp/src/rect.hpp b/src/deps/geompp/src/rect.hpp
+new file mode 100644
+index 0000000..e9e5805
--- /dev/null
-+++ giada/src/deps/geompp/src/rect.hpp
++++ b/src/deps/geompp/src/rect.hpp
@@ -0,0 +1,236 @@
+/* -----------------------------------------------------------------------------
+ *
-Description: Use system-provided RtAudio
-Author: IOhannes m zmölnig
+From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
+Date: Fri, 17 Dec 2021 10:37:21 +0100
+Subject: Use system-provided RtAudio
+
Origin: Debian
Forwarded: not-needed
+Last-Update: 2021-08-30
+
Last-Update: 2021-08-30
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- giada.orig/src/glue/config.cpp
-+++ giada/src/glue/config.cpp
+ CMakeLists.txt | 12 ++++++++++--
+ src/core/kernelAudio.h | 2 +-
+ src/glue/config.cpp | 4 ++--
+ src/gui/elems/config/tabAudio.cpp | 2 +-
+ src/utils/ver.cpp | 2 +-
+ 5 files changed, 15 insertions(+), 7 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0c4427e..cbd2878 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -196,7 +196,6 @@ list(APPEND SOURCES
+ src/utils/fs.cpp
+ src/utils/ver.cpp
+ src/utils/string.cpp
+- src/deps/rtaudio/RtAudio.cpp
+ src/deps/mcl-audio-buffer/src/audioBuffer.cpp)
+
+ list(APPEND PREPROCESSOR_DEFS)
+@@ -286,6 +285,15 @@ elseif (PkgConfig_FOUND)
+ endif()
+ endif()
+
++if (PkgConfig_FOUND)
++ pkg_check_modules(RtAudio IMPORTED_TARGET rtaudio)
++ if (RtAudio_FOUND)
++ list(APPEND LIBRARIES PkgConfig::RtAudio)
++ message("RtAudio library found")
++ endif()
++endif()
++
++
+ if (NOT RtMidi_FOUND)
+ # Fallback to find_library mode (in case rtmidi is too old).
+ find_library(LIBRARY_RTMIDI NAMES rtmidi)
+@@ -581,4 +589,4 @@ elseif(DEFINED OS_MACOS)
+ set_target_properties(giada PROPERTIES
+ XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME YES)
+
+-endif()
+\ No newline at end of file
++endif()
+diff --git a/src/core/kernelAudio.h b/src/core/kernelAudio.h
+index 706d662..1eddf0d 100644
+--- a/src/core/kernelAudio.h
++++ b/src/core/kernelAudio.h
+@@ -28,7 +28,7 @@
+ #define G_KERNELAUDIO_H
+
+ #include "core/conf.h"
+-#include "deps/rtaudio/RtAudio.h"
++#include "rtaudio/RtAudio.h"
+ #include <functional>
+ #include <memory>
+ #include <string>
+diff --git a/src/glue/config.cpp b/src/glue/config.cpp
+index 088d0f7..129b105 100644
+--- a/src/glue/config.cpp
++++ b/src/glue/config.cpp
@@ -32,7 +32,7 @@
#include "core/kernelMidi.h"
#include "core/midiMapper.h"
#include "gui/dialogs/browser/browserDir.h"
#include "gui/dialogs/config.h"
#include "gui/dialogs/warnings.h"
-@@ -328,4 +328,4 @@
+@@ -328,4 +328,4 @@ void setPluginPathCb(void* data)
configWin->tabPlugins->rebuild();
}
#endif
-} // namespace giada::c::config
\ No newline at end of file
+} // namespace giada::c::config
---- giada.orig/src/gui/elems/config/tabAudio.cpp
-+++ giada/src/gui/elems/config/tabAudio.cpp
+diff --git a/src/gui/elems/config/tabAudio.cpp b/src/gui/elems/config/tabAudio.cpp
+index 8539215..7a02eec 100644
+--- a/src/gui/elems/config/tabAudio.cpp
++++ b/src/gui/elems/config/tabAudio.cpp
@@ -27,7 +27,7 @@
#include "tabAudio.h"
#include "core/const.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
+diff --git a/src/utils/ver.cpp b/src/utils/ver.cpp
+index 449b763..4129bbc 100644
+--- a/src/utils/ver.cpp
++++ b/src/utils/ver.cpp
@@ -26,7 +26,7 @@
#include "ver.h"
#include <RtMidi.h>
#include <sndfile.h>
---- giada.orig/src/core/kernelAudio.h
-+++ giada/src/core/kernelAudio.h
-@@ -28,7 +28,7 @@
- #define G_KERNELAUDIO_H
-
- #include "core/conf.h"
--#include "deps/rtaudio/RtAudio.h"
-+#include "rtaudio/RtAudio.h"
- #include <functional>
- #include <memory>
- #include <string>
---- giada.orig/CMakeLists.txt
-+++ giada/CMakeLists.txt
-@@ -196,7 +196,6 @@
- src/utils/fs.cpp
- src/utils/ver.cpp
- src/utils/string.cpp
-- src/deps/rtaudio/RtAudio.cpp
- src/deps/mcl-audio-buffer/src/audioBuffer.cpp)
-
- list(APPEND PREPROCESSOR_DEFS)
-@@ -286,6 +285,15 @@
- endif()
- endif()
-
-+if (PkgConfig_FOUND)
-+ pkg_check_modules(RtAudio IMPORTED_TARGET rtaudio)
-+ if (RtAudio_FOUND)
-+ list(APPEND LIBRARIES PkgConfig::RtAudio)
-+ message("RtAudio library found")
-+ endif()
-+endif()
-+
-+
- if (NOT RtMidi_FOUND)
- # Fallback to find_library mode (in case rtmidi is too old).
- find_library(LIBRARY_RTMIDI NAMES rtmidi)
-@@ -581,4 +589,4 @@
- set_target_properties(giada PROPERTIES
- XCODE_ATTRIBUTE_ENABLE_HARDENED_RUNTIME YES)
-
--endif()
-\ No newline at end of file
-+endif()
-Description: Build against system-provided nlohmann/json
-Author: IOhannes m zmölnig
+From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
+Date: Fri, 17 Dec 2021 10:37:21 +0100
+Subject: Build against system-provided nlohmann/json
+
Origin: Debian
Forwarded: no
+Last-Update: 2020-04-02
+
Last-Update: 2020-04-02
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- giada.orig/src/core/conf.cpp
-+++ giada/src/core/conf.cpp
+ src/core/conf.cpp | 2 +-
+ src/core/midiMapper.h | 2 +-
+ src/core/patch.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/conf.cpp b/src/core/conf.cpp
+index 7240433..dd3167b 100644
+--- a/src/core/conf.cpp
++++ b/src/core/conf.cpp
@@ -27,7 +27,7 @@
#include "core/conf.h"
#include "core/const.h"
#include "utils/fs.h"
#include "utils/log.h"
#include <FL/Fl.H>
---- giada.orig/src/core/patch.cpp
-+++ giada/src/core/patch.cpp
-@@ -26,7 +26,7 @@
-
- #include "patch.h"
- #include "core/mixer.h"
--#include "deps/json/single_include/nlohmann/json.hpp"
-+#include "nlohmann/json.hpp"
- #include "utils/log.h"
- #include "utils/math.h"
- #include <fstream>
---- giada.orig/src/core/midiMapper.h
-+++ giada/src/core/midiMapper.h
+diff --git a/src/core/midiMapper.h b/src/core/midiMapper.h
+index 694ffe5..3596e19 100644
+--- a/src/core/midiMapper.h
++++ b/src/core/midiMapper.h
@@ -27,7 +27,7 @@
#ifndef G_MIDIMAPPER_H
#define G_MIDIMAPPER_H
#include <string>
#include <vector>
+diff --git a/src/core/patch.cpp b/src/core/patch.cpp
+index 2db30e4..95041af 100644
+--- a/src/core/patch.cpp
++++ b/src/core/patch.cpp
+@@ -26,7 +26,7 @@
+
+ #include "patch.h"
+ #include "core/mixer.h"
+-#include "deps/json/single_include/nlohmann/json.hpp"
++#include "nlohmann/json.hpp"
+ #include "utils/log.h"
+ #include "utils/math.h"
+ #include <fstream>
projects / giada.git / commitdiff