From 94ba48623a4fbf5bf77762c5f3ef0232098b84bd Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sat, 16 Apr 2022 13:37:01 +0100
Subject: [PATCH] Fix build, improve caching

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/build.yml | 65 ++++++++++++++++++++++++++++++++++++-
 plugins/Makefile            |  3 ++
 2 files changed, 67 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fb65556..929ca40 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -4,7 +4,7 @@ on:
   push:
 
 env:
-  CACHE_VERSION: 13
+  CACHE_VERSION: 14
   DEBIAN_FRONTEND: noninteractive
   HOMEBREW_NO_AUTO_UPDATE: 1
   LIBGL_ALWAYS_SOFTWARE: 'true'
@@ -25,6 +25,15 @@ jobs:
             build
             carla/build
             dpf/build
+            src/Rack/dep/bin
+            src/Rack/dep/include
+            src/Rack/dep/lib
+            src/Rack/dep/share
+            src/Rack/dep/jansson-2.12
+            src/Rack/dep/libarchive-3.4.3
+            src/Rack/dep/libsamplerate-0.1.9
+            src/Rack/dep/speexdsp-SpeexDSP-1.2rc3
+            src/Rack/dep/zstd-1.4.5
           key: linux-arm64-v${{ env.CACHE_VERSION }}
       - name: Fix GitHub's mess
         run: |
@@ -104,6 +113,15 @@ jobs:
             build
             carla/build
             dpf/build
+            src/Rack/dep/bin
+            src/Rack/dep/include
+            src/Rack/dep/lib
+            src/Rack/dep/share
+            src/Rack/dep/jansson-2.12
+            src/Rack/dep/libarchive-3.4.3
+            src/Rack/dep/libsamplerate-0.1.9
+            src/Rack/dep/speexdsp-SpeexDSP-1.2rc3
+            src/Rack/dep/zstd-1.4.5
           key: linux-armhf-v${{ env.CACHE_VERSION }}
       - name: Fix GitHub's mess
         run: |
@@ -183,6 +201,15 @@ jobs:
             build
             carla/build
             dpf/build
+            src/Rack/dep/bin
+            src/Rack/dep/include
+            src/Rack/dep/lib
+            src/Rack/dep/share
+            src/Rack/dep/jansson-2.12
+            src/Rack/dep/libarchive-3.4.3
+            src/Rack/dep/libsamplerate-0.1.9
+            src/Rack/dep/speexdsp-SpeexDSP-1.2rc3
+            src/Rack/dep/zstd-1.4.5
           key: linux-i686-v${{ env.CACHE_VERSION }}
       - name: Fix GitHub's mess
         run: |
@@ -258,6 +285,15 @@ jobs:
             build
             carla/build
             dpf/build
+            src/Rack/dep/bin
+            src/Rack/dep/include
+            src/Rack/dep/lib
+            src/Rack/dep/share
+            src/Rack/dep/jansson-2.12
+            src/Rack/dep/libarchive-3.4.3
+            src/Rack/dep/libsamplerate-0.1.9
+            src/Rack/dep/speexdsp-SpeexDSP-1.2rc3
+            src/Rack/dep/zstd-1.4.5
           key: linux-x86_64-v${{ env.CACHE_VERSION }}
       - name: Set up dependencies
         run: |
@@ -385,6 +421,15 @@ jobs:
             carla/build
             dpf/build
             jucewrapper/build
+            src/Rack/dep/bin
+            src/Rack/dep/include
+            src/Rack/dep/lib
+            src/Rack/dep/share
+            src/Rack/dep/jansson-2.12
+            src/Rack/dep/libarchive-3.4.3
+            src/Rack/dep/libsamplerate-0.1.9
+            src/Rack/dep/speexdsp-SpeexDSP-1.2rc3
+            src/Rack/dep/zstd-1.4.5
           key: macos-universal-v${{ env.CACHE_VERSION }}
       - name: Fix up Xcode
         run: |
@@ -579,6 +624,15 @@ jobs:
             build
             carla/build
             dpf/build
+            src/Rack/dep/bin
+            src/Rack/dep/include
+            src/Rack/dep/lib
+            src/Rack/dep/share
+            src/Rack/dep/jansson-2.12
+            src/Rack/dep/libarchive-3.4.3
+            src/Rack/dep/libsamplerate-0.1.9
+            src/Rack/dep/speexdsp-SpeexDSP-1.2rc3
+            src/Rack/dep/zstd-1.4.5
           key: win32-v${{ env.CACHE_VERSION }}
       - name: Fix GitHub's mess
         run: |
@@ -663,6 +717,15 @@ jobs:
             build
             carla/build
             dpf/build
+            src/Rack/dep/bin
+            src/Rack/dep/include
+            src/Rack/dep/lib
+            src/Rack/dep/share
+            src/Rack/dep/jansson-2.12
+            src/Rack/dep/libarchive-3.4.3
+            src/Rack/dep/libsamplerate-0.1.9
+            src/Rack/dep/speexdsp-SpeexDSP-1.2rc3
+            src/Rack/dep/zstd-1.4.5
           key: win64-v${{ env.CACHE_VERSION }}
       - name: Fix GitHub's mess
         run: |
diff --git a/plugins/Makefile b/plugins/Makefile
index fe4e185..31bc3c6 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -768,6 +768,9 @@ PLUGIN_FILES += $(filter-out stocaudio/src/plugin.cpp,$(wildcard stocaudio/src/*
 
 PLUGIN_FILES += $(filter-out unless_modules/src/unless.cpp,$(wildcard unless_modules/src/*.cpp))
 
+# modules/types which are present in other plugins
+UNLESS_MODULES_CUSTOM = Selection
+
 # --------------------------------------------------------------
 # ValleyAudio