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 authored Mar 8, 2024
2 parents f8729e3 + 7f1a48d commit 085615b
Show file tree
Hide file tree
Showing 29 changed files with 247 additions and 1,397 deletions.
61 changes: 26 additions & 35 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ jobs:
curl -sLO https://launchpad.net/~kxstudio-debian/+archive/ubuntu/toolchain/+files/git-man_2.34.1-1ubuntu1~bpo20.04.1~ppa1_all.deb
dpkg -i *.deb
rm *.deb
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up build cache
id: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/PawPawBuilds
Expand Down Expand Up @@ -108,7 +108,7 @@ jobs:
- name: Pack binaries
run: |
tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst -e clap) ../CardinalJACK ../CardinalNative ../LICENSE ../README.md ../docs
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ github.event.repository.name }}-linux-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}
path: |
Expand All @@ -126,7 +126,7 @@ jobs:
linux-x86_64-debug:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up dependencies
Expand All @@ -148,25 +148,25 @@ jobs:
run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
- name: Pack binaries
run: |
tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-linux-x86_64-debug-${{ github.event.pull_request.number || env.SHA8 }}.tar.gz -C bin $(ls bin | grep -e lv2 -e vst -e clap) ../LICENSE ../README.md ../docs
- uses: actions/upload-artifact@v3
tar -c -h --hard-dereference -J -f ${{ github.event.repository.name }}-linux-x86_64-debug-${{ github.event.pull_request.number || env.SHA8 }}.tar.xz -C bin $(ls bin | grep -e lv2 -e vst -e clap) ../LICENSE ../README.md ../docs
- uses: actions/upload-artifact@v4
with:
name: ${{ github.event.repository.name }}-linux-x86_64-debug-${{ github.event.pull_request.number || env.SHA8 }}
path: |
*.tar.gz
*.tar.xz
macos:
strategy:
matrix:
target: [universal-10.15]
runs-on: macos-11
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up cache
id: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/PawPawBuilds
Expand Down Expand Up @@ -199,15 +199,6 @@ jobs:
source deps/PawPaw/local.env macos-${{ matrix.target }}
make features
make NOOPT=true -j $(sysctl -n hw.logicalcpu)
- name: Build macOS (AU using juce)
if: steps.cache.outputs.cache-hit == 'true'
shell: bash
run: |
export PATH="/usr/local/opt/ccache/libexec:${PATH}"
source deps/PawPaw/local.env macos-${{ matrix.target }}
mkdir -p jucewrapper/build
pushd jucewrapper/build; cmake -DCMAKE_BUILD_TYPE=Release .. && make VERBOSE=1 -j $(sysctl -n hw.logicalcpu); popd
mv jucewrapper/build/*_artefacts/Release/AU/*.component bin/
- name: Build macOS (packaging)
if: steps.cache.outputs.cache-hit == 'true'
shell: bash
Expand All @@ -224,7 +215,7 @@ jobs:
if: steps.cache.outputs.cache-hit == 'true'
run: |
mv ${{ github.event.repository.name }}-macOS.pkg ${{ github.event.repository.name }}-macOS-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}.pkg
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ github.event.repository.name }}-macOS-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}
path: |
Expand Down Expand Up @@ -252,11 +243,11 @@ jobs:
target: moddwarf
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up cache
uses: actions/cache@v3
uses: actions/cache@v4
id: mpb-cache
with:
path: |
Expand Down Expand Up @@ -286,7 +277,7 @@ jobs:
if: steps.mpb-cache.outputs.cache-hit == 'true'
run: |
tar -c -h --hard-dereference -z -f ${{ github.event.repository.name }}-${{ matrix.name }}-${{ github.event.pull_request.number || env.SHA8 }}.tar.gz -C bin $(ls bin | grep lv2)
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ github.event.repository.name }}-${{ matrix.name }}-${{ github.event.pull_request.number || env.SHA8 }}
path: |
Expand All @@ -298,12 +289,12 @@ jobs:
target: [simd, nosimd]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up cache
id: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/PawPawBuilds
Expand Down Expand Up @@ -370,7 +361,7 @@ jobs:
if: steps.cache.outputs.cache-hit == 'true'
run: |
cd bin; zip -r -9 ../${{ github.event.repository.name }}-wasm-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}.zip $(ls *.br *.html *.data *.js *.wasm) CardinalMini.lv2/modgui
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ github.event.repository.name }}-wasm-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}
path: |
Expand All @@ -396,12 +387,12 @@ jobs:
- name: Install git
run: |
apt-get update -qq && apt-get install -yqq --no-install-recommends ca-certificates git openssl
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up cache
id: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
~/PawPawBuilds
Expand Down Expand Up @@ -464,7 +455,7 @@ jobs:
zip -r -9 ../${{ github.event.repository.name }}-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}.zip $(ls | grep -e lv2 -e vst -e clap)
popd
zip -u -9 ${{ github.event.repository.name }}-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}.zip LICENSE README.md docs/*.* CardinalJACK.exe CardinalNative.exe
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ github.event.repository.name }}-${{ matrix.target }}-${{ github.event.pull_request.number || env.SHA8 }}
path: |
Expand All @@ -484,7 +475,7 @@ jobs:
headless:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up dependencies
Expand All @@ -501,7 +492,7 @@ jobs:
lto:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up dependencies
Expand All @@ -517,7 +508,7 @@ jobs:
sysdeps:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up dependencies
Expand All @@ -533,7 +524,7 @@ jobs:
source-tarball:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up dependencies
Expand All @@ -551,7 +542,7 @@ jobs:
- name: Set sha8 (release)
if: startsWith(github.ref, 'refs/tags/')
run: echo "SHA8=$(echo ${{ github.ref_name }})" >> $GITHUB_ENV
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ github.event.repository.name }}-source-${{ github.event.pull_request.number || env.SHA8 }}
path: |
Expand All @@ -573,12 +564,12 @@ jobs:
plugin-validation:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up cache
id: cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
src/Rack/dep/bin
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,9 @@
[submodule "plugins/DHE-Modules"]
path = plugins/DHE-Modules
url = https://github.com/dhemery/DHE-Modules.git
[submodule "plugins/CVfunk"]
path = plugins/CVfunk
url = https://github.com/codygeary/CVfunk-Modules.git
[submodule "plugins/StarlingVia"]
path = plugins/StarlingVia
url = https://github.com/starlingcode/Via-for-Rack.git
1 change: 1 addition & 0 deletions Makefile.base.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ endif
# -----------------------------------------------------------------------------
# Custom build flags

BASE_FLAGS += -DUSING_CARDINAL_NOT_RACK
BASE_FLAGS += -I$(abspath $(ROOT)/include)
BASE_FLAGS += -I$(abspath $(ROOT)/include/simd-compat)
BASE_FLAGS += -I$(RACK_DEP_PATH)/include
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ At the moment the following 3rd-party modules are provided:
- [Catro/Modulo](https://github.com/catronomix/catro-modulo)
- [cf](https://github.com/cfoulc/cf)
- [ChowDSP](https://github.com/jatinchowdhury18/ChowDSP-VCV)
- [CVfunk](https://github.com/codygeary/CVfunk-Modules)
- [dBiz](https://github.com/dBiz/dBiz)
- [DHE Modules](https://github.com/dhemery/DHE-Modules)
- [DrumKit](https://svmodular.com/plugin/vcv/drumkit.html)
Expand Down
2 changes: 1 addition & 1 deletion carla
Submodule carla updated 29 files
+14 −10 .github/workflows/dpf.yml
+4 −0 Makefile
+1 −1 resources/ui/carla_settings.ui
+7 −33 source/backend/CarlaUtils.h
+1 −1 source/backend/engine/CarlaEngineBridge.cpp
+27 −1 source/backend/plugin/CarlaPluginJuce.cpp
+4 −8 source/backend/plugin/CarlaPluginVST3.cpp
+2 −94 source/backend/utils/CachedPlugins.cpp
+6 −32 source/backend/utils/Information.cpp
+8 −22 source/backend/utils/JUCE.cpp
+4 −26 source/backend/utils/Makefile
+101 −26 source/backend/utils/PluginDiscovery.cpp
+8 −1 source/bridges-plugin/CarlaBridgePlugin.cpp
+0 −32 source/discovery/Makefile
+394 −258 source/discovery/carla-discovery.cpp
+6 −16 source/frontend/CarlaFrontend.h
+7 −0 source/frontend/carla_shared.py
+0 −25 source/frontend/carla_utils.py
+49 −34 source/frontend/pluginlist/pluginlistdialog.cpp
+3 −7 source/frontend/pluginlist/pluginlistdialog.hpp
+1 −0 source/includes/travesty/base.h
+2 −1 source/plugin/carla-lv2-export.cpp
+3 −2 source/plugin/carla-vst-export-bridged.cpp
+3 −3 source/utils/CarlaMathUtils.hpp
+10 −5 source/utils/CarlaPipeUtils.cpp
+5 −4 source/utils/CarlaPipeUtils.hpp
+3 −5 source/utils/CarlaString.hpp
+5 −5 source/utils/CarlaUtils.hpp
+5 −1 source/utils/CarlaVst3Utils.hpp
2 changes: 2 additions & 0 deletions docs/LICENSES.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
| Catro/Modulo | BSD-3-Clause | |
| cf | BSD-3-Clause | |
| ChowDSP | GPL-3.0-or-later | |
| CVfunk | MIT | |
| dBiz | GPL-3.0-or-later | |
| DHE-Modules | MIT | |
| DrumKit | CC0-1.0 | |
Expand Down Expand Up @@ -158,6 +159,7 @@ Below is a list of artwork licenses from plugins
| cf/VT323-Regular.ttf | OFL-1.1-no-RFN | |
| ChowDSP/* | GPL-3.0-or-later | Same license as source code |
| ChowDSP/fonts/RobotoCondensed-*.ttf | Apache-2.0 | |
| CVfunk/* | MIT | Same license as source code |
| dBiz/* | CC-BY-NC-ND-4.0 | |
| dBiz/DejaVuSansMono.ttf | Bitstream-Vera | |
| dBiz/ShareTechMono-Regular.ttf | OFL-1.1 | |
Expand Down
2 changes: 1 addition & 1 deletion dpf
Submodule dpf updated 75 files
+24 −4 Makefile.base.mk
+47 −9 Makefile.plugins.mk
+52 −1 cmake/DPF-plugin.cmake
+17 −13 dgl/Base.hpp
+2 −2 dgl/EventHandlers.hpp
+1 −0 dgl/Makefile
+1 −0 dgl/Window.hpp
+33 −9 dgl/src/ApplicationPrivateData.cpp
+6 −0 dgl/src/ApplicationPrivateData.hpp
+7 −7 dgl/src/Cairo.cpp
+5 −5 dgl/src/EventHandlers.cpp
+13 −13 dgl/src/Layout.cpp
+11 −11 dgl/src/OpenGL.cpp
+2 −2 dgl/src/SubWidget.cpp
+27 −17 dgl/src/Window.cpp
+13 −7 dgl/src/WindowPrivateData.cpp
+11 −7 dgl/src/WindowPrivateData.hpp
+1 −1 dgl/src/pugl-upstream
+25 −15 dgl/src/pugl.cpp
+7 −2 distrho/DistrhoDetails.hpp
+30 −1 distrho/DistrhoInfo.hpp
+19 −2 distrho/DistrhoPlugin.hpp
+6 −2 distrho/DistrhoPluginMain.cpp
+7 −2 distrho/DistrhoUIMain.cpp
+58 −4 distrho/DistrhoUtils.hpp
+38 −3 distrho/extra/FileBrowserDialogImpl.cpp
+3 −0 distrho/src/DistrhoDefines.h
+2 −1 distrho/src/DistrhoPlugin.cpp
+3,173 −0 distrho/src/DistrhoPluginAU.cpp
+16 −24 distrho/src/DistrhoPluginCLAP.cpp
+66 −14 distrho/src/DistrhoPluginChecks.h
+281 −0 distrho/src/DistrhoPluginExport.cpp
+44 −10 distrho/src/DistrhoPluginInternal.hpp
+11 −5 distrho/src/DistrhoPluginJACK.cpp
+11 −23 distrho/src/DistrhoPluginLV2.cpp
+6 −4 distrho/src/DistrhoPluginLV2export.cpp
+1 −1 distrho/src/DistrhoPluginVST.hpp
+25 −29 distrho/src/DistrhoPluginVST2.cpp
+49 −43 distrho/src/DistrhoPluginVST3.cpp
+3 −3 distrho/src/DistrhoUI.cpp
+502 −0 distrho/src/DistrhoUIAU.mm
+12 −3 distrho/src/DistrhoUIDSSI.cpp
+5 −2 distrho/src/DistrhoUIInternal.hpp
+4 −1 distrho/src/DistrhoUILV2.cpp
+31 −12 distrho/src/DistrhoUIPrivateData.hpp
+6 −4 distrho/src/DistrhoUIVST3.cpp
+5 −3 distrho/src/DistrhoUtils.cpp
+1 −10 examples/CairoUI/CairoExamplePlugin.cpp
+17 −1 examples/CairoUI/DistrhoPluginInfo.h
+1 −1 examples/CairoUI/Makefile
+4 −1 examples/Info/DistrhoPluginInfo.h
+1 −10 examples/Info/InfoExamplePlugin.cpp
+16 −6 examples/Info/InfoExampleUI.cpp
+1 −0 examples/Info/Makefile
+4 −1 examples/Meters/DistrhoPluginInfo.h
+1 −10 examples/Meters/ExamplePluginMeters.cpp
+1 −0 examples/Meters/Makefile
+4 −1 examples/MidiThrough/DistrhoPluginInfo.h
+1 −0 examples/MidiThrough/Makefile
+1 −10 examples/MidiThrough/MidiThroughExamplePlugin.cpp
+4 −1 examples/Parameters/DistrhoPluginInfo.h
+1 −10 examples/Parameters/ExamplePluginParameters.cpp
+6 −0 examples/Parameters/ExampleUIParameters.cpp
+1 −0 examples/Parameters/Makefile
+4 −1 examples/SendNote/DistrhoPluginInfo.h
+1 −0 examples/SendNote/Makefile
+1 −10 examples/SendNote/SendNoteExamplePlugin.cpp
+4 −1 examples/States/DistrhoPluginInfo.h
+1 −10 examples/States/ExamplePluginStates.cpp
+1 −0 examples/States/Makefile
+7 −0 utils/au-services-restart.sh
+1 −1 utils/generate-ttl.sh
+14 −5 utils/package-osx-bundles.sh
+139 −0 utils/state2json.cpp
+1 −0 utils/symbols/au.exp
1 change: 0 additions & 1 deletion include/common.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ namespace std {

// Cardinal specific API
#include <functional>
#define USING_CARDINAL_NOT_RACK

// OS separator macros
#ifdef ARCH_WIN
Expand Down
Loading

0 comments on commit 085615b

Please sign in to comment.