Update carla and dpf, fixup CI

Signed-off-by: falkTX <falktx@falktx.com>
DISTRHO · Nov 10, 2024 · 3b03363 · 3b03363
1 parent 0b01d08
commit 3b03363
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git 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
diff --git a/deps/PawPaw b/deps/PawPaw
diff --git a/dpf b/dpf
diff --git 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
+6 −0		data/docker/.dockerignore
+46 −0		data/docker/Dockerfile
+25 −0		data/docker/build.sh
+4 −8		source/Makefile.deps.mk
+6 −4		source/Makefile.mk
+62 −11		source/backend/plugin/CarlaPluginAU.cpp
+67 −14		source/discovery/carla-discovery.cpp
+13 −8		source/frontend/Makefile
+3 −1		source/frontend/carla_host.py
+15 −16		source/frontend/carla_shared.py
+83 −45		source/frontend/pluginlist/pluginlistdialog.cpp
+34 −2		source/frontend/pluginlist/pluginrefreshdialog.hpp
+149 −3		source/frontend/pluginlist/pluginrefreshdialog.ui
+0 −2		source/frontend/qt_compat.py
+11 −0		source/includes/dssi/seq_event-compat.h
+7 −2		source/includes/vestige/vestige.h
+6 −0		source/modules/distrho/DistrhoUtils.hpp
+3 −2		source/utils/CarlaStateUtils.cpp
+89 −36		.github/workflows/bootstrap.yml
+2 −0		bootstrap-common.sh
+21 −9		bootstrap-plugins.sh
+14 −4		setup/functions.sh
+3 −3		distrho/extra/ValueSmoother.hpp
+51 −38		distrho/src/xaymar-vst2/vst.h