diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a9145d0..42f9feea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,11 +3,12 @@ name: build on: [push, pull_request] env: - CACHE_VERSION: 7 + CACHE_VERSION: 9 CARDINAL_UNDER_WINE: 1 CIBUILD: true DEBIAN_FRONTEND: noninteractive LIBGL_ALWAYS_SOFTWARE: true + PAWPAW_FAST_MATH: 1 PAWPAW_SKIP_GLIB: 1 PAWPAW_SKIP_LTO: 1 PAWPAW_SKIP_LV2: 1 @@ -600,7 +601,7 @@ jobs: LDFLAGS: -static-libgcc -static-libstdc++ run: | make features - make NOOPT=true SKIP_STRIPPING=true carla deps dgl plugins resources -j $(nproc) + make CIBUILD=false NOOPT=true SKIP_STRIPPING=true carla deps dgl plugins resources -j $(nproc) # single job for final build stage, otherwise we might get killed due to OOM - name: Build Cardinal (final build stage) env: @@ -609,8 +610,8 @@ jobs: LDFLAGS: -static-libgcc -static-libstdc++ run: | make features - make NOOPT=true SKIP_STRIPPING=true -j 1 -C src jack - make NOOPT=true -j 1 + make CIBUILD=false NOOPT=true SKIP_STRIPPING=true -j 1 -C src jack + make CIBUILD=false NOOPT=true -j 1 ./dpf/utils/generate-ttl.sh - name: Run Cardinal self-tests run: | diff --git a/carla b/carla index fe8631bc..66afe24a 160000 --- a/carla +++ b/carla @@ -1 +1 @@ -Subproject commit fe8631bc13a507507ccc6b5c408d5a4a880b1936 +Subproject commit 66afe24a08790732cc17d81d4b846a1e0cfa0118 diff --git a/deps/Makefile b/deps/Makefile index 5e706518..a5bd9411 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -286,12 +286,13 @@ SURGE_ENV = env \ SURGE_LIB = $(SURGE_DEP_PATH)/src/common/libsurge-common.a $(SURGE_LIB): $(SURGE_DEP_PATH)/Makefile - $(DEP_MAKE) -C $(SURGE_DEP_PATH) surge-common + +$(DEP_MAKE) -C $(SURGE_DEP_PATH) surge-common $(SURGE_DEP_PATH)/Makefile: $(SURGE_SRC_PATH)/CMakeLists.txt mkdir -p $(SURGE_DEP_PATH) cd $(SURGE_DEP_PATH) && \ $(SURGE_ENV) $(CMAKE) \ + -DSURGE_BUILD_32BIT_LINUX=TRUE \ -DSURGE_COMPILE_BLOCK_SIZE=8 \ -DSURGE_SKIP_AIRWINDOWS=TRUE \ -DSURGE_SKIP_JUCE_FOR_RACK=TRUE \ diff --git a/deps/PawPaw b/deps/PawPaw index cfa9dc50..77717756 160000 --- a/deps/PawPaw +++ b/deps/PawPaw @@ -1 +1 @@ -Subproject commit cfa9dc50b32ebdb567d2d86467d3dc58157252c7 +Subproject commit 777177562ef39836b9e0963e7910d55e3d2d0636 diff --git a/dpf b/dpf index fb0e7bff..0ceb411f 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit fb0e7bff261b3a28dd1ce3f3604e30afb7c1dcb8 +Subproject commit 0ceb411fde5192ad4aaa1c89b079a861e4dac5df diff --git a/include/settings.hpp b/include/settings.hpp index 13b40e13..317c4989 100644 --- a/include/settings.hpp +++ b/include/settings.hpp @@ -1,18 +1,7 @@ /* * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2023 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * For a full copy of the GNU General Public License see the LICENSE file. + * Copyright (C) 2021-2024 Filipe Coelho + * SPDX-License-Identifier: GPL-3.0-or-later */ #pragma once @@ -24,8 +13,5 @@ namespace settings { extern int rateLimit; -// TODO remove after updating all plugins -extern bool darkMode; - } // namespace settings } // namespace rack diff --git a/plugins/AnimatedCircuits b/plugins/AnimatedCircuits index bf78cd8e..65f1f203 160000 --- a/plugins/AnimatedCircuits +++ b/plugins/AnimatedCircuits @@ -1 +1 @@ -Subproject commit bf78cd8ed22970fe9dc5ebff8e3907898904c747 +Subproject commit 65f1f203884f13a5eb8cccfae81c751de68d437f diff --git a/plugins/GlueTheGiant b/plugins/GlueTheGiant index 7e20713e..d40d707f 160000 --- a/plugins/GlueTheGiant +++ b/plugins/GlueTheGiant @@ -1 +1 @@ -Subproject commit 7e20713eacc51179cd7faf0f4428def2b82273a9 +Subproject commit d40d707fc76fbbdada64ce4d4a64b4f2fbd7e865 diff --git a/plugins/Prism b/plugins/Prism index 8d2796da..16a80544 160000 --- a/plugins/Prism +++ b/plugins/Prism @@ -1 +1 @@ -Subproject commit 8d2796da76e5d7f79bbf461c95a7858035bb0736 +Subproject commit 16a80544d0389db9c1225c4ed1e29e5f47306a01 diff --git a/plugins/RebelTech b/plugins/RebelTech index 2d06199d..6f610187 160000 --- a/plugins/RebelTech +++ b/plugins/RebelTech @@ -1 +1 @@ -Subproject commit 2d06199dd36ecdfe33d640ed1602f1041930f013 +Subproject commit 6f610187ffb2a9707035a63706effe00335fe7f6 diff --git a/plugins/Sapphire b/plugins/Sapphire index 9d9d3ae7..4bf2ad39 160000 --- a/plugins/Sapphire +++ b/plugins/Sapphire @@ -1 +1 @@ -Subproject commit 9d9d3ae703259b55a2734e03a9421874ebd35cf9 +Subproject commit 4bf2ad39eeaddcbfcc5cd345aef8c0c4cc722b73 diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 6c345e0d..031a8783 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -2907,8 +2907,12 @@ static void initStatic__Sapphire() p->addModel(modelElastika); p->addModel(modelFrolic); p->addModel(modelGlee); + p->addModel(modelHiss); p->addModel(modelMoots); + p->addModel(modelNucleus); + p->addModel(modelPolynucleus); p->addModel(modelTin); + p->addModel(modelTout); p->addModel(modelTricorder); p->addModel(modelTubeUnit); } diff --git a/plugins/stoermelder-packone b/plugins/stoermelder-packone index ec3c0972..851efdf4 160000 --- a/plugins/stoermelder-packone +++ b/plugins/stoermelder-packone @@ -1 +1 @@ -Subproject commit ec3c0972440edddfb00d5e5ad189f345c68be471 +Subproject commit 851efdf426b36a77c5099a8286a6e58f46b9d20c diff --git a/plugins/surgext b/plugins/surgext index 183a5059..cbebb2b5 160000 --- a/plugins/surgext +++ b/plugins/surgext @@ -1 +1 @@ -Subproject commit 183a50590aa587ec4e4a6a35f857f63a25ab86ff +Subproject commit cbebb2b5d5d6b5dc865660fb3ef54d2c35bfa0f1 diff --git a/src/CardinalCommon.hpp b/src/CardinalCommon.hpp index 756f02dd..653b506d 100644 --- a/src/CardinalCommon.hpp +++ b/src/CardinalCommon.hpp @@ -1,18 +1,7 @@ /* * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2023 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * For a full copy of the GNU General Public License see the LICENSE file. + * Copyright (C) 2021-2024 Filipe Coelho + * SPDX-License-Identifier: GPL-3.0-or-later */ #pragma once @@ -87,8 +76,9 @@ void openBrowser(const std::string& url); # define CARDINAL_INIT_OSC_THREAD #endif -typedef void* lo_server; -typedef void* lo_server_thread; +#ifdef HAVE_LIBLO +# include +#endif START_NAMESPACE_DISTRHO diff --git a/src/custom/dep.cpp b/src/custom/dep.cpp index 398086e2..abbb0d99 100644 --- a/src/custom/dep.cpp +++ b/src/custom/dep.cpp @@ -19,7 +19,6 @@ namespace settings { int rateLimit = 0; extern bool preferDarkPanels; extern std::string uiTheme; -bool darkMode; // TODO remove after updating all plugins } namespace ui { void refreshTheme(); @@ -1451,7 +1450,6 @@ namespace rack { void switchDarkMode(const bool darkMode) { #ifndef HEADLESS - settings::darkMode = darkMode; // TODO remove after updating all plugins settings::preferDarkPanels = darkMode; settings::uiTheme = darkMode ? "dark" : "light"; ui::refreshTheme();