From a8be688fee307b3e401f85228373b1cdd7be308c Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig?= Date: Thu, 6 Feb 2020 09:55:16 +0100 Subject: [PATCH] Refresh patches --- debian/patches/LV2-audioprocessor.patch | 24 +++++++++---------- debian/patches/debian_fixed-defines.patch | 12 ++++------ debian/patches/debian_gpl_variant.patch | 6 ++--- debian/patches/debian_link_systemlibs.patch | 10 ++++---- debian/patches/debian_no-update-check.patch | 8 +++---- debian/patches/debian_no-usagedata.patch | 8 +++---- debian/patches/debian_python3.patch | 8 +++---- debian/patches/debian_system_modules.patch | 8 +++---- .../debian_unittests_globalpaths.patch | 6 ++--- debian/patches/debian_vst.patch | 20 +++++++--------- 10 files changed, 43 insertions(+), 67 deletions(-) diff --git a/debian/patches/LV2-audioprocessor.patch b/debian/patches/LV2-audioprocessor.patch index d0e84422..ea5b32de 100644 --- a/debian/patches/LV2-audioprocessor.patch +++ b/debian/patches/LV2-audioprocessor.patch @@ -11,11 +11,9 @@ Reviewed-by: IOhannes m zmölnig .../juce_audio_processors/processors/juce_AudioProcessor.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) -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: +--- juce.orig/modules/juce_audio_processors/processors/juce_AudioProcessor.h ++++ juce/modules/juce_audio_processors/processors/juce_AudioProcessor.h +@@ -927,6 +927,7 @@ */ virtual void setNonRealtime (bool isNonRealtime) noexcept; @@ -23,7 +21,7 @@ index 04a11a9..da26e3c 100644 //============================================================================== /** Creates the processor's GUI. -@@ -973,6 +974,7 @@ public: +@@ -976,6 +977,7 @@ This may call createEditor() internally to create the component. */ AudioProcessorEditor* createEditorIfNeeded(); @@ -31,19 +29,19 @@ index 04a11a9..da26e3c 100644 //============================================================================== /** Returns the default number of steps for a parameter. -@@ -1107,6 +1109,11 @@ public: - /** This method is called when the layout of the audio processor changes. */ +@@ -1118,6 +1120,11 @@ 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 @@ public: + +@@ -1187,9 +1194,11 @@ virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const { return {}; } @@ -55,7 +53,7 @@ index 04a11a9..da26e3c 100644 /** Flags to indicate the type of plugin context in which a processor is being used. */ enum WrapperType -@@ -1193,6 +1202,7 @@ public: +@@ -1203,6 +1212,7 @@ wrapperType_AAX, wrapperType_Standalone, wrapperType_Unity @@ -63,7 +61,7 @@ index 04a11a9..da26e3c 100644 }; /** When loaded by a plugin wrapper, this flag will be set to indicate the type -@@ -1453,7 +1463,9 @@ private: +@@ -1463,7 +1473,9 @@ //============================================================================== Array listeners; diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch index a853ce64..7486e104 100644 --- a/debian/patches/debian_fixed-defines.patch +++ b/debian/patches/debian_fixed-defines.patch @@ -11,10 +11,8 @@ Forwarded: not-needed modules/juce_core/juce_core.h | 32 +++++++++++++++++++++- 2 files changed, 56 insertions(+), 1 deletion(-) -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 +--- juce.orig/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h ++++ juce/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h @@ -24,6 +24,30 @@ ============================================================================== */ @@ -54,10 +52,8 @@ index b5278b1..4c0a9ba 100644 #ifndef JucePlugin_IsSynth #error "You need to define the JucePlugin_IsSynth value!" #endif -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 +--- juce.orig/modules/juce_core/juce_core.h ++++ juce/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 59066996..22499ffe 100644 --- a/debian/patches/debian_gpl_variant.patch +++ b/debian/patches/debian_gpl_variant.patch @@ -7,10 +7,8 @@ Forwarded: not-needed extras/Projucer/JuceLibraryCode/AppConfig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -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 +--- juce.orig/extras/Projucer/JuceLibraryCode/AppConfig.h ++++ juce/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 a4c47a62..3b791cee 100644 --- a/debian/patches/debian_link_systemlibs.patch +++ b/debian/patches/debian_link_systemlibs.patch @@ -13,11 +13,9 @@ Last-Update: 2019-08-21 .../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: +--- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h ++++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h +@@ -464,6 +464,39 @@ if (isCurlEnabled() && ! isLoadCurlSymbolsLazilyEnabled()) packages.add ("libcurl"); @@ -57,7 +55,7 @@ index 88fd4f1..cdac636 100644 packages.removeDuplicates (false); return packages; -@@ -563,6 +596,9 @@ private: +@@ -563,6 +596,9 @@ 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 1048be1d..3cf23572 100644 --- a/debian/patches/debian_no-update-check.patch +++ b/debian/patches/debian_no-update-check.patch @@ -9,11 +9,9 @@ Forwarded: not-needed extras/Projucer/Source/Application/jucer_AutoUpdater.cpp | 1 + 1 file changed, 1 insertion(+) -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() +--- juce.orig/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp ++++ juce/extras/Projucer/Source/Application/jucer_AutoUpdater.cpp +@@ -42,6 +42,7 @@ void LatestVersionCheckerAndUpdater::checkForNewVersion (bool showAlerts) { diff --git a/debian/patches/debian_no-usagedata.patch b/debian/patches/debian_no-usagedata.patch index 6c497998..c3ae4901 100644 --- a/debian/patches/debian_no-usagedata.patch +++ b/debian/patches/debian_no-usagedata.patch @@ -8,11 +8,9 @@ Forwarded: no .../Application/Windows/jucer_ApplicationUsageDataWindowComponent.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -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: +--- juce.orig/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h ++++ juce/extras/Projucer/Source/Application/Windows/jucer_ApplicationUsageDataWindowComponent.h +@@ -69,10 +69,10 @@ auto* controller = ProjucerApplication::getApp().licenseController.get(); diff --git a/debian/patches/debian_python3.patch b/debian/patches/debian_python3.patch index ad562133..3136281d 100644 --- a/debian/patches/debian_python3.patch +++ b/debian/patches/debian_python3.patch @@ -8,11 +8,9 @@ Forwarded: no doxygen/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -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 +--- juce.orig/doxygen/Makefile ++++ juce/doxygen/Makefile +@@ -8,7 +8,7 @@ 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 e0d87d80..38bfb382 100644 --- a/debian/patches/debian_system_modules.patch +++ b/debian/patches/debian_system_modules.patch @@ -9,11 +9,9 @@ Forwarded: not-needed extras/Projucer/Source/Settings/jucer_StoredSettings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -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) +--- juce.orig/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp ++++ juce/extras/Projucer/Source/Settings/jucer_StoredSettings.cpp +@@ -385,7 +385,7 @@ } else if (key == Ids::defaultJuceModulePath) { diff --git a/debian/patches/debian_unittests_globalpaths.patch b/debian/patches/debian_unittests_globalpaths.patch index 4d9078b3..fb6094d2 100644 --- a/debian/patches/debian_unittests_globalpaths.patch +++ b/debian/patches/debian_unittests_globalpaths.patch @@ -7,10 +7,8 @@ Forwarded: not-needed extras/UnitTestRunner/UnitTestRunner.jucer | 38 +++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) -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 +--- juce.orig/extras/UnitTestRunner/UnitTestRunner.jucer ++++ juce/extras/UnitTestRunner/UnitTestRunner.jucer @@ -123,26 +123,26 @@ diff --git a/debian/patches/debian_vst.patch b/debian/patches/debian_vst.patch index fa4a899d..11eb4401 100644 --- a/debian/patches/debian_vst.patch +++ b/debian/patches/debian_vst.patch @@ -11,11 +11,9 @@ Last-Update: 2019-01-12 .../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 +--- 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 @@ // 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. @@ -25,7 +23,7 @@ index 9b9a7f9..632677d 100644 } using namespace juce; -@@ -124,7 +123,6 @@ using namespace juce; +@@ -124,7 +123,6 @@ #pragma pack (push, 8) #endif @@ -33,10 +31,8 @@ index 9b9a7f9..632677d 100644 #include "../utility/juce_IncludeModuleHeaders.h" #include "../utility/juce_FakeMouseMoveGenerator.h" -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 +--- juce.orig/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp ++++ juce/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp @@ -49,7 +49,6 @@ #endif @@ -45,7 +41,7 @@ index 85dfb78..ad0a8e5 100644 namespace Vst2 { -@@ -58,8 +57,7 @@ namespace Vst2 +@@ -58,8 +57,7 @@ // 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. @@ -55,7 +51,7 @@ index 85dfb78..ad0a8e5 100644 } #include "juce_VSTCommon.h" -@@ -81,6 +79,9 @@ namespace Vst2 +@@ -81,6 +79,9 @@ #include "juce_VSTMidiEventList.h" -- 2.30.2