brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'DISTRHO:main' into CVfunk

Browse source
This commit is contained in:
CV funk 2024-03-25 13:20:17 +01:00 • committed by GitHub
commit 3ad91912c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View file

@ -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
@ -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

9
Makefile
View file

@ -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
@ -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
# --------------------------------------------------------------
@ -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

2
deps/PawPaw vendored

@ -1 +1 @@
Subproject commit 777177562ef39836b9e0963e7910d55e3d2d0636
Subproject commit b84d0ec2d1bb5c7d7fd05d4a8d7f4af71306c425

2
dpf

@ -1 +1 @@
Subproject commit 0ceb411fde5192ad4aaa1c89b079a861e4dac5df
Subproject commit 045b943199393053c606b530fc882661502d53d7

2
src/CardinalCommon.cpp
View file

@ -99,7 +99,7 @@ void destroyStaticPlugins();
}
}
const std::string CARDINAL_VERSION = "24.01";
const std::string CARDINAL_VERSION = "24.03";
START_NAMESPACE_DISTRHO

2
src/CardinalPlugin.cpp
View file

@ -406,7 +406,7 @@ protected:
uint32_t getVersion() const override
{
return d_version(0, 24, 1);
return d_version(0, 24, 3);
}
int64_t getUniqueId() const override

4
utils/macOS/Info_JACK.plist
View file

@ -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/>

4
utils/macOS/Info_Native.plist
View file

@ -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/>