From: IOhannes m zmölnig (Debian/GNU) Date: Tue, 22 Oct 2019 09:48:27 +0000 (+0200) Subject: Update patches X-Git-Tag: archive/raspbian/5.4.5_ds0-1+rpi1^2~15 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7b37ad5054201054fc02e982854dbd2f03f8fdac;p=juce.git Update patches --- diff --git a/debian/patches/LV2-audioprocessor.patch b/debian/patches/LV2-audioprocessor.patch index e8cf7b34..d0e84422 100644 --- a/debian/patches/LV2-audioprocessor.patch +++ b/debian/patches/LV2-audioprocessor.patch @@ -11,9 +11,11 @@ Reviewed-by: IOhannes m zmölnig .../juce_audio_processors/processors/juce_AudioProcessor.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---- juce.orig/modules/juce_audio_processors/processors/juce_AudioProcessor.h -+++ juce/modules/juce_audio_processors/processors/juce_AudioProcessor.h -@@ -927,6 +927,7 @@ +diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.h b/modules/juce_audio_processors/processors/juce_AudioProcessor.h +index 04a11a9..da26e3c 100644 +--- a/modules/juce_audio_processors/processors/juce_AudioProcessor.h ++++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.h +@@ -927,6 +927,7 @@ public: */ virtual void setNonRealtime (bool isNonRealtime) noexcept; @@ -21,7 +23,7 @@ Reviewed-by: IOhannes m zmölnig //============================================================================== /** Creates the processor's GUI. -@@ -973,6 +974,7 @@ +@@ -973,6 +974,7 @@ public: This may call createEditor() internally to create the component. */ AudioProcessorEditor* createEditorIfNeeded(); @@ -29,19 +31,19 @@ Reviewed-by: IOhannes m zmölnig //============================================================================== /** Returns the default number of steps for a parameter. -@@ -1108,6 +1110,11 @@ +@@ -1107,6 +1109,11 @@ public: + /** This method is called when the layout of the audio processor changes. */ virtual void processorLayoutsChanged(); - //============================================================================== ++ //============================================================================== + /** LV2 specific calls, saving/restore as string. */ + virtual String getStateInformationString () { return String(); } + virtual void setStateInformationString (const String&) {} + -+ //============================================================================== + //============================================================================== /** Adds a listener that will be called when an aspect of this processor changes. */ virtual void addListener (AudioProcessorListener* newListener); - -@@ -1177,9 +1184,11 @@ +@@ -1177,9 +1184,11 @@ public: virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const { return {}; } @@ -53,7 +55,7 @@ Reviewed-by: IOhannes m zmölnig /** Flags to indicate the type of plugin context in which a processor is being used. */ enum WrapperType -@@ -1193,6 +1202,7 @@ +@@ -1193,6 +1202,7 @@ public: wrapperType_AAX, wrapperType_Standalone, wrapperType_Unity @@ -61,7 +63,7 @@ Reviewed-by: IOhannes m zmölnig }; /** When loaded by a plugin wrapper, this flag will be set to indicate the type -@@ -1453,7 +1463,9 @@ +@@ -1453,7 +1463,9 @@ private: //============================================================================== Array listeners; diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch index 7486e104..a853ce64 100644 --- a/debian/patches/debian_fixed-defines.patch +++ b/debian/patches/debian_fixed-defines.patch @@ -11,8 +11,10 @@ Forwarded: not-needed modules/juce_core/juce_core.h | 32 +++++++++++++++++++++- 2 files changed, 56 insertions(+), 1 deletion(-) ---- juce.orig/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h -+++ juce/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h +diff --git a/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h b/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h +index b5278b1..4c0a9ba 100644 +--- a/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h ++++ b/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h @@ -24,6 +24,30 @@ ============================================================================== */ @@ -52,8 +54,10 @@ Forwarded: not-needed #ifndef JucePlugin_IsSynth #error "You need to define the JucePlugin_IsSynth value!" #endif ---- juce.orig/modules/juce_core/juce_core.h -+++ juce/modules/juce_core/juce_core.h +diff --git a/modules/juce_core/juce_core.h b/modules/juce_core/juce_core.h +index 9cd4146..e26e139 100644 +--- a/modules/juce_core/juce_core.h ++++ b/modules/juce_core/juce_core.h @@ -64,6 +64,36 @@ #include "system/juce_TargetPlatform.h" diff --git a/debian/patches/debian_gpl_variant.patch b/debian/patches/debian_gpl_variant.patch index 22499ffe..59066996 100644 --- a/debian/patches/debian_gpl_variant.patch +++ b/debian/patches/debian_gpl_variant.patch @@ -7,8 +7,10 @@ Forwarded: not-needed extras/Projucer/JuceLibraryCode/AppConfig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h -+++ juce/extras/Projucer/JuceLibraryCode/AppConfig.h +diff --git a/extras/Projucer/JuceLibraryCode/AppConfig.h b/extras/Projucer/JuceLibraryCode/AppConfig.h +index dffd5af..052635d 100644 +--- a/extras/Projucer/JuceLibraryCode/AppConfig.h ++++ b/extras/Projucer/JuceLibraryCode/AppConfig.h @@ -32,7 +32,7 @@ // BEGIN SECTION A diff --git a/debian/patches/debian_link_systemlibs.patch b/debian/patches/debian_link_systemlibs.patch index 4be7166e..a4c47a62 100644 --- a/debian/patches/debian_link_systemlibs.patch +++ b/debian/patches/debian_link_systemlibs.patch @@ -1,15 +1,23 @@ -Description: have Projucer link against the system libraries - since the Debian package has removed 3rd-party libraries (jpeg, png, flag, - ogg/vorbis), we must use against the system libraries. -Author: IOhannes m zmölnig +From: Debian Multimedia Maintainers +Date: Wed, 23 Oct 2019 09:44:36 +0200 +Subject: have Projucer link against the system libraries + Origin: Debian Forwarded: no Last-Update: 2019-08-21 + +since the Debian package has removed 3rd-party libraries (jpeg, png, flag, +ogg/vorbis), we must use against the system libraries. +Last-Update: 2019-08-21 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -+++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -@@ -464,6 +464,39 @@ + .../ProjectSaving/jucer_ProjectExport_Make.h | 36 ++++++++++++++++++++++ + 1 file changed, 36 insertions(+) + +diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h +index 88fd4f1..cdac636 100644 +--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h ++++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h +@@ -464,6 +464,39 @@ private: if (isCurlEnabled() && ! isLoadCurlSymbolsLazilyEnabled()) packages.add ("libcurl"); @@ -49,7 +57,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ packages.removeDuplicates (false); return packages; -@@ -563,6 +596,9 @@ +@@ -563,6 +596,9 @@ private: StringArray result (linuxLibs); auto libraries = StringArray::fromTokens (getExternalLibrariesString(), ";", "\"'"); diff --git a/debian/patches/debian_no-update-check.patch b/debian/patches/debian_no-update-check.patch index 3cf23572..1048be1d 100644 --- a/debian/patches/debian_no-update-check.patch +++ b/debian/patches/debian_no-update-check.patch @@ -9,9 +9,11 @@ Forwarded: not-needed extras/Projucer/Source/Application/jucer_AutoUpdater.cpp | 1 + 1 file changed, 1 insertion(+) ---- juce.orig/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp -+++ juce/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp -@@ -42,6 +42,7 @@ +diff --git a/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp b/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp +index a54b527..2014b10 100644 +--- a/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp ++++ b/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp +@@ -42,6 +42,7 @@ LatestVersionCheckerAndUpdater::~LatestVersionCheckerAndUpdater() void LatestVersionCheckerAndUpdater::checkForNewVersion (bool showAlerts) { diff --git a/debian/patches/debian_no-usagedata.patch b/debian/patches/debian_no-usagedata.patch index c3ae4901..6c497998 100644 --- a/debian/patches/debian_no-usagedata.patch +++ b/debian/patches/debian_no-usagedata.patch @@ -8,9 +8,11 @@ Forwarded: no .../Application/Windows/jucer_ApplicationUsageDataWindowComponent.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---- juce.orig/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h -+++ juce/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h -@@ -69,10 +69,10 @@ +diff --git a/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h b/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h +index c9a06df..6a48b68 100644 +--- a/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h ++++ b/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h +@@ -69,10 +69,10 @@ public: auto* controller = ProjucerApplication::getApp().licenseController.get(); diff --git a/debian/patches/debian_python3.patch b/debian/patches/debian_python3.patch index 3136281d..ad562133 100644 --- a/debian/patches/debian_python3.patch +++ b/debian/patches/debian_python3.patch @@ -8,9 +8,11 @@ Forwarded: no doxygen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- juce.orig/doxygen/Makefile -+++ juce/doxygen/Makefile -@@ -8,7 +8,7 @@ +diff --git a/doxygen/Makefile b/doxygen/Makefile +index d4f5d3e..157ec0e 100644 +--- a/doxygen/Makefile ++++ b/doxygen/Makefile +@@ -8,7 +8,7 @@ doc/index.html: build/juce_modules.dox Doxyfile doxygen build/juce_modules.dox: process_source_files.py $(SOURCE_FILES) diff --git a/debian/patches/debian_system_modules.patch b/debian/patches/debian_system_modules.patch index 38bfb382..e0d87d80 100644 --- a/debian/patches/debian_system_modules.patch +++ b/debian/patches/debian_system_modules.patch @@ -9,9 +9,11 @@ Forwarded: not-needed extras/Projucer/Source/Settings/jucer_StoredSettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- juce.orig/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp -+++ juce/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp -@@ -385,7 +385,7 @@ +diff --git a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp +index 08da017..13fee5a 100644 +--- a/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp ++++ b/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp +@@ -385,7 +385,7 @@ static String getFallbackPathForOS (const Identifier& key, DependencyPathOS os) } else if (key == Ids::defaultJuceModulePath) { diff --git a/debian/patches/debian_unittests_globalpaths.patch b/debian/patches/debian_unittests_globalpaths.patch index fb6094d2..4d9078b3 100644 --- a/debian/patches/debian_unittests_globalpaths.patch +++ b/debian/patches/debian_unittests_globalpaths.patch @@ -7,8 +7,10 @@ Forwarded: not-needed extras/UnitTestRunner/UnitTestRunner.jucer | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) ---- juce.orig/extras/UnitTestRunner/UnitTestRunner.jucer -+++ juce/extras/UnitTestRunner/UnitTestRunner.jucer +diff --git a/extras/UnitTestRunner/UnitTestRunner.jucer b/extras/UnitTestRunner/UnitTestRunner.jucer +index 6cbcaba..cea1300 100644 +--- a/extras/UnitTestRunner/UnitTestRunner.jucer ++++ b/extras/UnitTestRunner/UnitTestRunner.jucer @@ -123,26 +123,26 @@ diff --git a/debian/patches/debian_vst.patch b/debian/patches/debian_vst.patch index 2ff02c5e..fa4a899d 100644 --- a/debian/patches/debian_vst.patch +++ b/debian/patches/debian_vst.patch @@ -1,12 +1,21 @@ -Description: provide missing VST2 replacement header - backprted from the original JUCE-5.3.1 header -Author: IOhannes m zmölnig +From: Debian Multimedia Maintainers +Date: Wed, 23 Oct 2019 09:44:36 +0200 +Subject: provide missing VST2 replacement header + +Last-Update: 2019-01-12 + +backprted from the original JUCE-5.3.1 header Last-Update: 2019-01-12 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp -+++ juce/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp -@@ -101,8 +101,7 @@ + modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp | 4 +--- + .../juce_audio_processors/format_types/juce_VSTPluginFormat.cpp | 7 ++++--- + 2 files changed, 5 insertions(+), 6 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 9b9a7f9..632677d 100644 +--- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp ++++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp +@@ -101,8 +101,7 @@ namespace Vst2 // 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. You // also need a VST2 license from Steinberg to distribute VST2 plug-ins. @@ -16,7 +25,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ } using namespace juce; -@@ -124,7 +123,6 @@ +@@ -124,7 +123,6 @@ using namespace juce; #pragma pack (push, 8) #endif @@ -24,8 +33,10 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ #include "../utility/juce_IncludeModuleHeaders.h" #include "../utility/juce_FakeMouseMoveGenerator.h" ---- juce.orig/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp -+++ juce/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp +diff --git a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp +index 85dfb78..ad0a8e5 100644 +--- a/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp ++++ b/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp @@ -49,7 +49,6 @@ #endif @@ -34,7 +45,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ namespace Vst2 { -@@ -58,8 +57,7 @@ +@@ -58,8 +57,7 @@ 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. @@ -44,7 +55,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ } #include "juce_VSTCommon.h" -@@ -81,6 +79,9 @@ +@@ -81,6 +79,9 @@ namespace Vst2 #include "juce_VSTMidiEventList.h" diff --git a/debian/patches/jack-client-name.patch b/debian/patches/jack-client-name.patch index ab7c4164..d40af5db 100644 --- a/debian/patches/jack-client-name.patch +++ b/debian/patches/jack-client-name.patch @@ -11,9 +11,11 @@ Forwarded: https://github.com/WeAreROLI/JUCE/pull/351 modules/juce_audio_devices/native/juce_linux_JackAudio.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---- juce.orig/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp -+++ juce/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp -@@ -105,7 +105,11 @@ +diff --git a/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp b/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp +index 35302a3..7031e1d 100644 +--- a/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp ++++ b/modules/juce_audio_devices/native/juce_linux_JackAudio.cpp +@@ -105,7 +105,11 @@ namespace //============================================================================== #ifndef JUCE_JACK_CLIENT_NAME diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch index ba5f005c..332205c0 100644 --- a/debian/patches/spelling.patch +++ b/debian/patches/spelling.patch @@ -1,12 +1,20 @@ -Description: fixed spelling mistakes -Author: IOhannes m zmölnig +From: Debian Multimedia Maintainers +Date: Wed, 23 Oct 2019 09:44:36 +0200 +Subject: fixed spelling mistakes + Forwarded: no +Last-Update: 2019-01-12 + Last-Update: 2019-01-12 --- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h -+++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h -@@ -453,7 +453,7 @@ + extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h +index 1764dca..2a031f9 100644 +--- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h ++++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Xcode.h +@@ -470,7 +470,7 @@ public: props.add (new TextPropertyComponent (subprojectsValue, "Xcode Subprojects", 8192, true), "Paths to Xcode projects that should be added to the build (one per line). "