Drop patches applied upstream
authorIOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>
Tue, 21 Jun 2022 14:16:36 +0000 (16:16 +0200)
committerIOhannes m zmölnig (Debian/GNU) <umlaeute@debian.org>
Tue, 21 Jun 2022 14:21:32 +0000 (16:21 +0200)
debian/patches/LV2-audioprocessor.patch [deleted file]
debian/patches/cross.patch [deleted file]
debian/patches/overridable_pkg-config.patch [deleted file]
debian/patches/series

diff --git a/debian/patches/LV2-audioprocessor.patch b/debian/patches/LV2-audioprocessor.patch
deleted file mode 100644 (file)
index 018b8b1..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-From: Filipe Coelho <falkTX>
-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 @@
-     */\r
-     virtual void setNonRealtime (bool isNonRealtime) noexcept;\r
\r
-+   #if ! JUCE_AUDIOPROCESSOR_NO_GUI\r
-     //==============================================================================\r
-     /** Creates the processor's GUI.\r
\r
-@@ -977,6 +978,7 @@
-         This may call createEditor() internally to create the component.\r
-     */\r
-     AudioProcessorEditor* createEditorIfNeeded();\r
-+   #endif\r
\r
-     //==============================================================================\r
-     /** Returns the default number of steps for a parameter.\r
-@@ -1119,6 +1121,11 @@
-     virtual void processorLayoutsChanged();\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
-     /** Adds a listener that will be called when an aspect of this processor changes. */\r
-     virtual void addListener (AudioProcessorListener* newListener);\r
\r
-@@ -1188,9 +1195,11 @@
\r
-     virtual CurveData getResponseCurve (CurveData::Type /*curveType*/) const      { return {}; }\r
\r
-+   #if ! JUCE_AUDIOPROCESSOR_NO_GUI\r
-     //==============================================================================\r
-     /** Not for public use - this is called before deleting an editor component. */\r
-     void editorBeingDeleted (AudioProcessorEditor*) noexcept;\r
-+   #endif\r
\r
-     /** Flags to indicate the type of plugin context in which a processor is being used. */\r
-     enum WrapperType\r
-@@ -1204,6 +1213,7 @@
-         wrapperType_AAX,\r
-         wrapperType_Standalone,\r
-         wrapperType_Unity\r
-+        , wrapperType_LV2\r
-     };\r
\r
-     /** When loaded by a plugin wrapper, this flag will be set to indicate the type\r
-@@ -1463,7 +1473,9 @@
\r
-     //==============================================================================\r
-     Array<AudioProcessorListener*> listeners;\r
-+   #if ! JUCE_AUDIOPROCESSOR_NO_GUI\r
-     Component::SafePointer<AudioProcessorEditor> activeEditor;\r
-+   #endif\r
-     double currentSampleRate = 0;\r
-     int blockSize = 0, latencySamples = 0;\r
-     bool suspended = false;\r
diff --git a/debian/patches/cross.patch b/debian/patches/cross.patch
deleted file mode 100644 (file)
index ab08ca1..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
-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 (file)
index 7d76f08..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Debian Multimedia Maintainers <debian-multimedia@lists.debian.org>
-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 @@
\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
-+                    << "\t@$(PKG_CONFIG) --print-errors";\r
\r
-                 for (auto& pkg : packages)\r
-                     out << " " << pkg;\r
-@@ -562,7 +562,7 @@
-         auto compilePackages = getCompilePackages();\r
\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
-@@ -572,7 +572,7 @@
-         auto linkPackages = getLinkPackages();\r
\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
-@@ -943,6 +943,11 @@
-             << "endif"         << newLine\r
-             << newLine;\r
\r
-+        out << "ifndef PKG_CONFIG"  << newLine\r
-+            << "  PKG_CONFIG=pkg-config" << newLine\r
-+            << "endif"         << newLine\r
-+            << newLine;\r
-+\r
-         out << "ifndef AR" << newLine\r
-             << "  AR=ar"   << newLine\r
-             << "endif"     << newLine\r
index 15858140b18817488f8204cfbaed38368cdd0731..d916206fca3ed4ae9c264499b9fbdca61de671f3 100644 (file)
@@ -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