From: IOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>
Date: Fri, 17 Dec 2021 09:49:52 +0000 (+0100)
Subject: Refresh system-RtAudio patch
X-Git-Tag: archive/raspbian/0.20.1+ds1-1+rpi1~1^2~33
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=891b7026974b8bf9b54b948d2c7edb3c33d2c855;p=giada.git

Refresh system-RtAudio patch
---

diff --git a/debian/patches/03-system-rtaudio.patch b/debian/patches/03-system-rtaudio.patch
index da16000..67a457b 100644
--- a/debian/patches/03-system-rtaudio.patch
+++ b/debian/patches/03-system-rtaudio.patch
@@ -15,11 +15,9 @@ Last-Update: 2021-08-30
  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
+--- giada.orig/CMakeLists.txt
++++ giada/CMakeLists.txt
+@@ -196,7 +196,6 @@
  	src/utils/fs.cpp
  	src/utils/ver.cpp
  	src/utils/string.cpp
@@ -27,7 +25,7 @@ index 0c4427e..cbd2878 100644
  	src/deps/mcl-audio-buffer/src/audioBuffer.cpp)
  
  list(APPEND PREPROCESSOR_DEFS)
-@@ -286,6 +285,15 @@ elseif (PkgConfig_FOUND)
+@@ -286,6 +285,15 @@
  	endif()
  endif()
  
@@ -43,17 +41,15 @@ index 0c4427e..cbd2878 100644
  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)
+@@ -581,4 +589,4 @@
  	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
+--- giada.orig/src/core/kernelAudio.h
++++ giada/src/core/kernelAudio.h
 @@ -28,7 +28,7 @@
  #define G_KERNELAUDIO_H
  
@@ -63,10 +59,8 @@ index 706d662..1eddf0d 100644
  #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
+--- giada.orig/src/glue/config.cpp
++++ giada/src/glue/config.cpp
 @@ -32,7 +32,7 @@
  #include "core/kernelMidi.h"
  #include "core/midiMapper.h"
@@ -76,17 +70,15 @@ index 088d0f7..129b105 100644
  #include "gui/dialogs/browser/browserDir.h"
  #include "gui/dialogs/config.h"
  #include "gui/dialogs/warnings.h"
-@@ -328,4 +328,4 @@ void setPluginPathCb(void* data)
+@@ -328,4 +328,4 @@
  	configWin->tabPlugins->rebuild();
  }
  #endif
 -} // namespace giada::c::config
 \ No newline at end of file
 +} // namespace giada::c::config
-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
+--- 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"
@@ -96,10 +88,8 @@ index 8539215..7a02eec 100644
  #include "gui/elems/basics/box.h"
  #include "gui/elems/basics/button.h"
  #include "gui/elems/basics/check.h"
-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
+--- giada.orig/src/utils/ver.cpp
++++ giada/src/utils/ver.cpp
 @@ -26,7 +26,7 @@
  
  #include "ver.h"
@@ -109,3 +99,14 @@ index 449b763..4129bbc 100644
  #include <RtMidi.h>
  #include <sndfile.h>
  
+--- giada.orig/src/core/kernelAudio.cpp
++++ giada/src/core/kernelAudio.cpp
+@@ -262,7 +262,7 @@
+ #ifdef WITH_AUDIO_JACK
+ jack_client_t* KernelAudio::getJackHandle() const
+ {
+-	return static_cast<jack_client_t*>(m_rtAudio->HACK__getJackClient());
++	return nullptr;
+ }
+ #endif
+