Refresh patches
authorIOhannes m zmölnig <zmoelnig@umlautS.umlaeute.mur.at>
Wed, 13 Jan 2021 09:57:54 +0000 (10:57 +0100)
committerIOhannes m zmölnig <zmoelnig@umlautS.umlaeute.mur.at>
Wed, 13 Jan 2021 10:02:50 +0000 (11:02 +0100)
debian/patches/LV2-audioprocessor.patch
debian/patches/cross.patch
debian/patches/debian_fixed-defines.patch
debian/patches/debian_link_systemlibs.patch
debian/patches/debian_no-update-check.patch
debian/patches/debian_python3.patch
debian/patches/debian_system_modules.patch
debian/patches/debian_unittests_globalpaths.patch
debian/patches/debian_vst.patch
debian/patches/overridable_pkg-config.patch

index b3205be7e298b052f8e9faf037825900aefb2eae..c7a2f0255b9262933bf0cac25f2347facc2b6e14 100644 (file)
@@ -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 @@
      */\r
      virtual void setNonRealtime (bool isNonRealtime) noexcept;\r
  \r
@@ -23,7 +21,7 @@ index 836b09c..c3909a7 100644
      //==============================================================================\r
      /** Creates the processor's GUI.\r
  \r
-@@ -976,6 +977,7 @@ public:
+@@ -975,6 +976,7 @@
          This may call createEditor() internally to create the component.\r
      */\r
      AudioProcessorEditor* createEditorIfNeeded();\r
@@ -31,19 +29,19 @@ index 836b09c..c3909a7 100644
  \r
      //==============================================================================\r
      /** Returns the default number of steps for a parameter.\r
-@@ -1117,6 +1119,11 @@ public:
-     /** This method is called when the layout of the audio processor changes. */\r
+@@ -1117,6 +1119,11 @@
      virtual void processorLayoutsChanged();\r
  \r
-+    //==============================================================================\r
+     //==============================================================================\r
 +    /** LV2 specific calls, saving/restore as string. */\r
 +    virtual String getStateInformationString () { return String(); }\r
 +    virtual void setStateInformationString (const String&) {}\r
 +\r
-     //==============================================================================\r
++    //==============================================================================\r
      /** Adds a listener that will be called when an aspect of this processor changes. */\r
      virtual void addListener (AudioProcessorListener* newListener);\r
-@@ -1187,9 +1194,11 @@ public:
\r
+@@ -1186,9 +1193,11 @@
  \r
      virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const      { return {}; }\r
  \r
@@ -55,7 +53,7 @@ index 836b09c..c3909a7 100644
  \r
      /** Flags to indicate the type of plugin context in which a processor is being used. */\r
      enum WrapperType\r
-@@ -1203,6 +1212,7 @@ public:
+@@ -1202,6 +1211,7 @@
          wrapperType_AAX,\r
          wrapperType_Standalone,\r
          wrapperType_Unity\r
@@ -63,7 +61,7 @@ index 836b09c..c3909a7 100644
      };\r
  \r
      /** When loaded by a plugin wrapper, this flag will be set to indicate the type\r
-@@ -1463,7 +1473,9 @@ private:
+@@ -1462,7 +1472,9 @@
  \r
      //==============================================================================\r
      Array<AudioProcessorListener*> listeners;\r
@@ -72,4 +70,4 @@ index 836b09c..c3909a7 100644
 +   #endif\r
      double currentSampleRate = 0;\r
      int blockSize = 0, latencySamples = 0;\r
-     bool suspended = false, nonRealtime = false;\r
+     bool suspended = false;\r
index 426a1e62a2e6d66d04267d75beb6dd65688f4630..27f7f216eda9df671078681f6615455e5fe9f701 100644 (file)
@@ -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)
index 2f00702f3a52b8da513bec9dc4077ebdf72a8b26..56359b39cbe1ee7c3b9dedb2705313d9c939fe7d 100644 (file)
@@ -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 @@
    ==============================================================================\r
  */\r
  \r
@@ -46,7 +44,7 @@ index b5278b1..4c0a9ba 100644
  // The following checks should cause a compile error if you've forgotten to\r
  // define all your plugin settings properly..\r
  \r
-@@ -40,6 +64,7 @@
+@@ -39,6 +63,7 @@
  #endif\r
  #define JUCE_CHECKSETTINGMACROS_H\r
  \r
@@ -54,10 +52,8 @@ index b5278b1..4c0a9ba 100644
  #ifndef JucePlugin_IsSynth\r
   #error "You need to define the JucePlugin_IsSynth value!"\r
  #endif\r
-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 @@
  \r
  #include "system/juce_TargetPlatform.h"\r
index 4b59edc29edf4c299589c7f1392c360f22e1cc4f..21c40fc6f4af9d198999eab6da92dcf24aadc76b 100644 (file)
@@ -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())\r
-             packages.add ("libcurl");\r
\r
-+        // on Debian, a number of 3rd-party libs have been stripped away,\r
-+        // so we need to link to the system libraries\r
-+        if (project.getEnabledModules().isModuleEnabled ("juce_core"))\r
-+        {\r
-+            packages.add ("zlib");\r
-+        }\r
-+        if (project.getEnabledModules().isModuleEnabled ("juce_graphics"))\r
-+        {\r
-+            packages.add ("libjpeg");\r
-+            packages.add ("libpng");\r
-+        }\r
-+        if (project.getEnabledModules().isModuleEnabled ("juce_audio_formats"))\r
-+        {\r
-+            if(project.isConfigFlagEnabled ("JUCE_USE_FLAC", true))\r
-+            {\r
-+                packages.add ("flac");\r
-+            }\r
-+\r
-+            if(project.isConfigFlagEnabled ("JUCE_USE_OGGVORBIS", true))\r
-+            {\r
-+                packages.add ("vorbis");\r
-+                packages.add ("vorbisfile");\r
-+                packages.add ("vorbisenc");\r
-+                packages.add ("ogg");\r
-+            }\r
-+        }\r
-+        if (project.getEnabledModules().isModuleEnabled ("juce_audio_devices"))\r
-+        {\r
-+            if(project.isConfigFlagEnabled ("JUCE_JACK", true))\r
-+            {\r
-+                packages.add ("jack");\r
-+            }\r
-+        }\r
-         packages.removeDuplicates (false);\r
\r
-         return packages;\r
-@@ -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);\r
  \r
          auto libraries = StringArray::fromTokens (getExternalLibrariesString(), ";", "\"'");\r
@@ -67,3 +25,46 @@ index 515c50e..2752788 100644
          libraries.removeEmptyStrings();\r
  \r
          for (auto& lib : libraries)\r
+--- 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))\r
+         packages.add ("libcurl");\r
\r
++    // on Debian, a number of 3rd-party libs have been stripped away,\r
++    // so we need to link to the system libraries\r
++    if (project.getEnabledModules().isModuleEnabled ("juce_core"))\r
++    {\r
++        packages.add ("zlib");\r
++    }\r
++    if (project.getEnabledModules().isModuleEnabled ("juce_graphics"))\r
++    {\r
++        packages.add ("libjpeg");\r
++        packages.add ("libpng");\r
++    }\r
++    if (project.getEnabledModules().isModuleEnabled ("juce_audio_formats"))\r
++    {\r
++        if(project.isConfigFlagEnabled ("JUCE_USE_FLAC", true))\r
++        {\r
++            packages.add ("flac");\r
++        }\r
+++\r\r
++        if(project.isConfigFlagEnabled ("JUCE_USE_OGGVORBIS", true))\r
++        {\r
++            packages.add ("vorbis");\r
++            packages.add ("vorbisfile");\r
++            packages.add ("vorbisenc");\r
++            packages.add ("ogg");\r
++        }\r
++    }\r
++    if (project.getEnabledModules().isModuleEnabled ("juce_audio_devices"))\r
++    {\r
++        if(project.isConfigFlagEnabled ("JUCE_JACK", true))\r
++        {\r
++            packages.add ("jack");\r
++        }\r
++    }\r
++\r
+     if (isWebBrowserComponentEnabled (project) && type == PackageDependencyType::compile)\r
+     {\r
+         packages.add ("webkit2gtk-4.0");\r
index e4ff17998b8099f5c9de50be1177471b658cef6e..e790b210be1fa9aa6fe06f0422c369cb7a530d92 100644 (file)
@@ -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 @@
  \r
- void LatestVersionCheckerAndUpdater::checkForNewVersion (bool showAlerts)\r
+ void LatestVersionCheckerAndUpdater::checkForNewVersion (bool background)\r
  {\r
 +    return; // DONT check for new versions on Debian\r
      if (! isThreadRunning())\r
      {\r
-         showAlertWindows = showAlerts;\r
+         backgroundCheck = background;\r
index ad562133abac83d26d48e98eaaa2086fa8f460c3..5d47356a0db317f7578e316fdaac23c59f2e7eba 100644 (file)
@@ -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
index 67e415945f03019ffc9c40fa13035c6feb5bc2dc..a54815bc54877241b5bb37fc10015e5ebe812f67 100644 (file)
@@ -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 @@
      }\r
      else if (key == Ids::defaultJuceModulePath)\r
      {\r
index 8279189ea1650253656ac4231e9bd1f1e437f502..614809cb7c64c93da83a3b7eef269939719b9316 100644 (file)
@@ -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 @@
      </VS2019>\r
    </EXPORTFORMATS>\r
    <MODULES>\r
index ba9100846a0e2fe531dcd5fbbb4efd9a5ab394ed..843dcec6e89420c42a78e9c16fc2d3bd79906d2e 100644 (file)
@@ -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\r
  // vstsdk3610_11_06_2018_build_37 (or older) VST3 SDK or JUCE version 5.3.2. You\r
  // also need a VST2 license from Steinberg to distribute VST2 plug-ins.\r
@@ -24,38 +22,29 @@ index 7f63093..b1208b4 100644
 +#include "../../juce_audio_processors/format_types/juce_VSTInterface.h"\r
  }\r
  \r
- using namespace juce;\r
-@@ -124,7 +123,6 @@ using namespace juce;
-  #pragma pack (push, 8)\r
- #endif\r
\r
--#define JUCE_VSTINTERFACE_H_INCLUDED 1\r
\r
- #include "../utility/juce_IncludeModuleHeaders.h"\r
- #include "../utility/juce_FakeMouseMoveGenerator.h"\r
-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\r
+ JUCE_END_IGNORE_WARNINGS_MSVC\r
+--- 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)\r
  \r
  #define VST_FORCE_DEPRECATED 0\r
 -#define JUCE_VSTINTERFACE_H_INCLUDED 1\r
  \r
  namespace Vst2\r
  {\r
-@@ -58,8 +57,7 @@ namespace Vst2
+@@ -46,8 +45,8 @@
  // paths or use the "VST (Legacy) SDK Folder" field in the Projucer. The VST2\r
  // SDK can be obtained from the vstsdk3610_11_06_2018_build_37 (or older) VST3\r
  // SDK or JUCE version 5.3.2.\r
 -#include <pluginterfaces/vst2.x/aeffect.h>\r
 -#include <pluginterfaces/vst2.x/aeffectx.h>\r
-+#include "../../juce_audio_processors/format_types/juce_VSTInterface.h"\r
++#define FST2VST 1\r
++#include <pluginterfaces/fst/fst.h>\r
  }\r
  \r
  #include "juce_VSTCommon.h"\r
-@@ -81,6 +79,9 @@ namespace Vst2
+@@ -59,6 +58,9 @@
  \r
  #include "juce_VSTMidiEventList.h"\r
  \r
index 89e6141af65b4cfd0e7d7773cea4653cb1122095..3815a2bdb8d620e9bcca0074d6ff07c38dedcbcc 100644 (file)
@@ -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 @@
  \r
              if (! packages.isEmpty())\r
              {\r
 -                out << "\t@command -v pkg-config >/dev/null 2>&1 || { echo >&2 \"pkg-config not installed. Please, install it.\"; exit 1; }" << newLine\r
 -                    << "\t@pkg-config --print-errors";\r
-+                out << "\t@command -v $(PKG_CONFIG) >/dev/null 2>&1 || { echo >&2 \"pkg-config not installed. Please, install it.\"; exit 1; }" << newLine\r
++                out << "\t@command -v $(PKG_CONFIG) >/dev/null 2>&1 || { echo >&2 \"$(PKG_CONFIG) not installed. Please, install it.\"; exit 1; }" << newLine\r
 +                    << "\t@$(PKG_CONFIG) --print-errors";\r
  \r
                  for (auto& pkg : packages)\r
                      out << " " << pkg;\r
-@@ -507,7 +507,7 @@ private:
-         auto packages = getPackages();\r
+@@ -558,7 +558,7 @@
+         auto compilePackages = getCompilePackages();\r
  \r
-         if (packages.size() > 0)\r
--            return "$(shell pkg-config --cflags " + packages.joinIntoString (" ") + ")";\r
-+            return "$(shell $(PKG_CONFIG) --cflags " + packages.joinIntoString (" ") + ")";\r
+         if (compilePackages.size() > 0)\r
+-            return "$(shell pkg-config --cflags " + compilePackages.joinIntoString (" ") + ")";\r
++            return "$(shell $(PKG_CONFIG) --cflags " + compilePackages.joinIntoString (" ") + ")";\r
  \r
          return {};\r
      }\r
-@@ -517,7 +517,7 @@ private:
-         auto packages = getPackages();\r
+@@ -568,7 +568,7 @@
+         auto linkPackages = getLinkPackages();\r
  \r
-         if (packages.size() > 0)\r
--            return "$(shell pkg-config --libs " + packages.joinIntoString (" ") + ")";\r
-+            return "$(shell $(PKG_CONFIG) --libs " + packages.joinIntoString (" ") + ")";\r
+         if (linkPackages.size() > 0)\r
+-            return "$(shell pkg-config --libs " + linkPackages.joinIntoString (" ") + ")";\r
++            return "$(shell $(PKG_CONFIG) --libs " + linkPackages.joinIntoString (" ") + ")";\r
  \r
          return {};\r
      }\r
-@@ -912,6 +912,11 @@ private:
+@@ -938,6 +938,11 @@
              << "endif"         << newLine\r
              << newLine;\r
  \r