From 0a4f8a3b1040d0b58159d5b85c5930ec11b843b8 Mon Sep 17 00:00:00 2001
From: Dennis Braun <d_braun@kabelmail.de>
Date: Wed, 4 May 2022 17:30:12 +0200
Subject: [PATCH] Refresh patchset

---
 debian/patches/03-system-rtaudio.patch | 40 ++++++++++++--------------
 debian/patches/06-system-jpg+png.patch |  4 ++-
 debian/patches/RtAudio52.patch         | 10 ++++---
 debian/patches/missing-includes.patch  | 24 ----------------
 debian/patches/series                  |  1 -
 5 files changed, 27 insertions(+), 52 deletions(-)
 delete mode 100644 debian/patches/missing-includes.patch

diff --git a/debian/patches/03-system-rtaudio.patch b/debian/patches/03-system-rtaudio.patch
index 1c2dc44..4d06c21 100644
--- a/debian/patches/03-system-rtaudio.patch
+++ b/debian/patches/03-system-rtaudio.patch
@@ -4,20 +4,13 @@ Subject: Use system-provided RtAudio
 
 Origin: Debian
 Forwarded: not-needed
-Last-Update: 2021-08-30
-
-Last-Update: 2021-08-30
----
- 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(-)
+Last-Update: 2022-05-04
 
+Index: giada/CMakeLists.txt
+===================================================================
 --- giada.orig/CMakeLists.txt
 +++ giada/CMakeLists.txt
-@@ -201,7 +201,6 @@
+@@ -204,7 +204,6 @@ list(APPEND SOURCES
  	src/utils/fs.cpp
  	src/utils/ver.cpp
  	src/utils/string.cpp
@@ -25,7 +18,7 @@ Last-Update: 2021-08-30
  	src/deps/mcl-audio-buffer/src/audioBuffer.cpp)
  
  list(APPEND PREPROCESSOR_DEFS)
-@@ -291,6 +290,15 @@
+@@ -294,6 +293,15 @@ elseif (PkgConfig_FOUND)
  	endif()
  endif()
  
@@ -41,6 +34,8 @@ Last-Update: 2021-08-30
  if (NOT RtMidi_FOUND)
  	# Fallback to find_library mode (in case rtmidi is too old). 
  	find_library(LIBRARY_RTMIDI NAMES rtmidi)
+Index: giada/src/core/kernelAudio.h
+===================================================================
 --- giada.orig/src/core/kernelAudio.h
 +++ giada/src/core/kernelAudio.h
 @@ -28,7 +28,7 @@
@@ -49,9 +44,11 @@ Last-Update: 2021-08-30
  #include "core/conf.h"
 -#include "deps/rtaudio/RtAudio.h"
 +#include "rtaudio/RtAudio.h"
+ #include <cstddef>
  #include <functional>
  #include <memory>
- #include <string>
+Index: giada/src/glue/config.cpp
+===================================================================
 --- giada.orig/src/glue/config.cpp
 +++ giada/src/glue/config.cpp
 @@ -32,7 +32,7 @@
@@ -63,13 +60,8 @@ Last-Update: 2021-08-30
  #include "gui/dialogs/browser/browserDir.h"
  #include "gui/dialogs/config.h"
  #include "gui/dialogs/warnings.h"
-@@ -328,4 +328,4 @@
- 	configWin->tabPlugins->rebuild();
- }
- #endif
--} // namespace giada::c::config
-\ No newline at end of file
-+} // namespace giada::c::config
+Index: giada/src/gui/elems/config/tabAudio.cpp
+===================================================================
 --- giada.orig/src/gui/elems/config/tabAudio.cpp
 +++ giada/src/gui/elems/config/tabAudio.cpp
 @@ -27,7 +27,7 @@
@@ -79,8 +71,10 @@ Last-Update: 2021-08-30
 -#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"
+ #include "gui/elems/basics/choice.h"
+Index: giada/src/utils/ver.cpp
+===================================================================
 --- giada.orig/src/utils/ver.cpp
 +++ giada/src/utils/ver.cpp
 @@ -26,7 +26,7 @@
@@ -92,9 +86,11 @@ Last-Update: 2021-08-30
  #include <RtMidi.h>
  #include <sndfile.h>
  
+Index: giada/src/core/kernelAudio.cpp
+===================================================================
 --- giada.orig/src/core/kernelAudio.cpp
 +++ giada/src/core/kernelAudio.cpp
-@@ -262,7 +262,7 @@
+@@ -263,7 +263,7 @@ const std::vector<m::KernelAudio::Device
  #ifdef WITH_AUDIO_JACK
  jack_client_t* KernelAudio::getJackHandle() const
  {
diff --git a/debian/patches/06-system-jpg+png.patch b/debian/patches/06-system-jpg+png.patch
index e0c0790..0437243 100644
--- a/debian/patches/06-system-jpg+png.patch
+++ b/debian/patches/06-system-jpg+png.patch
@@ -4,9 +4,11 @@ Forwarded: not-needed
 Last-Update: 2021-12-20
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: giada/CMakeLists.txt
+===================================================================
 --- giada.orig/CMakeLists.txt
 +++ giada/CMakeLists.txt
-@@ -391,6 +391,9 @@
+@@ -394,6 +394,9 @@ else()
  	message("Libsamplerate library found in " ${LIBRARY_SAMPLERATE})
  endif()
  
diff --git a/debian/patches/RtAudio52.patch b/debian/patches/RtAudio52.patch
index 55063c0..b1fc3fb 100644
--- a/debian/patches/RtAudio52.patch
+++ b/debian/patches/RtAudio52.patch
@@ -7,9 +7,11 @@ Upstream vendored in a RtAudio-6 git snapshot and called it 5.2.0
  src/core/kernelAudio.cpp | 107 ++++++++++++++++++++++++++---------------------
  1 file changed, 60 insertions(+), 47 deletions(-)
 
+Index: giada/src/core/kernelAudio.cpp
+===================================================================
 --- giada.orig/src/core/kernelAudio.cpp
 +++ giada/src/core/kernelAudio.cpp
-@@ -94,10 +94,6 @@
+@@ -95,10 +95,6 @@ int KernelAudio::openDevice(const Conf::
  		return 0;
  	}
  
@@ -20,7 +22,7 @@ Upstream vendored in a RtAudio-6 git snapshot and called it 5.2.0
  	u::log::print("[KA] Opening device out=%d, in=%d, samplerate=%d\n",
  	    conf.soundDeviceOut, conf.soundDeviceIn, conf.samplerate);
  
-@@ -158,33 +154,33 @@
+@@ -159,33 +155,33 @@ int KernelAudio::openDevice(const Conf::
  
  #endif
  
@@ -76,7 +78,7 @@ Upstream vendored in a RtAudio-6 git snapshot and called it 5.2.0
  		closeDevice();
  		return 0;
  	}
-@@ -194,24 +190,33 @@
+@@ -195,24 +191,33 @@ int KernelAudio::openDevice(const Conf::
  
  int KernelAudio::startStream()
  {
@@ -116,7 +118,7 @@ Upstream vendored in a RtAudio-6 git snapshot and called it 5.2.0
  }
  
  /* -------------------------------------------------------------------------- */
-@@ -328,24 +333,32 @@
+@@ -329,24 +334,32 @@ void KernelAudio::logCompiledAPIs()
  
  m::KernelAudio::Device KernelAudio::fetchDevice(size_t deviceIndex) const
  {
diff --git a/debian/patches/missing-includes.patch b/debian/patches/missing-includes.patch
deleted file mode 100644
index 1e71df5..0000000
--- a/debian/patches/missing-includes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: fix missing standard-includes
- size_t requires <csstddef>
-Author: IOhannes m zmölnig
-Origin: Debian
-Bug: https://github.com/monocasual/giada/issues/570
-Last-Update: 2022-03-03
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- giada.orig/src/gui/elems/basics/flex.cpp
-+++ giada/src/gui/elems/basics/flex.cpp
-@@ -1,5 +1,6 @@
- #include "flex.h"
- #include <numeric>
-+#include <cstddef>
- 
- namespace giada::v
- {
-@@ -133,4 +134,4 @@
- 	Fl_Group::end();
- 	resize(x(), y(), w(), h());
- }
--} // namespace giada::v
-\ No newline at end of file
-+} // namespace giada::v
diff --git a/debian/patches/series b/debian/patches/series
index 7b5468b..1570baf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-missing-includes.patch
 02-geompp.patch
 03-system-rtaudio.patch
 04-system-json.patch
-- 
2.30.2