Skip to content

Commit e52a431

Browse files
authored
Merge branch 'DISTRHO:main' into update-voxglitch
2 parents 917d0a0 + 47e2db1 commit e52a431

29 files changed

Lines changed: 252 additions & 113 deletions

.github/ISSUE_TEMPLATE/bug.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ body:
55
id: version
66
attributes:
77
label: Version
8-
value: "24.12"
8+
value: "25.06"
99
validations:
1010
required: true
1111
- type: dropdown

.github/workflows/build.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ name: build
33
on: [push, pull_request]
44

55
env:
6-
CACHE_VERSION: 11
6+
CACHE_VERSION: 12
77
CARDINAL_UNDER_WINE: 1
88
CIBUILD: true
99
DEBIAN_FRONTEND: noninteractive
1010
LIBGL_ALWAYS_SOFTWARE: true
11+
PAWPAW_CI: 1
1112
PAWPAW_FAST_MATH: 1
1213
PAWPAW_SKIP_GLIB: 1
1314
PAWPAW_SKIP_LTO: 1
@@ -23,7 +24,7 @@ jobs:
2324
target: [aarch64, armhf, i686, riscv64, x86_64]
2425
runs-on: ubuntu-latest
2526
container:
26-
image: ubuntu:20.04
27+
image: ubuntu:22.04
2728
steps:
2829
- name: Install git
2930
run: |
@@ -125,7 +126,7 @@ jobs:
125126
*.tar.gz
126127
127128
linux-x86_64-debug:
128-
runs-on: ubuntu-20.04
129+
runs-on: ubuntu-22.04
129130
steps:
130131
- uses: actions/checkout@v4
131132
with:
@@ -228,18 +229,20 @@ jobs:
228229
files: |
229230
${{ github.event.repository.name }}-*.pkg
230231
231-
modaudio:
232+
mod-plugin-builder:
232233
strategy:
233234
matrix:
234235
include:
236+
- name: darkglass-anagram
237+
target: darkglass-anagram
235238
- name: modduo
236239
target: modduo-static
237240
extraflags: MODDUO=true
238241
- name: modduox
239242
target: modduox-static
240243
- name: moddwarf
241244
target: moddwarf
242-
runs-on: ubuntu-20.04
245+
runs-on: ubuntu-22.04
243246
steps:
244247
- uses: actions/checkout@v4
245248
with:
@@ -254,7 +257,7 @@ jobs:
254257
- name: Set up dependencies
255258
run: |
256259
sudo apt-get update -qq
257-
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
260+
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
258261
sudo apt-get install -yqq pandoc texlive-latex-recommended texlive-latex-extra
259262
sudo apt-get clean
260263
- name: Bootstrap toolchain
@@ -471,7 +474,7 @@ jobs:
471474
Cardinal-*.zip
472475
473476
headless:
474-
runs-on: ubuntu-20.04
477+
runs-on: ubuntu-22.04
475478
steps:
476479
- uses: actions/checkout@v4
477480
with:
@@ -488,7 +491,7 @@ jobs:
488491
make HEADLESS=true -j $(nproc)
489492
490493
lto:
491-
runs-on: ubuntu-20.04
494+
runs-on: ubuntu-22.04
492495
steps:
493496
- uses: actions/checkout@v4
494497
with:
@@ -505,7 +508,7 @@ jobs:
505508
make WITH_LTO=true -j $(nproc) native
506509
507510
sysdeps:
508-
runs-on: ubuntu-20.04
511+
runs-on: ubuntu-22.04
509512
steps:
510513
- uses: actions/checkout@v4
511514
with:
@@ -521,7 +524,7 @@ jobs:
521524
make SYSDEPS=true -j $(nproc)
522525
523526
source-tarball:
524-
runs-on: ubuntu-20.04
527+
runs-on: ubuntu-22.04
525528
steps:
526529
- uses: actions/checkout@v4
527530
with:
@@ -561,7 +564,7 @@ jobs:
561564
/home/runner/*/*/cardinal*.tar.xz
562565
563566
plugin-validation:
564-
runs-on: ubuntu-20.04
567+
runs-on: ubuntu-22.04
565568
steps:
566569
- uses: actions/checkout@v4
567570
with:

.gitmodules

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@
4949
[submodule "plugins/ValleyAudio"]
5050
path = plugins/ValleyAudio
5151
url = https://github.com/ValleyAudio/ValleyRackFree.git
52-
[submodule "plugins/DrumKit"]
53-
path = plugins/DrumKit
54-
url = https://github.com/SVModular/DrumKit.git
52+
[submodule "plugins/WSTD-Drums"]
53+
path = plugins/WSTD-Drums
54+
url = https://github.com/Wasted-Audio/WSTD-Drums.git
5555
[submodule "carla"]
5656
path = carla
5757
url = https://github.com/falkTX/Carla.git
@@ -260,4 +260,6 @@
260260
[submodule "plugins/admiral"]
261261
path = plugins/admiral
262262
url = https://github.com/wapiflapi/admiral.git
263-
263+
[submodule "plugins/eightfold"]
264+
path = plugins/eightfold
265+
url = https://github.com/scanner-darkly/eightfold.git

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ include $(ROOT)/Makefile.base.mk
1515
# src/CardinalPlugin.cpp `getVersion`
1616
# utils/macOS/Info_{JACK,Native}.plist
1717
# .github/ISSUE_TEMPLATE/bug.yaml src/CardinalCommon.cpp src/CardinalPlugin.cpp utils/macOS/Info_{JACK,Native}.plist
18-
VERSION = 24.12
18+
VERSION = 25.06
1919

2020
# --------------------------------------------------------------
2121
# Build targets

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ At the moment the following 3rd-party modules are provided:
145145
- [CVfunk](https://github.com/codygeary/CVfunk-Modules)
146146
- [dBiz](https://github.com/dBiz/dBiz)
147147
- [DHE Modules](https://github.com/dhemery/DHE-Modules)
148-
- [DrumKit](https://svmodular.com/plugin/vcv/drumkit.html)
148+
- [eightfold](https://github.com/scanner-darkly/eightfold)
149149
- [EnigmaCurry](https://github.com/EnigmaCurry/EnigmaCurry-vcv-pack)
150150
- [E-Series](https://github.com/VCVRack/ESeries)
151151
- [ExpertSleepers Encoders](https://expert-sleepers.co.uk/vcvrack_encoders.html)
@@ -198,6 +198,7 @@ At the moment the following 3rd-party modules are provided:
198198
- [Valley](https://github.com/ValleyAudio/ValleyRackFree)
199199
- [Voxglitch](https://github.com/clone45/voxglitch)
200200
- [WhatTheRack](https://github.com/korfuri/WhatTheRack)
201+
- [WSTD-Drums](https://github.com/Wasted-Audio/WSTD-Drums)
201202
- [ZetaCarinae](https://github.com/mhampton/ZetaCarinaeModules)
202203
- [ZZC](https://github.com/zezic/ZZC)
203204

carla

Submodule carla updated 130 files

deps/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ SPACE +=
5757
CMAKE = cmake
5858
CMAKE += -DCMAKE_INSTALL_LIBDIR=lib
5959
CMAKE += -DCMAKE_INSTALL_PREFIX='$(RACK_DEP_PATH)'
60+
CMAKE += -DCMAKE_POLICY_VERSION_MINIMUM=3.5
6061
CMAKE += -DBUILD_SHARED_LIBS=OFF
6162

6263
# make sure debug/release matches

docs/LICENSES.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ Below follows a list of all code licenses used in Cardinal and linked submodules
3939
| CVfunk | MIT | |
4040
| dBiz | GPL-3.0-or-later | |
4141
| DHE-Modules | MIT | |
42-
| DrumKit | CC0-1.0 | |
42+
| eightfold | GPL-3.0-or-later | |
4343
| EnigmaCurry | GPL-3.0-or-later | |
4444
| E-Series | GPL-3.0-or-later | |
4545
| ExpertSleepers Encoders | MIT | |
@@ -91,6 +91,7 @@ Below follows a list of all code licenses used in Cardinal and linked submodules
9191
| unless_modules | GPL-3.0-or-later | |
9292
| Valley | GPL-3.0-or-later | |
9393
| Voxglitch | GPL-3.0-or-later | |
94+
| WSTD-Drums | CC0-1.0 | |
9495
| WhatTheRack | WTFPL | |
9596
| ZetaCarinae | GPL-3.0-or-later | |
9697
| ZZC | GPL-3.0-or-later | |
@@ -178,6 +179,7 @@ Below is a list of artwork licenses from plugins
178179
| DHE-Modules/* | MIT | Same license as source code |
179180
| DrumKit/* | CC0-1.0 | |
180181
| DrumKit/component/NovaMono.ttf | OFL-1.1-RFN | |
182+
| eightfold/* | GPL-3.0-or-later | No artwork specific license provided |
181183
| EnigmaCurry/res/fonts/dseg/* | OFL-1.1-RFN | |
182184
| EnigmaCurry/res/fonts/Fantasque/* | OFL-1.1 | |
183185
| EnigmaCurry/res/fonts/manrope/* | OFL-1.1 | |
@@ -201,6 +203,7 @@ Below is a list of artwork licenses from plugins
201203
| ImpromptuModular/res/comp/complib/* | CC-BY-NC-4.0 | |
202204
| JW-Modules/* | BSD-3-Clause | No artwork specific license provided |
203205
| JW-Modules/DejaVuSansMono.ttf | Bitstream-Vera | Unused in Cardinal |
206+
| JW-Modules/res/fonts/ShareTechMono-Regular.ttf | OFL-1.1 | |
204207
| kocmoc/* | GPL-3.0-or-later | No artwork specific license provided |
205208
| LifeFormModular/* | MIT | No artwork specific license provided |
206209
| LilacLoop/* | GPL-3.0-or-later | No artwork specific license provided |

dpf

Submodule dpf updated 52 files

0 commit comments

Comments
 (0)