From 3184fdbba9c9de5bd12d1120c5428988b1e9b138 Mon Sep 17 00:00:00 2001 From: falkTX Date: Fri, 22 Mar 2024 23:15:43 +0100 Subject: [PATCH 1/3] Update DPF, bump version, rebuild CI libs Signed-off-by: falkTX --- .github/workflows/build.yml | 2 +- Makefile | 5 ++--- deps/PawPaw | 2 +- dpf | 2 +- src/CardinalCommon.cpp | 2 +- src/CardinalPlugin.cpp | 2 +- utils/macOS/Info_JACK.plist | 4 ++-- utils/macOS/Info_Native.plist | 4 ++-- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 42f9feea..8e9624f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: build on: [push, pull_request] env: - CACHE_VERSION: 9 + CACHE_VERSION: 10 CARDINAL_UNDER_WINE: 1 CIBUILD: true DEBIAN_FRONTEND: noninteractive diff --git a/Makefile b/Makefile index 57d0d129..75292e98 100644 --- a/Makefile +++ b/Makefile @@ -10,12 +10,11 @@ include $(ROOT)/Makefile.base.mk # Set version # also set in: -# jucewrapper/CMakeLists.txt `project` # src/CardinalCommon.cpp `CARDINAL_VERSION` # src/CardinalPlugin.cpp `getVersion` # utils/macOS/Info_{JACK,Native}.plist -# jucewrapper/CMakeLists.txt src/CardinalCommon.cpp src/CardinalPlugin.cpp utils/macOS/Info_{JACK,Native}.plist -VERSION = 24.01 +# src/CardinalCommon.cpp src/CardinalPlugin.cpp utils/macOS/Info_{JACK,Native}.plist +VERSION = 24.03 # -------------------------------------------------------------- # Build targets diff --git a/deps/PawPaw b/deps/PawPaw index 77717756..b84d0ec2 160000 --- a/deps/PawPaw +++ b/deps/PawPaw @@ -1 +1 @@ -Subproject commit 777177562ef39836b9e0963e7910d55e3d2d0636 +Subproject commit b84d0ec2d1bb5c7d7fd05d4a8d7f4af71306c425 diff --git a/dpf b/dpf index 0ceb411f..370af7f2 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 0ceb411fde5192ad4aaa1c89b079a861e4dac5df +Subproject commit 370af7f263dd39cd926eb6f88ae0d10d74a59cf7 diff --git a/src/CardinalCommon.cpp b/src/CardinalCommon.cpp index 266a0fc1..ed36098c 100644 --- a/src/CardinalCommon.cpp +++ b/src/CardinalCommon.cpp @@ -99,7 +99,7 @@ void destroyStaticPlugins(); } } -const std::string CARDINAL_VERSION = "24.01"; +const std::string CARDINAL_VERSION = "24.03"; START_NAMESPACE_DISTRHO diff --git a/src/CardinalPlugin.cpp b/src/CardinalPlugin.cpp index 92c44ac9..f89338b5 100644 --- a/src/CardinalPlugin.cpp +++ b/src/CardinalPlugin.cpp @@ -406,7 +406,7 @@ class CardinalPlugin : public CardinalBasePlugin uint32_t getVersion() const override { - return d_version(0, 24, 1); + return d_version(0, 24, 3); } int64_t getUniqueId() const override diff --git a/utils/macOS/Info_JACK.plist b/utils/macOS/Info_JACK.plist index b8e72f9a..9df338cf 100644 --- a/utils/macOS/Info_JACK.plist +++ b/utils/macOS/Info_JACK.plist @@ -11,11 +11,11 @@ CFBundleIdentifier studio.kx.distrho.cardinal.jack CFBundleShortVersionString - 23.01 + 23.03 LSMinimumSystemVersion 10.15 NSHumanReadableCopyright - (C) 2011-2023 Filipe Coelho. + (C) 2011-2024 Filipe Coelho. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or any later version. NSHighResolutionCapable diff --git a/utils/macOS/Info_Native.plist b/utils/macOS/Info_Native.plist index 2fd3e06e..ed61faf9 100644 --- a/utils/macOS/Info_Native.plist +++ b/utils/macOS/Info_Native.plist @@ -11,11 +11,11 @@ CFBundleIdentifier studio.kx.distrho.cardinal.native CFBundleShortVersionString - 24.01 + 24.03 LSMinimumSystemVersion 10.15 NSHumanReadableCopyright - (C) 2011-2023 Filipe Coelho. + (C) 2011-2024 Filipe Coelho. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or any later version. NSHighResolutionCapable From 6b9e32aa7b06af40008816d071b5b8591794556a Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 23 Mar 2024 17:56:09 +0100 Subject: [PATCH 2/3] Tweaks for MOD builds Signed-off-by: falkTX --- .github/workflows/build.yml | 2 +- Makefile | 4 +++- dpf | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e9624f9..71bec68d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -333,7 +333,7 @@ jobs: run: | ${{ matrix.target == 'nosimd' }} && export PAWPAW_NOSIMD=1 source deps/PawPaw/local.env wasm - make HAVE_LIBLO=false NOOPT=true NOSIMD=${{ matrix.target == 'nosimd' }} -j $(nproc) -C src/CardinalMiniSep modgui + make HAVE_LIBLO=false NOOPT=true NOSIMD=${{ matrix.target == 'nosimd' }} -j $(nproc) modgui - name: Make wasm versioned and compress if: steps.cache.outputs.cache-hit == 'true' shell: bash diff --git a/Makefile b/Makefile index 75292e98..8623ca35 100644 --- a/Makefile +++ b/Makefile @@ -127,7 +127,6 @@ EXTRA_MOD_FLAGS += -ffat-lto-objects endif MOD_ENVIRONMENT += HEADLESS=true -MOD_ENVIRONMENT += MOD_BUILD=true MOD_ENVIRONMENT += STATIC_BUILD=true # -------------------------------------------------------------- @@ -226,6 +225,9 @@ vst2: carla deps dgl plugins resources vst3: carla deps dgl plugins resources $(MAKE) vst3 -C src $(CARLA_EXTRA_ARGS) +modgui: + $(MAKE) modgui -C src/CardinalMiniSep + # -------------------------------------------------------------- # Packaging standalone for CI diff --git a/dpf b/dpf index 370af7f2..045b9431 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 370af7f263dd39cd926eb6f88ae0d10d74a59cf7 +Subproject commit 045b943199393053c606b530fc882661502d53d7 From 8b394385ac536c110b56a82ad87b9e8861b952b9 Mon Sep 17 00:00:00 2001 From: dreamer Date: Sun, 31 Mar 2024 11:15:12 +0200 Subject: [PATCH 3/3] update Befaco --- plugins/Befaco | 2 +- plugins/Makefile | 2 +- plugins/plugins.cpp | 6 ++++++ src/custom/dep.cpp | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/plugins/Befaco b/plugins/Befaco index 4c55f117..d3ad6c67 160000 --- a/plugins/Befaco +++ b/plugins/Befaco @@ -1 +1 @@ -Subproject commit 4c55f117212e758324412efe73f2f573a18f75d3 +Subproject commit d3ad6c6732cee8a80197aa351dd9efef9c278d4c diff --git a/plugins/Makefile b/plugins/Makefile index 582d77b6..78d16113 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -555,7 +555,7 @@ PLUGIN_FILES += $(filter-out Befaco/src/plugin.cpp,$(wildcard Befaco/src/*.cpp)) PLUGIN_FILES += $(wildcard Befaco/src/noise-plethora/*/*.cpp) # modules/types which are present in other plugins -BEFACO_CUSTOM = ADSR Mixer chowdsp +BEFACO_CUSTOM = ADSR Mixer chowdsp Burst # -------------------------------------------------------------- # Bidoo diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index d607de5a..c8771138 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -137,9 +137,11 @@ extern Model* modelChord; // Befaco #define modelADSR modelBefacoADSR #define modelMixer modelBefacoMixer +#define modelBurst modelBefacoBurst #include "Befaco/src/plugin.hpp" #undef modelADSR #undef modelMixer +#undef modelBurst // Bidoo #include "Bidoo/src/plugin.hpp" @@ -1504,6 +1506,7 @@ static void initStatic__Befaco() { #define modelADSR modelBefacoADSR #define modelMixer modelBefacoMixer +#define modelBurst modelBefacoBurst p->addModel(modelEvenVCO); p->addModel(modelRampage); p->addModel(modelABC); @@ -1525,8 +1528,11 @@ static void initStatic__Befaco() p->addModel(modelChannelStrip); p->addModel(modelPonyVCO); p->addModel(modelMotionMTR); + p->addModel(modelBurst); + p->addModel(modelVoltio); #undef modelADSR #undef modelMixer +#undef modelBurst } } diff --git a/src/custom/dep.cpp b/src/custom/dep.cpp index abbb0d99..6551dfb9 100644 --- a/src/custom/dep.cpp +++ b/src/custom/dep.cpp @@ -413,6 +413,7 @@ static const struct { { kModeBefaco, "/Befaco/res/components/Knurlie.svg" }, { kModeBefaco, "/Befaco/res/panels/ABC.svg" }, { kModeBefaco, "/Befaco/res/panels/ADSR.svg" }, + { kModeBefaco, "/Befaco/res/panels/Burst.svg" }, { kModeBefaco, "/Befaco/res/panels/ChoppingKinky.svg" }, { kModeBefaco, "/Befaco/res/panels/DualAtenuverter.svg" }, { kModeBefaco, "/Befaco/res/panels/EvenVCO.svg" }, @@ -432,6 +433,7 @@ static const struct { { kModeBefaco, "/Befaco/res/panels/SlewLimiter.svg" }, { kModeBefaco, "/Befaco/res/panels/SpringReverb.svg" }, { kModeBefaco, "/Befaco/res/panels/StereoStrip.svg" }, + { kModeBefaco, "/Befaco/res/panels/Voltio.svg" }, // GPLv3+ { kModeCardinal, "/Cardinal/res/AudioFile.svg" }, { kModeCardinal, "/Cardinal/res/AudioToCVPitch.svg" },