From 6d8056916280e7d3a3caef2e918204b5635bb588 Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig=20=28Debian/GNU=29?= Date: Tue, 21 Jun 2022 16:16:36 +0200 Subject: [PATCH] Drop patches applied upstream --- debian/patches/LV2-audioprocessor.patch | 73 --------------------- debian/patches/cross.patch | 64 ------------------ debian/patches/overridable_pkg-config.patch | 58 ---------------- debian/patches/series | 3 - 4 files changed, 198 deletions(-) delete mode 100644 debian/patches/LV2-audioprocessor.patch delete mode 100644 debian/patches/cross.patch delete mode 100644 debian/patches/overridable_pkg-config.patch diff --git a/debian/patches/LV2-audioprocessor.patch b/debian/patches/LV2-audioprocessor.patch deleted file mode 100644 index 018b8b1f..00000000 --- a/debian/patches/LV2-audioprocessor.patch +++ /dev/null @@ -1,73 +0,0 @@ -From: Filipe Coelho -Date: Sat, 10 Feb 2018 00:00:00 +0100 -Subject: LV2 fixes for autiodprocessor -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Origin: https://github.com/DISTRHO/juce/tree/9f6cdc3659df13169285464ee1d13ef14357f833 -Reviewed-by: IOhannes m zmölnig ---- - .../juce_audio_processors/processors/juce_AudioProcessor.h | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- juce.orig/modules/juce_audio_processors/processors/juce_AudioProcessor.h -+++ juce/modules/juce_audio_processors/processors/juce_AudioProcessor.h -@@ -928,6 +928,7 @@ - */ - virtual void setNonRealtime (bool isNonRealtime) noexcept; - -+ #if ! JUCE_AUDIOPROCESSOR_NO_GUI - //============================================================================== - /** Creates the processor's GUI. - -@@ -977,6 +978,7 @@ - This may call createEditor() internally to create the component. - */ - AudioProcessorEditor* createEditorIfNeeded(); -+ #endif - - //============================================================================== - /** Returns the default number of steps for a parameter. -@@ -1119,6 +1121,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); - -@@ -1188,9 +1195,11 @@ - - virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const { return {}; } - -+ #if ! JUCE_AUDIOPROCESSOR_NO_GUI - //============================================================================== - /** Not for public use - this is called before deleting an editor component. */ - void editorBeingDeleted (AudioProcessorEditor*) noexcept; -+ #endif - - /** Flags to indicate the type of plugin context in which a processor is being used. */ - enum WrapperType -@@ -1204,6 +1213,7 @@ - wrapperType_AAX, - wrapperType_Standalone, - wrapperType_Unity -+ , wrapperType_LV2 - }; - - /** When loaded by a plugin wrapper, this flag will be set to indicate the type -@@ -1463,7 +1473,9 @@ - - //============================================================================== - Array listeners; -+ #if ! JUCE_AUDIOPROCESSOR_NO_GUI - Component::SafePointer activeEditor; -+ #endif - double currentSampleRate = 0; - int blockSize = 0, latencySamples = 0; - bool suspended = false; diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch deleted file mode 100644 index ab08ca13..00000000 --- a/debian/patches/cross.patch +++ /dev/null @@ -1,64 +0,0 @@ -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(-) - ---- juce.orig/extras/Projucer/Builds/LinuxMakefile/Makefile -+++ juce/extras/Projucer/Builds/LinuxMakefile/Makefile -@@ -19,6 +19,10 @@ - AR=ar - endif - -+ifndef PKG_CONFIG -+ PKG_CONFIG=pkg-config -+endif -+ - ifndef CONFIG - CONFIG=Debug - endif -@@ -35,13 +39,13 @@ - TARGET_ARCH := - endif - -- JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DDEBUG=1" "-D_DEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60106" "-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.1.6" "-DJUCE_APP_VERSION_HEX=0x60106" $(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=0x60106" "-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.1.6" "-DJUCE_APP_VERSION_HEX=0x60106" $(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++14 $(CXXFLAGS) -- 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 @@ - TARGET_ARCH := - endif - -- JUCE_CPPFLAGS := $(DEPFLAGS) "-DLINUX=1" "-DNDEBUG=1" "-DJUCE_DISPLAY_SPLASH_SCREEN=0" "-DJUCE_USE_DARK_SPLASH_SCREEN=1" "-DJUCE_PROJUCER_VERSION=0x60106" "-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.1.6" "-DJUCE_APP_VERSION_HEX=0x60106" $(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=0x60106" "-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.1.6" "-DJUCE_APP_VERSION_HEX=0x60106" $(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++14 $(CXXFLAGS) -- 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 -@@ -132,8 +136,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 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/overridable_pkg-config.patch b/debian/patches/overridable_pkg-config.patch deleted file mode 100644 index 7d76f08d..00000000 --- a/debian/patches/overridable_pkg-config.patch +++ /dev/null @@ -1,58 +0,0 @@ -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(-) - ---- juce.orig/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -+++ juce/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Make.h -@@ -306,8 +306,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 -+ << "\t@$(PKG_CONFIG) --print-errors"; - - for (auto& pkg : packages) - out << " " << pkg; -@@ -562,7 +562,7 @@ - auto compilePackages = getCompilePackages(); - - if (compilePackages.size() > 0) -- return "$(shell pkg-config --cflags " + compilePackages.joinIntoString (" ") + ")"; -+ return "$(shell $(PKG_CONFIG) --cflags " + compilePackages.joinIntoString (" ") + ")"; - - return {}; - } -@@ -572,7 +572,7 @@ - auto linkPackages = getLinkPackages(); - - if (linkPackages.size() > 0) -- return "$(shell pkg-config --libs " + linkPackages.joinIntoString (" ") + ")"; -+ return "$(shell $(PKG_CONFIG) --libs " + linkPackages.joinIntoString (" ") + ")"; - - return {}; - } -@@ -943,6 +943,11 @@ - << "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 --git a/debian/patches/series b/debian/patches/series index 15858140..d916206f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -LV2-audioprocessor.patch debian_fixed-defines.patch debian_no-update-check.patch debian_system_modules.patch @@ -6,7 +5,5 @@ debian_python3-doxygen.patch debian_unittests_globalpaths.patch debian_vst.patch debian_link_systemlibs.patch -cross.patch debian_buildcmake.patch -overridable_pkg-config.patch debian_cmake.patch -- 2.30.2