From 07e71d7c7ba320c9b772c356c2b3943f92b2ea3e Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sun, 13 Mar 2022 17:36:49 +0000
Subject: [PATCH] Tweak full Carla build to match our custom one

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/build.yml      | 16 +++++++---------
 carla                            |  2 +-
 deps/PawPaw                      |  2 +-
 plugins/Cardinal/src/Ildaeil.cpp |  6 ++++++
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b2a3611..df3683d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on:
   push:
 
 env:
-  CACHE_VERSION: 9
+  CACHE_VERSION: 10
   DEBIAN_FRONTEND: noninteractive
   HOMEBREW_NO_AUTO_UPDATE: 1
   LIBGL_ALWAYS_SOFTWARE: 'true'
@@ -532,10 +532,9 @@ jobs:
         run: |
           pushd deps/PawPaw; source local.env win32; popd
           make distclean -C carla
-          make -C carla EXTERNAL_PLUGINS=true HAVE_DGL=false HAVE_FLUIDSYNTH=false HAVE_HYLIA=false HAVE_JACK=false HAVE_LIBLO=false HAVE_ZYN_DEPS=false HAVE_ZYN_UI_DEPS=false USING_JUCE=false USING_JUCE_AUDIO_DEVICES=false USING_JUCE_GUI_EXTRA=false USING_RTAUDIO=false -j $(nproc)
-          make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist
-          make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist
-          make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist
+          make -C carla CARLA_BACKEND_NAMESPACE=Cardinal EXTERNAL_PLUGINS=true HAVE_FLUIDSYNTH=false HAVE_ZYN_DEPS=false HAVE_ZYN_UI_DEPS=false HAVE_PYQT=true HAVE_QT5=true HAVE_QT5PKG=true STATIC_PLUGIN_TARGET=true USING_JUCE=false USING_JUCE_GUI_EXTRA=false -j $(nproc)
+          make -C carla EMBED_TARGET=true TESTING=true dist
+          make -C carla EMBED_TARGET=true TESTING=true dist
       - name: Build win64 cross-compiled (packaging)
         run: |
           pushd deps/PawPaw; source local.env win32; popd
@@ -605,10 +604,9 @@ jobs:
         run: |
           pushd deps/PawPaw; source local.env win64; popd
           make distclean -C carla
-          make -C carla EXTERNAL_PLUGINS=true HAVE_DGL=false HAVE_FLUIDSYNTH=false HAVE_HYLIA=false HAVE_JACK=false HAVE_LIBLO=false HAVE_ZYN_DEPS=false HAVE_ZYN_UI_DEPS=false USING_JUCE=false USING_JUCE_AUDIO_DEVICES=false USING_JUCE_GUI_EXTRA=false USING_RTAUDIO=false all win32r -j $(nproc)
-          make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist
-          make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist
-          make -C carla TESTING=true _CARLA_LV2_PLUGIN_FILES= _CARLA_VST2_PLUGIN_FILES= dist
+          make -C carla CARLA_BACKEND_NAMESPACE=Cardinal EXTERNAL_PLUGINS=true HAVE_FLUIDSYNTH=false HAVE_ZYN_DEPS=false HAVE_ZYN_UI_DEPS=false HAVE_PYQT=true HAVE_QT5=true HAVE_QT5PKG=true STATIC_PLUGIN_TARGET=true USING_JUCE=false USING_JUCE_GUI_EXTRA=false all win32r -j $(nproc)
+          make -C carla EMBED_TARGET=true TESTING=true dist
+          make -C carla EMBED_TARGET=true TESTING=true dist
       - name: Build win64 cross-compiled (packaging)
         run: |
           pushd deps/PawPaw; source local.env win64; popd
diff --git a/carla b/carla
index c06a4e6..0bd8447 160000
--- a/carla
+++ b/carla
@@ -1 +1 @@
-Subproject commit c06a4e626ad897900895560999f05acb39740a85
+Subproject commit 0bd8447005778e6957c7f7a25155cc5a8e163d15
diff --git a/deps/PawPaw b/deps/PawPaw
index 55bbe06..4923f40 160000
--- a/deps/PawPaw
+++ b/deps/PawPaw
@@ -1 +1 @@
-Subproject commit 55bbe0622b4a25dd30a849b9231bddcef8bcb53e
+Subproject commit 4923f40778f8fbf2d8a8cbb3bc8e527210d2cabd
diff --git a/plugins/Cardinal/src/Ildaeil.cpp b/plugins/Cardinal/src/Ildaeil.cpp
index 3417242..f22a7e1 100644
--- a/plugins/Cardinal/src/Ildaeil.cpp
+++ b/plugins/Cardinal/src/Ildaeil.cpp
@@ -97,12 +97,14 @@ static void projectLoadedFromDSP(void* ui);
 
 static Mutex sPluginInfoLoadMutex;
 
+/*
 #ifndef HEADLESS
 struct JuceInitializer {
     JuceInitializer() { carla_juce_init(); }
     ~JuceInitializer() { carla_juce_cleanup(); }
 };
 #endif
+*/
 
 struct IldaeilModule : Module {
     enum ParamIds {
@@ -122,9 +124,11 @@ struct IldaeilModule : Module {
         NUM_LIGHTS
     };
 
+    /*
 #ifndef HEADLESS
     SharedResourcePointer<JuceInitializer> juceInitializer;
 #endif
+    */
 
     const CardinalPluginContext* const pcontext;
 
@@ -977,7 +981,9 @@ struct IldaeilWidget : ImGuiWidget, IdleCallback, Thread {
         const CarlaHostHandle handle = module->fCarlaHostHandle;
         DISTRHO_SAFE_ASSERT_RETURN(handle != nullptr,);
 
+        /*
         carla_juce_idle();
+        */
 
         if (fileBrowserHandle != nullptr && fileBrowserIdle(fileBrowserHandle))
         {