diff -Nru juce-5.4.7~ds0/debian/changelog juce-5.4.7~ds0/debian/changelog --- juce-5.4.7~ds0/debian/changelog 2020-02-18 08:46:05.000000000 +0000 +++ juce-5.4.7~ds0/debian/changelog 2020-03-16 12:35:45.000000000 +0000 @@ -1,3 +1,16 @@ +juce (5.4.7~ds0-2) unstable; urgency=medium + + * Refresh patches using 'gbp pq' + * Add patch to not fail fatally without X-server + * Fix FTCBFS: + + Let dpkg's buildtools.mk supply pkg-config for debian/rules. + + cross.patch: Make pkg-config substitutable. + + Let dh_auto_build pass cross tools to make. + Thanks to Helmut Grohne (Closes: #951684) + * Add patch to allow overriding of pkg-config in generated Makefiles + + -- IOhannes m zmölnig (Debian/GNU) Mon, 16 Mar 2020 13:35:45 +0100 + juce (5.4.7~ds0-1) unstable; urgency=medium * New upstream version 5.4.7~ds0 diff -Nru juce-5.4.7~ds0/debian/patches/0011-Don-t-fail-fatally-if-gui-cannot-connect-to-X-server.patch juce-5.4.7~ds0/debian/patches/0011-Don-t-fail-fatally-if-gui-cannot-connect-to-X-server.patch --- juce-5.4.7~ds0/debian/patches/0011-Don-t-fail-fatally-if-gui-cannot-connect-to-X-server.patch 1970-01-01 00:00:00.000000000 +0000 +++ juce-5.4.7~ds0/debian/patches/0011-Don-t-fail-fatally-if-gui-cannot-connect-to-X-server.patch 2020-03-16 12:35:45.000000000 +0000 @@ -0,0 +1,49 @@ +From: kunitoki +Date: Mon, 16 Mar 2020 13:01:47 +0100 +Subject: Don't fail fatally if gui cannot connect to X server +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +Bug: https://github.com/WeAreROLI/JUCE/issues/422 + +This is a slight modification of https://github.com/WeAreROLI/JUCE/issues/422 by +IOhannes m zmölnig, using early exits rather than longish if-clauses (mainly to +minimize the diff). +--- + modules/juce_gui_basics/native/juce_linux_X11.cpp | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/modules/juce_gui_basics/native/juce_linux_X11.cpp b/modules/juce_gui_basics/native/juce_linux_X11.cpp +index a2ceb67..7d67541 100644 +--- a/modules/juce_gui_basics/native/juce_linux_X11.cpp ++++ b/modules/juce_gui_basics/native/juce_linux_X11.cpp +@@ -149,7 +149,8 @@ XWindowSystem::~XWindowSystem() noexcept + + ::Display* XWindowSystem::displayUnref() noexcept + { +- jassert (display != nullptr); ++ if (!display) ++ return display; + jassert (displayCount.get() > 0); + + if (--displayCount == 0) +@@ -168,7 +169,7 @@ void XWindowSystem::initialiseXDisplay() noexcept + if (display == nullptr) + { + Logger::outputDebugString ("Failed to connect to the X Server."); +- Process::terminate(); ++ return; + } + + // Create a context to store user data associated with Windows we create +@@ -223,6 +224,9 @@ void XWindowSystem::initialiseXDisplay() noexcept + + void XWindowSystem::destroyXDisplay() noexcept + { ++ if (!display) ++ return; ++ + ScopedXLock xlock (display); + XDestroyWindow (display, juce_messageWindowHandle); + juce_messageWindowHandle = 0; diff -Nru juce-5.4.7~ds0/debian/patches/cross.patch juce-5.4.7~ds0/debian/patches/cross.patch --- juce-5.4.7~ds0/debian/patches/cross.patch 1970-01-01 00:00:00.000000000 +0000 +++ juce-5.4.7~ds0/debian/patches/cross.patch 2020-03-16 12:35:45.000000000 +0000 @@ -0,0 +1,66 @@ +From: Debian Multimedia Maintainers +Date: Mon, 16 Mar 2020 13:32:21 +0100 +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 + AR=ar + endif + ++ifndef PKG_CONFIG ++ PKG_CONFIG=pkg-config ++endif ++ + ifndef CONFIG + CONFIG=Debug + endif +@@ -35,13 +39,13 @@ ifeq ($(CONFIG),Debug) + 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_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) + + CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) + endif +@@ -56,13 +60,13 @@ ifeq ($(CONFIG),Release) + 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_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) + + CLEANCMD = rm -rf $(JUCE_OUTDIR)/$(TARGET) $(JUCE_OBJDIR) + endif +@@ -136,8 +140,8 @@ OBJECTS_APP := \ + 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 + @echo Linking "Projucer - App" + -$(V_AT)mkdir -p $(JUCE_BINDIR) + -$(V_AT)mkdir -p $(JUCE_LIBDIR) diff -Nru juce-5.4.7~ds0/debian/patches/debian_fixed-defines.patch juce-5.4.7~ds0/debian/patches/debian_fixed-defines.patch --- juce-5.4.7~ds0/debian/patches/debian_fixed-defines.patch 2020-02-18 08:46:05.000000000 +0000 +++ juce-5.4.7~ds0/debian/patches/debian_fixed-defines.patch 2020-03-16 12:35:45.000000000 +0000 @@ -11,8 +11,10 @@ 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 @@ #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 62d0dfa..c66ded1 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 -Nru juce-5.4.7~ds0/debian/patches/debian_gpl_variant.patch juce-5.4.7~ds0/debian/patches/debian_gpl_variant.patch --- juce-5.4.7~ds0/debian/patches/debian_gpl_variant.patch 2020-02-18 08:46:05.000000000 +0000 +++ juce-5.4.7~ds0/debian/patches/debian_gpl_variant.patch 2020-03-16 12:35:45.000000000 +0000 @@ -7,8 +7,10 @@ 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 cb5a324..8d54ae2 100644 +--- a/extras/Projucer/JuceLibraryCode/AppConfig.h ++++ b/extras/Projucer/JuceLibraryCode/AppConfig.h @@ -32,7 +32,7 @@ // BEGIN SECTION A diff -Nru juce-5.4.7~ds0/debian/patches/debian_link_systemlibs.patch juce-5.4.7~ds0/debian/patches/debian_link_systemlibs.patch --- juce-5.4.7~ds0/debian/patches/debian_link_systemlibs.patch 2020-02-18 08:46:05.000000000 +0000 +++ juce-5.4.7~ds0/debian/patches/debian_link_systemlibs.patch 2020-03-16 12:35:45.000000000 +0000 @@ -13,9 +13,11 @@ .../ProjectSaving/jucer_ProjectExport_Make.h | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) ---- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -+++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -@@ -464,6 +464,39 @@ +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"); @@ -55,7 +57,7 @@ packages.removeDuplicates (false); return packages; -@@ -563,6 +596,9 @@ +@@ -563,6 +596,9 @@ private: StringArray result (linuxLibs); auto libraries = StringArray::fromTokens (getExternalLibrariesString(), ";", "\"'"); diff -Nru juce-5.4.7~ds0/debian/patches/debian_no-update-check.patch juce-5.4.7~ds0/debian/patches/debian_no-update-check.patch --- juce-5.4.7~ds0/debian/patches/debian_no-update-check.patch 2020-02-18 08:46:05.000000000 +0000 +++ juce-5.4.7~ds0/debian/patches/debian_no-update-check.patch 2020-03-16 12:35:45.000000000 +0000 @@ -9,9 +9,11 @@ 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 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() void LatestVersionCheckerAndUpdater::checkForNewVersion (bool showAlerts) { diff -Nru juce-5.4.7~ds0/debian/patches/debian_no-usagedata.patch juce-5.4.7~ds0/debian/patches/debian_no-usagedata.patch --- juce-5.4.7~ds0/debian/patches/debian_no-usagedata.patch 2020-02-18 08:46:05.000000000 +0000 +++ juce-5.4.7~ds0/debian/patches/debian_no-usagedata.patch 2020-03-16 12:35:45.000000000 +0000 @@ -8,9 +8,11 @@ .../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 -Nru juce-5.4.7~ds0/debian/patches/debian_python3.patch juce-5.4.7~ds0/debian/patches/debian_python3.patch --- juce-5.4.7~ds0/debian/patches/debian_python3.patch 2020-02-18 08:46:05.000000000 +0000 +++ juce-5.4.7~ds0/debian/patches/debian_python3.patch 2020-03-16 12:35:45.000000000 +0000 @@ -8,9 +8,11 @@ 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 -Nru juce-5.4.7~ds0/debian/patches/debian_system_modules.patch juce-5.4.7~ds0/debian/patches/debian_system_modules.patch --- juce-5.4.7~ds0/debian/patches/debian_system_modules.patch 2020-02-18 08:46:05.000000000 +0000 +++ juce-5.4.7~ds0/debian/patches/debian_system_modules.patch 2020-03-16 12:35:45.000000000 +0000 @@ -9,9 +9,11 @@ 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 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) } else if (key == Ids::defaultJuceModulePath) { diff -Nru juce-5.4.7~ds0/debian/patches/debian_unittests_globalpaths.patch juce-5.4.7~ds0/debian/patches/debian_unittests_globalpaths.patch --- juce-5.4.7~ds0/debian/patches/debian_unittests_globalpaths.patch 2020-02-18 08:46:05.000000000 +0000 +++ juce-5.4.7~ds0/debian/patches/debian_unittests_globalpaths.patch 2020-03-16 12:35:45.000000000 +0000 @@ -7,8 +7,10 @@ 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 4e3f3af..c88af7a 100644 +--- a/extras/UnitTestRunner/UnitTestRunner.jucer ++++ b/extras/UnitTestRunner/UnitTestRunner.jucer @@ -123,26 +123,26 @@ diff -Nru juce-5.4.7~ds0/debian/patches/debian_vst.patch juce-5.4.7~ds0/debian/patches/debian_vst.patch --- juce-5.4.7~ds0/debian/patches/debian_vst.patch 2020-02-18 08:46:05.000000000 +0000 +++ juce-5.4.7~ds0/debian/patches/debian_vst.patch 2020-03-16 12:35:45.000000000 +0000 @@ -11,9 +11,11 @@ .../juce_audio_processors/format_types/juce_VSTPluginFormat.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 6 deletions(-) ---- 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 @@ +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 // 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. @@ -23,7 +25,7 @@ } using namespace juce; -@@ -124,7 +123,6 @@ +@@ -124,7 +123,6 @@ using namespace juce; #pragma pack (push, 8) #endif @@ -31,8 +33,10 @@ #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 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 @@ -41,7 +45,7 @@ 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. @@ -51,7 +55,7 @@ } #include "juce_VSTCommon.h" -@@ -81,6 +79,9 @@ +@@ -81,6 +79,9 @@ namespace Vst2 #include "juce_VSTMidiEventList.h" diff -Nru juce-5.4.7~ds0/debian/patches/LV2-audioprocessor.patch juce-5.4.7~ds0/debian/patches/LV2-audioprocessor.patch --- juce-5.4.7~ds0/debian/patches/LV2-audioprocessor.patch 2020-02-18 08:46:05.000000000 +0000 +++ juce-5.4.7~ds0/debian/patches/LV2-audioprocessor.patch 2020-03-16 12:35:45.000000000 +0000 @@ -11,9 +11,11 @@ .../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 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: */ virtual void setNonRealtime (bool isNonRealtime) noexcept; @@ -21,7 +23,7 @@ //============================================================================== /** Creates the processor's GUI. -@@ -976,6 +977,7 @@ +@@ -976,6 +977,7 @@ public: This may call createEditor() internally to create the component. */ AudioProcessorEditor* createEditorIfNeeded(); @@ -29,19 +31,19 @@ //============================================================================== /** Returns the default number of steps for a parameter. -@@ -1118,6 +1120,11 @@ +@@ -1117,6 +1119,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); - -@@ -1187,9 +1194,11 @@ +@@ -1187,9 +1194,11 @@ public: virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const { return {}; } @@ -53,7 +55,7 @@ /** Flags to indicate the type of plugin context in which a processor is being used. */ enum WrapperType -@@ -1203,6 +1212,7 @@ +@@ -1203,6 +1212,7 @@ public: wrapperType_AAX, wrapperType_Standalone, wrapperType_Unity @@ -61,7 +63,7 @@ }; /** When loaded by a plugin wrapper, this flag will be set to indicate the type -@@ -1463,7 +1473,9 @@ +@@ -1463,7 +1473,9 @@ private: //============================================================================== Array listeners; diff -Nru juce-5.4.7~ds0/debian/patches/overridable_pkg-config.patch juce-5.4.7~ds0/debian/patches/overridable_pkg-config.patch --- juce-5.4.7~ds0/debian/patches/overridable_pkg-config.patch 1970-01-01 00:00:00.000000000 +0000 +++ juce-5.4.7~ds0/debian/patches/overridable_pkg-config.patch 2020-03-16 12:35:45.000000000 +0000 @@ -0,0 +1,60 @@ +From: Debian Multimedia Maintainers +Date: Mon, 16 Mar 2020 13:32:21 +0100 +Subject: Allow overridable pkg-config in generated Makefiles + +Origin: Debian +Bug: https://github.com/WeAreROLI/JUCE/issues/677 +Last-Update: 2020-03-16 + +E.g. to allow cross-building of juce-packages. +See also https://bugs.debian.org/951684 +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: + + 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 ++ << "\t@$(PKG_CONFIG) --print-errors"; + + for (auto& pkg : packages) + out << " " << pkg; +@@ -507,7 +507,7 @@ private: + auto packages = getPackages(); + + if (packages.size() > 0) +- return "$(shell pkg-config --cflags " + packages.joinIntoString (" ") + ")"; ++ return "$(shell $(PKG_CONFIG) --cflags " + packages.joinIntoString (" ") + ")"; + + return {}; + } +@@ -517,7 +517,7 @@ private: + auto packages = getPackages(); + + if (packages.size() > 0) +- return "$(shell pkg-config --libs " + packages.joinIntoString (" ") + ")"; ++ return "$(shell $(PKG_CONFIG) --libs " + packages.joinIntoString (" ") + ")"; + + return {}; + } +@@ -912,6 +912,11 @@ private: + << "endif" << newLine + << newLine; + ++ out << "ifndef PKG_CONFIG" << newLine ++ << " PKG_CONFIG=pkg-config" << newLine ++ << "endif" << newLine ++ << newLine; ++ + out << "ifndef AR" << newLine + << " AR=ar" << newLine + << "endif" << newLine diff -Nru juce-5.4.7~ds0/debian/patches/series juce-5.4.7~ds0/debian/patches/series --- juce-5.4.7~ds0/debian/patches/series 2020-02-18 08:46:05.000000000 +0000 +++ juce-5.4.7~ds0/debian/patches/series 2020-03-16 12:35:45.000000000 +0000 @@ -8,3 +8,6 @@ debian_unittests_globalpaths.patch debian_vst.patch debian_link_systemlibs.patch +0011-Don-t-fail-fatally-if-gui-cannot-connect-to-X-server.patch +cross.patch +overridable_pkg-config.patch diff -Nru juce-5.4.7~ds0/debian/rules juce-5.4.7~ds0/debian/rules --- juce-5.4.7~ds0/debian/rules 2020-02-18 08:46:05.000000000 +0000 +++ juce-5.4.7~ds0/debian/rules 2020-03-16 12:35:45.000000000 +0000 @@ -3,6 +3,8 @@ # Copyright © 2015 IOhannes m zmölnig # Description: Main Debian packaging script for JUCE +include /usr/share/dpkg/buildtools.mk + ## export dummy TARGET_ARCH that doesn't do much, ## but disables "-march=native" optimization export TARGET_ARCH=-Wl,--as-needed @@ -17,7 +19,7 @@ #DEB_COPYRIGHT_CHECK_IGNORE_REGEX = \ #^((.*\.jpg)|(.*\.JPG)|(.*\.gif)|(.*\.png)|(.*\.ico)|(.*\.icns)|(gradle-wrapper\.jar)|(.*\.mp3)|(.*\.caf)|(.*\.nib)|examples/InAppPurchase/Signing/InAppPurchase\.keystore|examples/(InAppPurchase/BinaryData/(Robot|Ed|Jules|JB|Fabian|Lukasz)[012]\.ogg|AUv3Synth|PlugInSamples/MultiOutSynth)/Source/BinaryData/singing\.ogg|examples/Demo/Resources/cello\.wav|examples/Demo/Resources/icons\.zip|modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinResources\.rsr|examples/ComponentTutorialExample/Introduction to Components - Part 1\.pdf|debian/(changelog|copyright(|_hints|_newhints)))$ -LDFLAGS += $(shell pkg-config --libs libjpeg libpng zlib) +LDFLAGS += $(shell $(PKG_CONFIG) --libs libjpeg libpng zlib) # JUCE uses some c++11 features requiring atomic_store_8 and # atomic_load_8, so we need to link with libatomic on @@ -44,7 +46,7 @@ LDFLAGS="$(LDFLAGS)" \ CPPFLAGS="$(CPPFLAGS)" \ $(empty) - make -C debian/extra/lv2-ttl-generator/ + dh_auto_build --sourcedirectory=debian/extra/lv2-ttl-generator/ help2man -N \ --version-string="Projucer $(DEB_UPSTREAM_VERSION)" \ -n "the JUCE project-management tool" \