Skip to content

Commit

Permalink
Merge branch 'main' into feature/add-starling-via
Browse files Browse the repository at this point in the history
  • Loading branch information
@dromer
dromer committed Mar 31, 2024
2 parents 899b330 + c181538 commit e1037cb
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -128,7 +127,6 @@ EXTRA_MOD_FLAGS += -ffat-lto-objects
endif

MOD_ENVIRONMENT += HEADLESS=true
MOD_ENVIRONMENT += MOD_BUILD=true
MOD_ENVIRONMENT += STATIC_BUILD=true

# --------------------------------------------------------------
Expand Down Expand Up @@ -227,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

Expand Down
2 changes: 1 addition & 1 deletion deps/PawPaw
Submodule PawPaw updated 20 files
+3 −0 .github/workflows/bootstrap-deps.sh
+1 −1 .github/workflows/bootstrap.yml
+18 −2 bootstrap-common.sh
+2 −3 bootstrap-mod.sh
+27 −1 bootstrap-plugins.sh
+4 −4 patches/fontconfig/02_skip-tests.patch
+0 −13 patches/fontconfig/03_fix-wasm-build.patch
+0 −42 patches/jack2/02_ignore-missing-internals.patch
+0 −15 patches/jack2/03_skip-alsa-plugins-client.patch
+0 −136 patches/jack2/04_mod-desktop-midi.patch
+16 −0 patches/liblo/02_fix-build.patch
+0 −22 patches/liblo/02_fix-use-after-free.patch
+13 −10 patches/lilv/01_hidden-lilv-api.patch
+0 −22 patches/lilv/wasm/11_fix-build.patch
+13 −10 patches/serd/01_hidden-serd-api.patch
+0 −22 patches/serd/wasm/11_fix-build.patch
+13 −10 patches/sord/01_hidden-sord-api.patch
+24 −0 patches/zix/01_hidden-zix-api.patch
+1 −0 setup/env.sh
+19 −15 setup/versions.sh
2 changes: 1 addition & 1 deletion dpf
Submodule dpf updated 15 files
+11 −10 LICENSE
+1 −1 Makefile.base.mk
+11 −7 Makefile.plugins.mk
+11 −4 dgl/src/pugl.cpp
+5 −3 distrho/DistrhoPluginUtils.hpp
+7 −5 distrho/DistrhoUtils.hpp
+15 −0 distrho/src/DistrhoPluginChecks.h
+10 −1 distrho/src/DistrhoPluginJACK.cpp
+1 −1 distrho/src/DistrhoPluginLV2export.cpp
+5 −1 distrho/src/DistrhoPluginVST2.cpp
+9 −0 distrho/src/DistrhoUIDSSI.cpp
+14 −2 distrho/src/DistrhoUtils.cpp
+8 −2 utils/generate-ttl.sh
+26 −25 utils/package-osx-bundles.sh
+16 −16 utils/plugin.pkg/package.xml.in
2 changes: 1 addition & 1 deletion plugins/Befaco
Submodule Befaco updated 16 files
+2 −1 .gitignore
+10 −0 CHANGELOG.md
+3 −1 README.md
+26 −1 plugin.json
+76 −0 res/components/Davies1900hWhiteEndless.svg
+24 −0 res/components/Davies1900hWhiteEndless_bg.svg
+56 −0 res/fonts/MISO-info.txt
+ − res/fonts/miso.otf
+1,131 −0 res/panels/Burst.svg
+1,338 −0 res/panels/Voltio.svg
+349 −0 src/Burst.cpp
+29 −26 src/ChowDSP.hpp
+154 −164 src/PonyVCO.cpp
+94 −0 src/Voltio.cpp
+2 −0 src/plugin.cpp
+17 −0 src/plugin.hpp
2 changes: 1 addition & 1 deletion plugins/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions plugins/plugins.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -1515,6 +1517,7 @@ static void initStatic__Befaco()
{
#define modelADSR modelBefacoADSR
#define modelMixer modelBefacoMixer
#define modelBurst modelBefacoBurst
p->addModel(modelEvenVCO);
p->addModel(modelRampage);
p->addModel(modelABC);
Expand All @@ -1536,8 +1539,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
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/CardinalCommon.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ void destroyStaticPlugins();
}
}

const std::string CARDINAL_VERSION = "24.01";
const std::string CARDINAL_VERSION = "24.03";

START_NAMESPACE_DISTRHO

Expand Down
2 changes: 1 addition & 1 deletion src/CardinalPlugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions src/custom/dep.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand All @@ -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" },
Expand Down
4 changes: 2 additions & 2 deletions utils/macOS/Info_JACK.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<key>CFBundleIdentifier</key>
<string>studio.kx.distrho.cardinal.jack</string>
<key>CFBundleShortVersionString</key>
<string>23.01</string>
<string>23.03</string>
<key>LSMinimumSystemVersion</key>
<string>10.15</string>
<key>NSHumanReadableCopyright</key>
<string>(C) 2011-2023 Filipe Coelho.
<string>(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.</string>
<key>NSHighResolutionCapable</key>
<true/>
Expand Down
4 changes: 2 additions & 2 deletions utils/macOS/Info_Native.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<key>CFBundleIdentifier</key>
<string>studio.kx.distrho.cardinal.native</string>
<key>CFBundleShortVersionString</key>
<string>24.01</string>
<string>24.03</string>
<key>LSMinimumSystemVersion</key>
<string>10.15</string>
<key>NSHumanReadableCopyright</key>
<string>(C) 2011-2023 Filipe Coelho.
<string>(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.</string>
<key>NSHighResolutionCapable</key>
<true/>
Expand Down

0 comments on commit e1037cb

Please sign in to comment.