From: IOhannes m zmölnig Date: Wed, 13 Jan 2021 09:57:54 +0000 (+0100) Subject: Refresh patches X-Git-Tag: archive/raspbian/6.1.5_ds0-1+rpi1^2~94 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8e4be5cca3eb5c3f4e9e5d34479e365e9ca5cc7d;p=juce.git Refresh patches --- diff --git a/debian/patches/LV2-audioprocessor.patch b/debian/patches/LV2-audioprocessor.patch index b3205be7..c7a2f025 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 836b09c..c3909a7 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 +@@ -926,6 +926,7 @@ */ virtual void setNonRealtime (bool isNonRealtime) noexcept; @@ -23,7 +21,7 @@ index 836b09c..c3909a7 100644 //============================================================================== /** Creates the processor's GUI. -@@ -976,6 +977,7 @@ public: +@@ -975,6 +976,7 @@ This may call createEditor() internally to create the component. */ AudioProcessorEditor* createEditorIfNeeded(); @@ -31,19 +29,19 @@ index 836b09c..c3909a7 100644 //============================================================================== /** Returns the default number of steps for a parameter. -@@ -1117,6 +1119,11 @@ public: - /** This method is called when the layout of the audio processor changes. */ +@@ -1117,6 +1119,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); -@@ -1187,9 +1194,11 @@ public: + +@@ -1186,9 +1193,11 @@ virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const { return {}; } @@ -55,7 +53,7 @@ index 836b09c..c3909a7 100644 /** Flags to indicate the type of plugin context in which a processor is being used. */ enum WrapperType -@@ -1203,6 +1212,7 @@ public: +@@ -1202,6 +1211,7 @@ wrapperType_AAX, wrapperType_Standalone, wrapperType_Unity @@ -63,7 +61,7 @@ index 836b09c..c3909a7 100644 }; /** When loaded by a plugin wrapper, this flag will be set to indicate the type -@@ -1463,7 +1473,9 @@ private: +@@ -1462,7 +1472,9 @@ //============================================================================== Array listeners; @@ -72,4 +70,4 @@ index 836b09c..c3909a7 100644 + #endif double currentSampleRate = 0; int blockSize = 0, latencySamples = 0; - bool suspended = false, nonRealtime = false; + bool suspended = false; diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch index 426a1e62..27f7f216 100644 --- a/debian/patches/cross.patch +++ b/debian/patches/cross.patch @@ -6,11 +6,9 @@ Subject: cross extras/Projucer/Builds/LinuxMakefile/Makefile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) -diff --git a/extras/Projucer/Builds/LinuxMakefile/Makefile b/extras/Projucer/Builds/LinuxMakefile/Makefile -index 65fd56a..89f88e9 100644 ---- a/extras/Projucer/Builds/LinuxMakefile/Makefile -+++ b/extras/Projucer/Builds/LinuxMakefile/Makefile -@@ -19,6 +19,10 @@ ifndef AR +--- juce.orig/extras/Projucer/Builds/LinuxMakefile/Makefile ++++ juce/extras/Projucer/Builds/LinuxMakefile/Makefile +@@ -19,6 +19,10 @@ AR=ar endif @@ -21,46 +19,46 @@ index 65fd56a..89f88e9 100644 ifndef CONFIG CONFIG=Debug endif -@@ -35,13 +39,13 @@ ifeq ($(CONFIG),Debug) +@@ -35,13 +39,13 @@ TARGET_ARCH := endif -- JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.4.7 -DJUCE_APP_VERSION_HEX=0x50407 $(shell pkg-config --cflags x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) -+ JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DDEBUG=1 -D_DEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.4.7 -DJUCE_APP_VERSION_HEX=0x50407 $(shell $(PKG_CONFIG) --cflags x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) - JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 -DJucePlugin_Build_Unity=0 +- JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60005" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.5" "-DJUCE_APP_VERSION_HEX=0x60005" $(shell pkg-config --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) ++ JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60005" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.5" "-DJUCE_APP_VERSION_HEX=0x60005" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_APP := Projucer JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 $(CFLAGS) JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) -- JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -lrt -ldl -lpthread $(LDFLAGS) -+ JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell $(PKG_CONFIG) --libs x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -lrt -ldl -lpthread $(LDFLAGS) +- JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs freetype2) -fvisibility=hidden -lrt -ldl -lpthread $(LDFLAGS) ++ JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell $(PKG_CONFIG) --libs freetype2) -fvisibility=hidden -lrt -ldl -lpthread $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif -@@ -56,13 +60,13 @@ ifeq ($(CONFIG),Release) +@@ -56,13 +60,13 @@ TARGET_ARCH := endif -- JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.4.7 -DJUCE_APP_VERSION_HEX=0x50407 $(shell pkg-config --cflags x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) -+ JUCE_CPPFLAGS := $(DEPFLAGS) -DLINUX=1 -DNDEBUG=1 -DJUCER_LINUX_MAKE_6D53C8B4=1 -DJUCE_APP_VERSION=5.4.7 -DJUCE_APP_VERSION_HEX=0x50407 $(shell $(PKG_CONFIG) --cflags x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -pthread -I../../JuceLibraryCode -I../../../../modules $(CPPFLAGS) - JUCE_CPPFLAGS_APP := -DJucePlugin_Build_VST=0 -DJucePlugin_Build_VST3=0 -DJucePlugin_Build_AU=0 -DJucePlugin_Build_AUv3=0 -DJucePlugin_Build_RTAS=0 -DJucePlugin_Build_AAX=0 -DJucePlugin_Build_Standalone=0 -DJucePlugin_Build_Unity=0 +- JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60005" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.5" "-DJUCE_APP_VERSION_HEX=0x60005" $(shell pkg-config --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) ++ JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60005" "-DJUCE_MODULE_AVAILABLE_juce_build_tools=1" "-DJUCE_MODULE_AVAILABLE_juce_core=1" "-DJUCE_MODULE_AVAILABLE_juce_cryptography=1" "-DJUCE_MODULE_AVAILABLE_juce_data_structures=1" "-DJUCE_MODULE_AVAILABLE_juce_events=1" "-DJUCE_MODULE_AVAILABLE_juce_graphics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_basics=1" "-DJUCE_MODULE_AVAILABLE_juce_gui_extra=1" "-DJUCE_GLOBAL_MODULE_SETTINGS_INCLUDED=1" "-DJUCE_LOG_ASSERTIONS=1" "-DJUCE_USE_CURL=1" "-DJUCE_LOAD_CURL_SYMBOLS_LAZILY=1" "-DJUCE_ALLOW_STATIC_NULL_VARIABLES=0" "-DJUCE_STRICT_REFCOUNTEDPOINTER=1" "-DJUCE_WEB_BROWSER=0" "-DJUCE_STANDALONE_APPLICATION=1" "-DJUCER_LINUX_MAKE_6D53C8B4=1" "-DJUCE_APP_VERSION=6.0.5" "-DJUCE_APP_VERSION_HEX=0x60005" $(shell $(PKG_CONFIG) --cflags freetype2) -pthread -I../../JuceLibraryCode -I../../../Build -I../../../../modules $(CPPFLAGS) + JUCE_CPPFLAGS_APP := "-DJucePlugin_Build_VST=0" "-DJucePlugin_Build_VST3=0" "-DJucePlugin_Build_AU=0" "-DJucePlugin_Build_AUv3=0" "-DJucePlugin_Build_RTAS=0" "-DJucePlugin_Build_AAX=0" "-DJucePlugin_Build_Standalone=0" "-DJucePlugin_Build_Unity=0" JUCE_TARGET_APP := Projucer JUCE_CFLAGS += $(JUCE_CPPFLAGS) $(TARGET_ARCH) -O3 $(CFLAGS) JUCE_CXXFLAGS += $(JUCE_CFLAGS) -std=c++11 $(CXXFLAGS) -- JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -fvisibility=hidden -lrt -ldl -lpthread $(LDFLAGS) -+ JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell $(PKG_CONFIG) --libs x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0) -fvisibility=hidden -lrt -ldl -lpthread $(LDFLAGS) +- JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell pkg-config --libs freetype2) -fvisibility=hidden -lrt -ldl -lpthread $(LDFLAGS) ++ JUCE_LDFLAGS += $(TARGET_ARCH) -L$(JUCE_BINDIR) -L$(JUCE_LIBDIR) $(shell $(PKG_CONFIG) --libs freetype2) -fvisibility=hidden -lrt -ldl -lpthread $(LDFLAGS) CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) endif -@@ -136,8 +140,8 @@ OBJECTS_APP := \ +@@ -135,8 +139,8 @@ all : $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) $(JUCE_OUTDIR)/$(JUCE_TARGET_APP) : $(OBJECTS_APP) $(RESOURCES) - @command -v pkg-config >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } -- @pkg-config --print-errors x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 -+ @command -v $(PKG_CONFIG) >/dev/null 2>&1 || { echo >&2 "pkg-config not installed. Please, install it."; exit 1; } -+ @$(PKG_CONFIG) --print-errors x11 xinerama xext freetype2 webkit2gtk-4.0 gtk+-x11-3.0 +- @pkg-config --print-errors freetype2 ++ @command -v $(PKG_CONFIG) >/dev/null 2>&1 || { echo >&2 "$(PKG_CONFIG) not installed. Please, install it."; exit 1; } ++ @$(PKG_CONFIG) --print-errors freetype2 @echo Linking "Projucer - App" -$(V_AT)mkdir -p $(JUCE_BINDIR) -$(V_AT)mkdir -p $(JUCE_LIBDIR) diff --git a/debian/patches/debian_fixed-defines.patch b/debian/patches/debian_fixed-defines.patch index 2f00702f..56359b39 100644 --- a/debian/patches/debian_fixed-defines.patch +++ b/debian/patches/debian_fixed-defines.patch @@ -11,11 +11,9 @@ 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 -@@ -24,6 +24,30 @@ +--- juce.orig/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h ++++ juce/modules/juce_audio_plugin_client/utility/juce_CheckSettingMacros.h +@@ -23,6 +23,30 @@ ============================================================================== */ @@ -46,7 +44,7 @@ index b5278b1..4c0a9ba 100644 // The following checks should cause a compile error if you've forgotten to // define all your plugin settings properly.. -@@ -40,6 +64,7 @@ +@@ -39,6 +63,7 @@ #endif #define JUCE_CHECKSETTINGMACROS_H @@ -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 62d0dfa..c66ded1 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_link_systemlibs.patch b/debian/patches/debian_link_systemlibs.patch index 4b59edc2..21c40fc6 100644 --- a/debian/patches/debian_link_systemlibs.patch +++ b/debian/patches/debian_link_systemlibs.patch @@ -13,51 +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 515c50e..2752788 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"); - -+ // on Debian, a number of 3rd-party libs have been stripped away, -+ // so we need to link to the system libraries -+ if (project.getEnabledModules().isModuleEnabled ("juce_core")) -+ { -+ packages.add ("zlib"); -+ } -+ if (project.getEnabledModules().isModuleEnabled ("juce_graphics")) -+ { -+ packages.add ("libjpeg"); -+ packages.add ("libpng"); -+ } -+ if (project.getEnabledModules().isModuleEnabled ("juce_audio_formats")) -+ { -+ if(project.isConfigFlagEnabled ("JUCE_USE_FLAC", true)) -+ { -+ packages.add ("flac"); -+ } -+ -+ if(project.isConfigFlagEnabled ("JUCE_USE_OGGVORBIS", true)) -+ { -+ packages.add ("vorbis"); -+ packages.add ("vorbisfile"); -+ packages.add ("vorbisenc"); -+ packages.add ("ogg"); -+ } -+ } -+ if (project.getEnabledModules().isModuleEnabled ("juce_audio_devices")) -+ { -+ if(project.isConfigFlagEnabled ("JUCE_JACK", true)) -+ { -+ packages.add ("jack"); -+ } -+ } - packages.removeDuplicates (false); - - return packages; -@@ -563,6 +596,9 @@ private: +--- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h ++++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h +@@ -647,6 +647,9 @@ StringArray result (linuxLibs); auto libraries = StringArray::fromTokens (getExternalLibrariesString(), ";", "\"'"); @@ -67,3 +25,46 @@ index 515c50e..2752788 100644 libraries.removeEmptyStrings(); for (auto& lib : libraries) +--- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp ++++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp +@@ -520,6 +520,40 @@ + if (isCurlEnabled (project) && ! isLoadCurlSymbolsLazilyEnabled (project)) + packages.add ("libcurl"); + ++ // on Debian, a number of 3rd-party libs have been stripped away, ++ // so we need to link to the system libraries ++ if (project.getEnabledModules().isModuleEnabled ("juce_core")) ++ { ++ packages.add ("zlib"); ++ } ++ if (project.getEnabledModules().isModuleEnabled ("juce_graphics")) ++ { ++ packages.add ("libjpeg"); ++ packages.add ("libpng"); ++ } ++ if (project.getEnabledModules().isModuleEnabled ("juce_audio_formats")) ++ { ++ if(project.isConfigFlagEnabled ("JUCE_USE_FLAC", true)) ++ { ++ packages.add ("flac"); ++ } +++ ++ if(project.isConfigFlagEnabled ("JUCE_USE_OGGVORBIS", true)) ++ { ++ packages.add ("vorbis"); ++ packages.add ("vorbisfile"); ++ packages.add ("vorbisenc"); ++ packages.add ("ogg"); ++ } ++ } ++ if (project.getEnabledModules().isModuleEnabled ("juce_audio_devices")) ++ { ++ if(project.isConfigFlagEnabled ("JUCE_JACK", true)) ++ { ++ packages.add ("jack"); ++ } ++ } ++ + if (isWebBrowserComponentEnabled (project) && type == PackageDependencyType::compile) + { + packages.add ("webkit2gtk-4.0"); diff --git a/debian/patches/debian_no-update-check.patch b/debian/patches/debian_no-update-check.patch index e4ff1799..e790b210 100644 --- a/debian/patches/debian_no-update-check.patch +++ b/debian/patches/debian_no-update-check.patch @@ -9,15 +9,13 @@ 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 94e8eb7..e49a2f6 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 +@@ -41,6 +41,7 @@ - void LatestVersionCheckerAndUpdater::checkForNewVersion (bool showAlerts) + void LatestVersionCheckerAndUpdater::checkForNewVersion (bool background) { + return; // DONT check for new versions on Debian if (! isThreadRunning()) { - showAlertWindows = showAlerts; + backgroundCheck = background; diff --git a/debian/patches/debian_python3.patch b/debian/patches/debian_python3.patch index ad562133..5d47356a 100644 --- a/debian/patches/debian_python3.patch +++ b/debian/patches/debian_python3.patch @@ -5,19 +5,17 @@ Subject: use Python3 rather than Python2 for building the documentation Forwarded: no --- - doxygen/Makefile | 2 +- + docs/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/docs/doxygen/Makefile ++++ juce/docs/doxygen/Makefile +@@ -8,7 +8,7 @@ doxygen build/juce_modules.dox: process_source_files.py $(SOURCE_FILES) -- python $< ../modules build -+ python3 $< ../modules build +- python $< ../../modules build ++ python3 $< ../../modules build clean: rm -rf build doc diff --git a/debian/patches/debian_system_modules.patch b/debian/patches/debian_system_modules.patch index 67e41594..a54815bc 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 74f751e..8348409 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 +@@ -362,7 +362,7 @@ } else if (key == Ids::defaultJuceModulePath) { diff --git a/debian/patches/debian_unittests_globalpaths.patch b/debian/patches/debian_unittests_globalpaths.patch index 8279189e..614809cb 100644 --- a/debian/patches/debian_unittests_globalpaths.patch +++ b/debian/patches/debian_unittests_globalpaths.patch @@ -7,11 +7,9 @@ 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 4e3f3af..c88af7a 100644 ---- a/extras/UnitTestRunner/UnitTestRunner.jucer -+++ b/extras/UnitTestRunner/UnitTestRunner.jucer -@@ -123,26 +123,26 @@ +--- juce.orig/extras/UnitTestRunner/UnitTestRunner.jucer ++++ juce/extras/UnitTestRunner/UnitTestRunner.jucer +@@ -124,26 +124,26 @@ diff --git a/debian/patches/debian_vst.patch b/debian/patches/debian_vst.patch index ba910084..843dcec6 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 7f63093..b1208b4 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 +@@ -84,8 +84,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. @@ -24,38 +22,29 @@ index 7f63093..b1208b4 100644 +#include "../../juce_audio_processors/format_types/juce_VSTInterface.h" } - using namespace juce; -@@ -124,7 +123,6 @@ using namespace juce; - #pragma pack (push, 8) - #endif - --#define JUCE_VSTINTERFACE_H_INCLUDED 1 - - #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 bdc935f..8ddc9f2 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 + JUCE_END_IGNORE_WARNINGS_MSVC +--- juce.orig/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp ++++ juce/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp +@@ -37,7 +37,6 @@ + JUCE_BEGIN_IGNORE_WARNINGS_MSVC (4996) #define VST_FORCE_DEPRECATED 0 -#define JUCE_VSTINTERFACE_H_INCLUDED 1 namespace Vst2 { -@@ -58,8 +57,7 @@ namespace Vst2 +@@ -46,8 +45,8 @@ // 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. -#include -#include -+#include "../../juce_audio_processors/format_types/juce_VSTInterface.h" ++#define FST2VST 1 ++#include } #include "juce_VSTCommon.h" -@@ -81,6 +79,9 @@ namespace Vst2 +@@ -59,6 +58,9 @@ #include "juce_VSTMidiEventList.h" diff --git a/debian/patches/overridable_pkg-config.patch b/debian/patches/overridable_pkg-config.patch index 89e6141a..3815a2bd 100644 --- a/debian/patches/overridable_pkg-config.patch +++ b/debian/patches/overridable_pkg-config.patch @@ -13,40 +13,38 @@ Last-Update: 2020-03-16 .../Source/ProjectSaving/jucer_ProjectExport_Make.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -index 2752788..2a5aa9f 100644 ---- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -+++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -@@ -246,8 +246,8 @@ public: +--- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h ++++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h +@@ -304,8 +304,8 @@ if (! packages.isEmpty()) { - out << "\t@command -v pkg-config >/dev/null 2>&1 || { echo >&2 \"pkg-config not installed. Please, install it.\"; exit 1; }" << newLine - << "\t@pkg-config --print-errors"; -+ out << "\t@command -v $(PKG_CONFIG) >/dev/null 2>&1 || { echo >&2 \"pkg-config not installed. Please, install it.\"; exit 1; }" << newLine ++ out << "\t@command -v $(PKG_CONFIG) >/dev/null 2>&1 || { echo >&2 \"$(PKG_CONFIG) not installed. Please, install it.\"; exit 1; }" << newLine + << "\t@$(PKG_CONFIG) --print-errors"; for (auto& pkg : packages) out << " " << pkg; -@@ -507,7 +507,7 @@ private: - auto packages = getPackages(); +@@ -558,7 +558,7 @@ + auto compilePackages = getCompilePackages(); - if (packages.size() > 0) -- return "$(shell pkg-config --cflags " + packages.joinIntoString (" ") + ")"; -+ return "$(shell $(PKG_CONFIG) --cflags " + packages.joinIntoString (" ") + ")"; + if (compilePackages.size() > 0) +- return "$(shell pkg-config --cflags " + compilePackages.joinIntoString (" ") + ")"; ++ return "$(shell $(PKG_CONFIG) --cflags " + compilePackages.joinIntoString (" ") + ")"; return {}; } -@@ -517,7 +517,7 @@ private: - auto packages = getPackages(); +@@ -568,7 +568,7 @@ + auto linkPackages = getLinkPackages(); - if (packages.size() > 0) -- return "$(shell pkg-config --libs " + packages.joinIntoString (" ") + ")"; -+ return "$(shell $(PKG_CONFIG) --libs " + packages.joinIntoString (" ") + ")"; + if (linkPackages.size() > 0) +- return "$(shell pkg-config --libs " + linkPackages.joinIntoString (" ") + ")"; ++ return "$(shell $(PKG_CONFIG) --libs " + linkPackages.joinIntoString (" ") + ")"; return {}; } -@@ -912,6 +912,11 @@ private: +@@ -938,6 +938,11 @@ << "endif" << newLine << newLine;