From 3b033633743df7cbda04e7bd66ef417c2ab3081b Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sun, 10 Nov 2024 10:50:40 +0100
Subject: [PATCH] Update carla and dpf, fixup CI

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/build.yml | 7 ++++---
 carla                       | 2 +-
 deps/PawPaw                 | 2 +-
 dpf                         | 2 +-
 src/Makefile.cardinal.mk    | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d94a3ae..9c395db 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: build
 on: [push, pull_request]
 
 env:
-  CACHE_VERSION: 10
+  CACHE_VERSION: 11
   CARDINAL_UNDER_WINE: 1
   CIBUILD: true
   DEBIAN_FRONTEND: noninteractive
@@ -143,7 +143,7 @@ jobs:
           # multiple jobs for building carla, deps and plugins
           make DEBUG=true carla deps dgl plugins resources -j $(nproc)
           # single job for final build stage, otherwise we might get killed due to OOM
-          make DEBUG=true HAVE_PULSEAUDIO=false clap lv2 vst2 vst3 -j 1
+          make DEBUG=true HAVE_PULSEAUDIO=false jack -j 1
       - name: Set sha8
         id: slug
         run: echo "SHA8=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_ENV
@@ -171,6 +171,7 @@ jobs:
         run: |
           if [ "${{ matrix.debug }}" -eq 1 ]; then
             echo "TARGET_SUFFIX=-debug" >> $GITHUB_ENV
+            echo "MAKE_ARGS='DEBUG=true jack au'" >> $GITHUB_ENV
             echo "PAWPAW_DEBUG=1" >> $GITHUB_ENV
           fi
       - name: Set up cache
@@ -207,7 +208,7 @@ jobs:
           export PATH="/usr/local/opt/ccache/libexec:${PATH}"
           source deps/PawPaw/local.env macos-${{ matrix.target }}
           make features
-          make NOOPT=true -j $(sysctl -n hw.logicalcpu)
+          make NOOPT=true ${MAKE_ARGS} -j $(sysctl -n hw.logicalcpu)
       - name: Build macOS (packaging)
         if: steps.cache.outputs.cache-hit == 'true'
         shell: bash
diff --git a/carla b/carla
index e39f04d..be2f105 160000
--- a/carla
+++ b/carla
@@ -1 +1 @@
-Subproject commit e39f04d2d8587327e741ad881617c427f5014d48
+Subproject commit be2f1056ab48c0ec6a3877a19597cb36a44f1e30
diff --git a/deps/PawPaw b/deps/PawPaw
index e0a81ba..42210d5 160000
--- a/deps/PawPaw
+++ b/deps/PawPaw
@@ -1 +1 @@
-Subproject commit e0a81ba6f24b194c7aa0c6828d422f1354256a09
+Subproject commit 42210d5b21d7c1022b014b84589bca04abe3a245
diff --git a/dpf b/dpf
index 6b04262..c776dab 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 6b042628933f220a05571bde6a02fe0198a96b5d
+Subproject commit c776dab9ebae0f067be2a52012fa205de7ae7b7d
diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index 56b3dd9..0cc66af 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -186,7 +186,7 @@ endif
 endif
 
 ifeq ($(MACOS),true)
-EXTRA_DSP_LIBS += -framework Accelerate -framework AppKit
+EXTRA_DSP_LIBS += -framework Accelerate -framework AppKit -framework AudioToolbox
 else ifeq ($(WINDOWS),true)
 EXTRA_DSP_LIBS += -lole32 -lshlwapi -luuid -lversion
 endif