From: IOhannes m zmölnig <zmoelnig@umlautS.umlaeute.mur.at>
Date: Wed, 3 Feb 2021 10:28:46 +0000 (+0100)
Subject: Drop compat-defines from debian_vst patch
X-Git-Tag: archive/raspbian/6.1.5_ds0-1+rpi1^2~70
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cf1fb180fbe67c04460e737a88a38274b3f12239;p=juce.git

Drop compat-defines from debian_vst patch

that was obviously the wrong approach...
---

diff --git a/debian/patches/debian_vst.patch b/debian/patches/debian_vst.patch
index eede4194..2b8c287a 100644
--- a/debian/patches/debian_vst.patch
+++ b/debian/patches/debian_vst.patch
@@ -7,9 +7,9 @@ Last-Update: 2019-01-12
 backprted from the original JUCE-5.3.1 header
 Last-Update: 2019-01-12
 ---
- modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp         | 3 +--
- .../juce_audio_processors/format_types/juce_VSTPluginFormat.cpp   | 8 +++++---
- 2 files changed, 6 insertions(+), 5 deletions(-)
+ modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp           | 3 +--
+ modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp | 4 ++--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
 
 diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
 index 6c97aa2..1a26c77 100644
@@ -26,18 +26,10 @@ index 6c97aa2..1a26c77 100644
  
  JUCE_END_IGNORE_WARNINGS_MSVC
 diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
-index d3b19a2..d3a6589 100644
+index d3b19a2..3859bbb 100644
 --- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
 +++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
-@@ -37,7 +37,6 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wzero-as-null-pointer-constant")
- JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4996)
- 
- #define VST_FORCE_DEPRECATED 0
--#define JUCE_VSTINTERFACE_H_INCLUDED 1
- 
- namespace Vst2
- {
-@@ -46,8 +45,8 @@ namespace Vst2
+@@ -46,8 +46,8 @@ namespace Vst2
  // paths or use the "VST (Legacy) SDK Folder" field in the Projucer. The VST2
  // SDK can be obtained from the vstsdk3610_11_06_2018_build_37 (or older) VST3
  // SDK or JUCE version 5.3.2.
@@ -48,13 +40,3 @@ index d3b19a2..d3a6589 100644
  }
  
  #include "juce_VSTCommon.h"
-@@ -60,6 +59,9 @@ JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4355)
- 
- #include "juce_VSTMidiEventList.h"
- 
-+#define resvd2 hostSpace2
-+#define nanoSeconds systemTimeNanoseconds
-+
- #if JUCE_MINGW
-  #ifndef WM_APPCOMMAND
-   #define WM_APPCOMMAND 0x0319