From c3aa21b513e66252088e96416169a4c0e18d8968 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 4 Oct 2022 15:10:18 +0100 Subject: [PATCH] Update dragonfly-reverb to 3.2.7, drop patches applied upstream Signed-off-by: falkTX --- .../plugins/dragonfly-reverb/debian/changelog | 6 ++ .../plugins/dragonfly-reverb/debian/install | 26 ++--- .../debian/patches/01_fix-make-clean.patch | 13 --- .../debian/patches/02_build-tweaks.patch | 95 ------------------- .../dragonfly-reverb/debian/patches/series | 2 - 5 files changed, 14 insertions(+), 128 deletions(-) delete mode 100644 sources/plugins/dragonfly-reverb/debian/patches/01_fix-make-clean.patch delete mode 100644 sources/plugins/dragonfly-reverb/debian/patches/02_build-tweaks.patch delete mode 100644 sources/plugins/dragonfly-reverb/debian/patches/series diff --git a/sources/plugins/dragonfly-reverb/debian/changelog b/sources/plugins/dragonfly-reverb/debian/changelog index 676b8df..f6780b0 100644 --- a/sources/plugins/dragonfly-reverb/debian/changelog +++ b/sources/plugins/dragonfly-reverb/debian/changelog @@ -1,3 +1,9 @@ +dragonfly-reverb (6:3.2.7-1kxstudio1) focal; urgency=medium + + * Update + + -- falkTX Tue, 04 Oct 2022 15:07:12 +0100 + dragonfly-reverb (6:3.2.6-1kxstudio2) focal; urgency=medium * Setup package conflicts vs Ubuntu repo stuff diff --git a/sources/plugins/dragonfly-reverb/debian/install b/sources/plugins/dragonfly-reverb/debian/install index a8e317d..12f4cc2 100644 --- a/sources/plugins/dragonfly-reverb/debian/install +++ b/sources/plugins/dragonfly-reverb/debian/install @@ -1,19 +1,9 @@ -bin/DragonflyEarlyReflections usr/bin/ -bin/DragonflyEarlyReflections-vst.so usr/lib/vst/ -bin/DragonflyEarlyReflections.lv2 usr/lib/lv2/ -bin/DragonflyEarlyReflections.vst3 usr/lib/vst3/ +bin/DragonflyEarlyReflections usr/bin/ +bin/DragonflyHallReverb usr/bin/ +bin/DragonflyPlateReverb usr/bin/ +bin/DragonflyRoomReverb usr/bin/ -bin/DragonflyHallReverb usr/bin/ -bin/DragonflyHallReverb-vst.so usr/lib/vst/ -bin/DragonflyHallReverb.lv2 usr/lib/lv2/ -bin/DragonflyHallReverb.vst3 usr/lib/vst3/ - -bin/DragonflyPlateReverb usr/bin/ -bin/DragonflyPlateReverb-vst.so usr/lib/vst/ -bin/DragonflyPlateReverb.lv2 usr/lib/lv2/ -bin/DragonflyPlateReverb.vst3 usr/lib/vst3/ - -bin/DragonflyRoomReverb usr/bin/ -bin/DragonflyRoomReverb-vst.so usr/lib/vst/ -bin/DragonflyRoomReverb.lv2 usr/lib/lv2/ -bin/DragonflyRoomReverb.vst3 usr/lib/vst3/ +bin/*.clap usr/lib/clap/ +bin/*.lv2 usr/lib/lv2/ +bin/*-vst.so usr/lib/vst/ +bin/*.vst3 usr/lib/vst3/ diff --git a/sources/plugins/dragonfly-reverb/debian/patches/01_fix-make-clean.patch b/sources/plugins/dragonfly-reverb/debian/patches/01_fix-make-clean.patch deleted file mode 100644 index 944d052..0000000 --- a/sources/plugins/dragonfly-reverb/debian/patches/01_fix-make-clean.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- dragonfly-reverb-3.2.6.orig/Makefile -+++ dragonfly-reverb-3.2.6/Makefile -@@ -45,6 +45,10 @@ clean: - $(MAKE) clean -C plugins/dragonfly-plate-reverb - $(MAKE) clean -C plugins/dragonfly-early-reflections - rm -rf bin build -+ rm -f common/*.d common/*.o -+ rm -f common/freeverb/*.d common/freeverb/*.o -+ rm -f common/kiss_fft/*.d common/kiss_fft/*.o -+ rm -f dpf/utils/lv2_ttl_generator.d - - # -------------------------------------------------------------- - diff --git a/sources/plugins/dragonfly-reverb/debian/patches/02_build-tweaks.patch b/sources/plugins/dragonfly-reverb/debian/patches/02_build-tweaks.patch deleted file mode 100644 index 72ec294..0000000 --- a/sources/plugins/dragonfly-reverb/debian/patches/02_build-tweaks.patch +++ /dev/null @@ -1,95 +0,0 @@ ---- dragonfly-reverb-3.2.6.orig/Makefile -+++ dragonfly-reverb-3.2.6/Makefile -@@ -17,7 +17,7 @@ CAN_GENERATE_TTL = true - endif - - dgl: -- $(MAKE) -C dpf/dgl -+ $(MAKE) -C dpf/dgl FILE_BROWSER_DISABLED=true - - plugins: dgl - $(MAKE) all -C plugins/dragonfly-hall-reverb ---- dragonfly-reverb-3.2.6.orig/plugins/dragonfly-early-reflections/DistrhoPluginInfo.h -+++ dragonfly-reverb-3.2.6/plugins/dragonfly-early-reflections/DistrhoPluginInfo.h -@@ -20,7 +20,6 @@ - #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED - #define DISTRHO_PLUGIN_INFO_H_INCLUDED - --#define DISTRHO_PLUGIN_BRAND "Dragonfly" - #define DISTRHO_PLUGIN_NAME "Dragonfly Early Reflections" - #define DISTRHO_PLUGIN_URI "urn:dragonfly:early" - ---- dragonfly-reverb-3.2.6.orig/plugins/dragonfly-early-reflections/Makefile -+++ dragonfly-reverb-3.2.6/plugins/dragonfly-early-reflections/Makefile -@@ -51,6 +51,8 @@ FILES_UI = $(FILES_COMMON) \ - # -------------------------------------------------------------- - # Do some magic - -+FILE_BROWSER_DISABLED = true -+SKIP_RTAUDIO_FALLBACK = true - include ../../dpf/Makefile.plugins.mk - - # -------------------------------------------------------------- ---- dragonfly-reverb-3.2.6.orig/plugins/dragonfly-hall-reverb/DistrhoPluginInfo.h -+++ dragonfly-reverb-3.2.6/plugins/dragonfly-hall-reverb/DistrhoPluginInfo.h -@@ -21,7 +21,6 @@ - #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED - #define DISTRHO_PLUGIN_INFO_H_INCLUDED - --#define DISTRHO_PLUGIN_BRAND "Dragonfly" - #define DISTRHO_PLUGIN_NAME "Dragonfly Hall Reverb" - #define DISTRHO_PLUGIN_URI "https://github.com/michaelwillis/dragonfly-reverb" - ---- dragonfly-reverb-3.2.6.orig/plugins/dragonfly-hall-reverb/Makefile -+++ dragonfly-reverb-3.2.6/plugins/dragonfly-hall-reverb/Makefile -@@ -51,6 +51,8 @@ FILES_UI = $(FILES_COMMON) \ - # -------------------------------------------------------------- - # Do some magic - -+FILE_BROWSER_DISABLED = true -+SKIP_RTAUDIO_FALLBACK = true - include ../../dpf/Makefile.plugins.mk - - # -------------------------------------------------------------- ---- dragonfly-reverb-3.2.6.orig/plugins/dragonfly-plate-reverb/DistrhoPluginInfo.h -+++ dragonfly-reverb-3.2.6/plugins/dragonfly-plate-reverb/DistrhoPluginInfo.h -@@ -20,7 +20,6 @@ - #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED - #define DISTRHO_PLUGIN_INFO_H_INCLUDED - --#define DISTRHO_PLUGIN_BRAND "Dragonfly" - #define DISTRHO_PLUGIN_NAME "Dragonfly Plate Reverb" - #define DISTRHO_PLUGIN_URI "urn:dragonfly:plate" - ---- dragonfly-reverb-3.2.6.orig/plugins/dragonfly-plate-reverb/Makefile -+++ dragonfly-reverb-3.2.6/plugins/dragonfly-plate-reverb/Makefile -@@ -51,6 +51,8 @@ FILES_UI = $(FILES_COMMON) \ - # -------------------------------------------------------------- - # Do some magic - -+FILE_BROWSER_DISABLED = true -+SKIP_RTAUDIO_FALLBACK = true - include ../../dpf/Makefile.plugins.mk - - # -------------------------------------------------------------- ---- dragonfly-reverb-3.2.6.orig/plugins/dragonfly-room-reverb/DistrhoPluginInfo.h -+++ dragonfly-reverb-3.2.6/plugins/dragonfly-room-reverb/DistrhoPluginInfo.h -@@ -20,7 +20,6 @@ - #ifndef DISTRHO_PLUGIN_INFO_H_INCLUDED - #define DISTRHO_PLUGIN_INFO_H_INCLUDED - --#define DISTRHO_PLUGIN_BRAND "Dragonfly" - #define DISTRHO_PLUGIN_NAME "Dragonfly Room Reverb" - #define DISTRHO_PLUGIN_URI "urn:dragonfly:room" - ---- dragonfly-reverb-3.2.6.orig/plugins/dragonfly-room-reverb/Makefile -+++ dragonfly-reverb-3.2.6/plugins/dragonfly-room-reverb/Makefile -@@ -51,6 +51,8 @@ FILES_UI = $(FILES_COMMON) \ - # -------------------------------------------------------------- - # Do some magic - -+FILE_BROWSER_DISABLED = true -+SKIP_RTAUDIO_FALLBACK = true - include ../../dpf/Makefile.plugins.mk - - # -------------------------------------------------------------- diff --git a/sources/plugins/dragonfly-reverb/debian/patches/series b/sources/plugins/dragonfly-reverb/debian/patches/series deleted file mode 100644 index 1a9211d..0000000 --- a/sources/plugins/dragonfly-reverb/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -01_fix-make-clean.patch -02_build-tweaks.patch