Merge branch 'DISTRHO:main' into update-surge

Author: rl2939

.github/ISSUE_TEMPLATE/bug.yaml

@@ -5,7 +5,7 @@ body:
     id: version
     attributes:
       label: Version
-      value: "24.12"
+      value: "26.01"
     validations:
       required: true
   - type: dropdown

.github/workflows/build.yml

@@ -3,11 +3,12 @@ name: build
 on: [push, pull_request]
 
 env:
-  CACHE_VERSION: 11
+  CACHE_VERSION: 14
   CARDINAL_UNDER_WINE: 1
   CIBUILD: true
   DEBIAN_FRONTEND: noninteractive
   LIBGL_ALWAYS_SOFTWARE: true
+  PAWPAW_CI: 1
   PAWPAW_FAST_MATH: 1
   PAWPAW_SKIP_GLIB: 1
   PAWPAW_SKIP_LTO: 1
@@ -23,7 +24,7 @@ jobs:
         target: [aarch64, armhf, i686, riscv64, x86_64]
     runs-on: ubuntu-latest
     container:
-      image: ubuntu:20.04
+      image: ubuntu:22.04
     steps:
       - name: Install git
         run: |
@@ -125,7 +126,7 @@ jobs:
             *.tar.gz
 
   linux-x86_64-debug:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -157,7 +158,7 @@ jobs:
             *.tar.xz
 
   macos:
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - uses: actions/checkout@v4
         with:
@@ -179,6 +180,7 @@ jobs:
           key: macos-universal-v${{ env.CACHE_VERSION }}
       - name: Setup dependencies
         run: |
+          brew uninstall --force --ignore-dependencies cmake
           ./deps/PawPaw/.github/workflows/bootstrap-deps.sh macos-universal-10.15
       - name: Build extra dependencies
         run: |
@@ -228,18 +230,20 @@ jobs:
           files: |
             ${{ github.event.repository.name }}-*.pkg
 
-  modaudio:
+  mod-plugin-builder:
     strategy:
       matrix:
         include:
+          - name: darkglass-anagram
+            target: darkglass-anagram
           - name: modduo
             target: modduo-static
             extraflags: MODDUO=true
           - name: modduox
             target: modduox-static
           - name: moddwarf
             target: moddwarf
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -254,7 +258,7 @@ jobs:
       - name: Set up dependencies
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -yqq acl bc curl cvs git mercurial rsync subversion wget bison bzip2 flex gawk gperf gzip help2man nano perl patch tar texinfo unzip automake binutils build-essential cpio libtool libncurses-dev pkg-config python libtool-bin liblo-dev qemu-user-static
+          sudo apt-get install -yqq acl bc curl cvs git mercurial rsync subversion wget bison bzip2 flex gawk gperf gzip help2man nano perl patch tar texinfo unzip automake binutils build-essential cpio libtool libncurses-dev pkg-config python3 libtool-bin liblo-dev qemu-user-static
           sudo apt-get install -yqq pandoc texlive-latex-recommended texlive-latex-extra
           sudo apt-get clean
       - name: Bootstrap toolchain
@@ -422,7 +426,7 @@ jobs:
           export PATH="/usr/lib/ccache:${PATH}"
           source deps/PawPaw/local.env ${{ matrix.target }}
           make features
-          make NOOPT=true -j $(nproc)
+          xvfb-run make NOOPT=true -j $(nproc)
       - name: Build cross-compiled (carla)
         if: steps.cache.outputs.cache-hit == 'true'
         shell: bash
@@ -471,7 +475,7 @@ jobs:
             Cardinal-*.zip
 
   headless:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -488,7 +492,7 @@ jobs:
           make HEADLESS=true -j $(nproc)
 
   lto:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -505,7 +509,7 @@ jobs:
           make WITH_LTO=true -j $(nproc) native
 
   sysdeps:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -521,7 +525,7 @@ jobs:
           make SYSDEPS=true -j $(nproc)
 
   source-tarball:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -561,7 +565,7 @@ jobs:
             /home/runner/*/*/cardinal*.tar.xz
 
   plugin-validation:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -583,8 +587,8 @@ jobs:
       - name: Set up dependencies
         run: |
           # custom repos
-          wget https://launchpad.net/~kxstudio-debian/+archive/kxstudio/+files/kxstudio-repos_11.1.0_all.deb
-          sudo dpkg -i kxstudio-repos_11.1.0_all.deb
+          wget https://launchpad.net/~kxstudio-debian/+archive/kxstudio/+files/kxstudio-repos_11.2.0_all.deb
+          sudo dpkg -i kxstudio-repos_11.2.0_all.deb
           sudo apt-get update -qq
           # build-deps
           sudo apt-get install -yqq libdbus-1-dev libgl1-mesa-dev liblo-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev

.gitmodules

@@ -49,9 +49,9 @@
 [submodule "plugins/ValleyAudio"]
 	path = plugins/ValleyAudio
 	url = https://github.com/ValleyAudio/ValleyRackFree.git
-[submodule "plugins/DrumKit"]
-	path = plugins/DrumKit
-	url = https://github.com/SVModular/DrumKit.git
+[submodule "plugins/WSTD-Drums"]
+	path = plugins/WSTD-Drums
+	url = https://github.com/Wasted-Audio/WSTD-Drums.git
 [submodule "carla"]
 	path = carla
 	url = https://github.com/falkTX/Carla.git
@@ -260,4 +260,9 @@
 [submodule "plugins/admiral"]
 	path = plugins/admiral
 	url = https://github.com/wapiflapi/admiral.git
-
+[submodule "plugins/eightfold"]
+	path = plugins/eightfold
+	url = https://github.com/scanner-darkly/eightfold.git
+[submodule "plugins/Venom"]
+	path = plugins/Venom
+	url = https://github.com/DaveBenham/VenomModules

Makefile

@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 # DISTRHO Cardinal Plugin
-# Copyright (C) 2021-2024 Filipe Coelho <falktx@falktx.com>
+# Copyright (C) 2021-2025 Filipe Coelho <falktx@falktx.com>
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 ROOT = .
 include $(ROOT)/Makefile.base.mk
 
-# -----------------------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # Set version
 
 # also set in:
@@ -15,20 +15,20 @@ include $(ROOT)/Makefile.base.mk
 # src/CardinalPlugin.cpp `getVersion`
 # utils/macOS/Info_{JACK,Native}.plist
 # .github/ISSUE_TEMPLATE/bug.yaml src/CardinalCommon.cpp src/CardinalPlugin.cpp utils/macOS/Info_{JACK,Native}.plist
-VERSION = 24.12
+VERSION = 26.01
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # Build targets
 
 all: cardinal carla deps dgl plugins gen resources
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # Build config
 
 PREFIX  ?= /usr/local
 DESTDIR ?=
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # Carla config
 
 CARLA_EXTRA_ARGS = \
@@ -44,7 +44,16 @@ ifneq ($(DEBUG),true)
 CARLA_EXTRA_ARGS += EXTERNAL_PLUGINS=true
 endif
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
+# DGL config
+
+ifeq ($(WASM),true)
+UI_TYPE = gles2
+else
+UI_TYPE = opengl
+endif
+
+# ---------------------------------------------------------------------------------------------------------------------
 # Check for required system-wide dependencies
 
 ifeq ($(SYSDEPS),true)
@@ -183,7 +192,7 @@ endif
 
 dgl:
 ifneq ($(HEADLESS),true)
-	$(MAKE) opengl -C dpf/dgl $(DGL_EXTRA_ARGS)
+	$(MAKE) $(UI_TYPE) -C dpf/dgl $(DGL_EXTRA_ARGS)
 endif
 
 plugins: deps
@@ -229,6 +238,9 @@ clap: carla deps dgl plugins resources
 lv2: carla deps dgl plugins resources
 	$(MAKE) lv2 -C src $(CARLA_EXTRA_ARGS)
 
+mapi: carla deps dgl plugins resources
+	$(MAKE) mapi -C src $(CARLA_EXTRA_ARGS)
+
 vst2: carla deps dgl plugins resources
 	$(MAKE) vst2 -C src $(CARLA_EXTRA_ARGS)
 

README.md

@@ -145,7 +145,7 @@ At the moment the following 3rd-party modules are provided:
 - [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)
+- [eightfold](https://github.com/scanner-darkly/eightfold)
 - [EnigmaCurry](https://github.com/EnigmaCurry/EnigmaCurry-vcv-pack)
 - [E-Series](https://github.com/VCVRack/ESeries)
 - [ExpertSleepers Encoders](https://expert-sleepers.co.uk/vcvrack_encoders.html)
@@ -196,8 +196,10 @@ At the moment the following 3rd-party modules are provided:
 - [Surge XT](https://github.com/surge-synthesizer/surge-rack)
 - [unless_modules](https://gitlab.com/unlessgames/unless_modules)
 - [Valley](https://github.com/ValleyAudio/ValleyRackFree)
+- [Venom](https://github.com/DaveBenham/VenomModules)
 - [Voxglitch](https://github.com/clone45/voxglitch)
 - [WhatTheRack](https://github.com/korfuri/WhatTheRack)
+- [WSTD-Drums](https://github.com/Wasted-Audio/WSTD-Drums)
 - [ZetaCarinae](https://github.com/mhampton/ZetaCarinaeModules)
 - [ZZC](https://github.com/zezic/ZZC)
 

carla

@@ -57,6 +57,7 @@ SPACE +=
 CMAKE  = cmake
 CMAKE += -DCMAKE_INSTALL_LIBDIR=lib
 CMAKE += -DCMAKE_INSTALL_PREFIX='$(RACK_DEP_PATH)'
+CMAKE += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
 CMAKE += -DBUILD_SHARED_LIBS=OFF
 
 # make sure debug/release matches

deps/Makefile

@@ -39,7 +39,7 @@ Below follows a list of all code licenses used in Cardinal and linked submodules
 | CVfunk                  | MIT                      | |
 | dBiz                    | GPL-3.0-or-later         | |
 | DHE-Modules             | MIT                      | |
-| DrumKit                 | CC0-1.0                  | |
+| eightfold               | GPL-3.0-or-later         | |
 | EnigmaCurry             | GPL-3.0-or-later         | |
 | E-Series                | GPL-3.0-or-later         | |
 | ExpertSleepers Encoders | MIT                      | |
@@ -90,7 +90,9 @@ Below follows a list of all code licenses used in Cardinal and linked submodules
 | Surge XT                | GPL-3.0-or-later         | |
 | unless_modules          | GPL-3.0-or-later         | |
 | Valley                  | GPL-3.0-or-later         | |
+| Venom                   | GPL-3.0-or-later         | |
 | Voxglitch               | GPL-3.0-or-later         | |
+| WSTD-Drums              | CC0-1.0                  | |
 | WhatTheRack             | WTFPL                    | |
 | ZetaCarinae             | GPL-3.0-or-later         | |
 | ZZC                     | GPL-3.0-or-later         | |
@@ -178,6 +180,7 @@ Below is a list of artwork licenses from plugins
 | DHE-Modules/*                           | MIT              | Same license as source code |
 | DrumKit/*                               | CC0-1.0          | |
 | DrumKit/component/NovaMono.ttf          | OFL-1.1-RFN      | |
+| eightfold/*                             | GPL-3.0-or-later | No artwork specific license provided |
 | EnigmaCurry/res/fonts/dseg/*            | OFL-1.1-RFN      | |
 | EnigmaCurry/res/fonts/Fantasque/*       | OFL-1.1          | |
 | EnigmaCurry/res/fonts/manrope/*         | OFL-1.1          | |
@@ -201,6 +204,7 @@ Below is a list of artwork licenses from plugins
 | ImpromptuModular/res/comp/complib/*     | CC-BY-NC-4.0     | |
 | JW-Modules/*                            | BSD-3-Clause     | No artwork specific license provided |
 | JW-Modules/DejaVuSansMono.ttf           | Bitstream-Vera   | Unused in Cardinal |
+| JW-Modules/res/fonts/ShareTechMono-Regular.ttf | OFL-1.1 | |
 | kocmoc/*                                | GPL-3.0-or-later | No artwork specific license provided |
 | LifeFormModular/*                       | MIT              | No artwork specific license provided |
 | LilacLoop/*                             | GPL-3.0-or-later | No artwork specific license provided |
@@ -263,6 +267,7 @@ Below is a list of artwork licenses from plugins
 | ValleyAudio/din1451alt.ttf              | CC-BY-3.0-DE     | |
 | ValleyAudio/DSEG14Classic-*.ttf         | OFL-1.1-RFN      | |
 | ValleyAudio/ShareTechMono-*.ttf         | OFL-1.1-RFN      | |
+| Venom/*                                 | GPL-3.0-or-later | No artwork specific license provided |
 | voxglitch/*                             | GPL-3.0-or-later | No artwork specific license provided |
 | voxglitch/ShareTechMono-Regular.ttf     | OFL-1.1-RFN      | |
 | WhatTheRack/*                           | WTFPL            | |

deps/PawPaw

@@ -23,6 +23,17 @@ If all went well opening the "Engine" menu again should show a checkmark, indica
 For the moment there is no error dialog or information in case things go wrong.  
 If you are unable to connect, make sure your OS network firewall settings allows opening port 2228.
 
+### Automatic startup on headless builds
+
+If you do a headless build there is no UI to click on to enable remote control, so for this reason the headless builds (standalone, not plugins) will have OSC remote control enabled by default.
+
+To change the port for the OSC server use the `CARDINAL_REMOTE_HOST_PORT` environment variable, for example:
+```sh
+env CARDINAL_REMOTE_HOST_PORT=2228 CardinalNative
+```
+
+This can be useful for starting Cardinal where no mouse/keyboard are attached but you want remote control.
+
 ## TouchOSC example setup
 
 A TouchOSC compatible file is available [here](https://github.com/DISTRHO/Cardinal/raw/main/patches/touchosc/24-direct-fader-params.tosc).