Refresh patches

diff --git a/debian/patches/02-geompp.patch b/debian/patches/02-geompp.patch
index 16a2c4039b60062d787a29421c16bd8d97df2e86..7f3529597c1c95c50b143ed8b3e5cc2aa3e28ac5 100644 (file)
--- a/debian/patches/02-geompp.patch
+++ b/debian/patches/02-geompp.patch
@@ -20,11 +20,8 @@ Last-Update: 2021-08-30
  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
-+++ b/src/deps/geompp/src/line.hpp
++++ giada/src/deps/geompp/src/line.hpp
 @@ -0,0 +1,81 @@
 +/* -----------------------------------------------------------------------------
 + *
@@ -108,11 +105,8 @@ index 0000000..5ca16fe
 +
 +#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
-+++ b/src/deps/geompp/src/point.hpp
++++ giada/src/deps/geompp/src/point.hpp
 @@ -0,0 +1,80 @@
 +/* -----------------------------------------------------------------------------
 + *
@@ -194,11 +188,8 @@ index 0000000..5b80b6b
 +} // 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
-+++ b/src/deps/geompp/src/range.hpp
++++ giada/src/deps/geompp/src/range.hpp
 @@ -0,0 +1,61 @@
 +/* -----------------------------------------------------------------------------
 + *
@@ -261,11 +252,8 @@ index 0000000..80dbe2d
 +} // 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
-+++ b/src/deps/geompp/src/rect.hpp
++++ giada/src/deps/geompp/src/rect.hpp
 @@ -0,0 +1,236 @@
 +/* -----------------------------------------------------------------------------
 + *

diff --git a/debian/patches/04-system-json.patch b/debian/patches/04-system-json.patch
index 972874bb12031ee0f836120aafa9a932ed96f725..6f949462a6174509c1dd4b41be84191f7b801627 100644 (file)
--- a/debian/patches/04-system-json.patch
+++ b/debian/patches/04-system-json.patch
@@ -13,10 +13,8 @@ Last-Update: 2020-04-02
  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
+--- giada.orig/src/core/conf.cpp
++++ giada/src/core/conf.cpp
 @@ -27,7 +27,7 @@
  #include "core/conf.h"
  #include "core/const.h"
@@ -26,10 +24,8 @@ index 7240433..dd3167b 100644
  #include "utils/fs.h"
  #include "utils/log.h"
  #include <FL/Fl.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
+--- giada.orig/src/core/midiMapper.h
++++ giada/src/core/midiMapper.h
 @@ -27,7 +27,7 @@
  #ifndef G_MIDIMAPPER_H
  #define G_MIDIMAPPER_H
@@ -39,10 +35,8 @@ index 694ffe5..3596e19 100644
  #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
+--- giada.orig/src/core/patch.cpp
++++ giada/src/core/patch.cpp
 @@ -26,7 +26,7 @@
  
  #include "patch.h"

diff --git a/debian/patches/06-system-jpg+png.patch b/debian/patches/06-system-jpg+png.patch
index 094d0eef9b7119b1a3586712b1298d4b0dfa8fe1..d596dddb2d3b0c804bab2b348f53811599f2d623 100644 (file)
--- a/debian/patches/06-system-jpg+png.patch
+++ b/debian/patches/06-system-jpg+png.patch
@@ -4,11 +4,9 @@ Forwarded: not-needed
 Last-Update: 2021-12-20
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: giada-0.19.1+ds1/CMakeLists.txt
-===================================================================
---- giada-0.19.1+ds1.orig/CMakeLists.txt
-+++ giada-0.19.1+ds1/CMakeLists.txt
-@@ -385,6 +385,9 @@ else()
+--- giada.orig/CMakeLists.txt
++++ giada/CMakeLists.txt
+@@ -385,6 +385,9 @@
        message("Libsamplerate library found in " ${LIBRARY_SAMPLERATE})
  endif()
  

diff --git a/debian/patches/RtAudio52.patch b/debian/patches/RtAudio52.patch
index 215b85e6cdb02bfeda48aacf5422598c121aca5f..55063c0e1df924be4144cb522f4a12e5ac57477d 100644 (file)
--- a/debian/patches/RtAudio52.patch
+++ b/debian/patches/RtAudio52.patch
@@ -7,11 +7,9 @@ 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(-)
 
-diff --git a/src/core/kernelAudio.cpp b/src/core/kernelAudio.cpp
-index 4a52d88..df7ae5b 100644
---- a/src/core/kernelAudio.cpp
-+++ b/src/core/kernelAudio.cpp
-@@ -94,10 +94,6 @@ int KernelAudio::openDevice(const Conf::Data& conf)
+--- giada.orig/src/core/kernelAudio.cpp
++++ giada/src/core/kernelAudio.cpp
+@@ -94,10 +94,6 @@
                return 0;
        }
  
@@ -22,7 +20,7 @@ index 4a52d88..df7ae5b 100644
        u::log::print("[KA] Opening device out=%d, in=%d, samplerate=%d\n",
            conf.soundDeviceOut, conf.soundDeviceIn, conf.samplerate);
  
-@@ -158,33 +154,33 @@ int KernelAudio::openDevice(const Conf::Data& conf)
+@@ -158,33 +154,33 @@
  
  #endif
  
@@ -78,7 +76,7 @@ index 4a52d88..df7ae5b 100644
                closeDevice();
                return 0;
        }
-@@ -194,24 +190,33 @@ int KernelAudio::openDevice(const Conf::Data& conf)
+@@ -194,24 +190,33 @@
  
  int KernelAudio::startStream()
  {
@@ -118,7 +116,7 @@ index 4a52d88..df7ae5b 100644
  }
  
  /* -------------------------------------------------------------------------- */
-@@ -328,24 +333,32 @@ void KernelAudio::logCompiledAPIs()
+@@ -328,24 +333,32 @@
  
  m::KernelAudio::Device KernelAudio::fetchDevice(size_t deviceIndex) const
  {