Merge branch 'DISTRHO:main' into feature/add-starling-via

Wasted-Audio · Mar 14, 2024 · 899b330 · 899b330
2 parents 085615b + d99b2e7
commit 899b330
Show file tree

Hide file tree

Showing 16 changed files with 28 additions and 48 deletions.
diff --git 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
diff --git 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
diff --git a/dpf b/dpf
diff --git a/include/settings.hpp b/include/settings.hpp
@@ -1,18 +1,7 @@
 /*
  * DISTRHO Cardinal Plugin
- * Copyright (C) 2021-2023 Filipe Coelho <[email protected]>
- *
- * 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 <[email protected]>
+ * 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
diff --git a/plugins/GlueTheGiant b/plugins/GlueTheGiant
diff --git a/plugins/Prism b/plugins/Prism
diff --git a/plugins/RebelTech b/plugins/RebelTech
diff --git a/plugins/Sapphire b/plugins/Sapphire
diff --git 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
diff --git a/plugins/surgext b/plugins/surgext
diff --git a/src/CardinalCommon.hpp b/src/CardinalCommon.hpp
@@ -1,18 +1,7 @@
 /*
  * DISTRHO Cardinal Plugin
- * Copyright (C) 2021-2023 Filipe Coelho <[email protected]>
- *
- * 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 <[email protected]>
+ * 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 <lo/lo_types.h>
+#endif
 
 START_NAMESPACE_DISTRHO
 

diff --git 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();