From a1e0af2fdaf539f724367b9cd3aed72f6cde48b5 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sun, 9 Jan 2022 05:46:41 +0000
Subject: [PATCH] Update dpf and carla, CI tweaks

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/build.yml | 32 ++++++++++++++++++++++++++++----
 carla                       |  2 +-
 dpf                         |  2 +-
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cc3c5e3..3643b73 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,6 +28,11 @@ jobs:
             ~/work/Cardinal/Cardinal/build/plugins
             ~/work/Cardinal/Cardinal/build/rack
           key: linux-arm64-v${{ env.CACHE_VERSION }}
+      - name: Fix GitHub's mess
+        run: |
+          sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update -qq
+          sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
       - name: Set up dependencies
         run: |
           sudo dpkg --add-architecture arm64
@@ -74,6 +79,11 @@ jobs:
             ~/work/Cardinal/Cardinal/build/plugins
             ~/work/Cardinal/Cardinal/build/rack
           key: linux-armhf-v${{ env.CACHE_VERSION }}
+      - name: Fix GitHub's mess
+        run: |
+          sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update -qq
+          sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
       - name: Set up dependencies
         run: |
           sudo dpkg --add-architecture armhf
@@ -120,6 +130,11 @@ jobs:
             ~/work/Cardinal/Cardinal/build/plugins
             ~/work/Cardinal/Cardinal/build/rack
           key: linux-i686-v${{ env.CACHE_VERSION }}
+      - name: Fix GitHub's mess
+        run: |
+          sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update -qq
+          sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
       - name: Set up dependencies
         run: |
           sudo dpkg --add-architecture i386
@@ -196,7 +211,7 @@ jobs:
       - name: Set up dependencies
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -yqq libgl1-mesa-dev liblo-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev
+          sudo apt-get install -yqq libdbus-1-dev libgl1-mesa-dev liblo-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev
       - name: Build linux x86_64 (debug)
         env:
           LDFLAGS: -static-libgcc -static-libstdc++
@@ -239,7 +254,7 @@ jobs:
       - name: Set up dependencies
         run: |
           sudo apt-get update -qq
-          sudo apt-get install -yqq libgl1-mesa-dev liblo-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev libarchive-dev libjansson-dev libsamplerate0-dev libsndfile1-dev libspeexdsp-dev
+          sudo apt-get install -yqq libdbus-1-dev libgl1-mesa-dev liblo-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev libarchive-dev libjansson-dev libsamplerate0-dev libsndfile1-dev libspeexdsp-dev
       - name: Build linux x86_64 (sysdeps)
         run: |
           make features
@@ -282,7 +297,7 @@ jobs:
             *-macOS.pkg
 
   win32:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
         with:
@@ -295,9 +310,13 @@ jobs:
             ~/work/Cardinal/Cardinal/build/plugins
             ~/work/Cardinal/Cardinal/build/rack
           key: win32-v${{ env.CACHE_VERSION }}
+      - name: Fix GitHub's mess
+        run: |
+          sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update -qq
+          sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
       - name: Set up dependencies
         run: |
-          sudo add-apt-repository -y ppa:cybermax-dexter/mingw-w64-backport
           sudo dpkg --add-architecture i386
           sudo apt-get update -qq
           sudo apt-get install -yqq binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable:i386
@@ -335,6 +354,11 @@ jobs:
             ~/work/Cardinal/Cardinal/build/plugins
             ~/work/Cardinal/Cardinal/build/rack
           key: win64-v${{ env.CACHE_VERSION }}
+      - name: Fix GitHub's mess
+        run: |
+          sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update -qq
+          sudo apt-get install -yqq --allow-downgrades libpcre2-8-0/focal libpcre2-16-0/focal libpcre2-32-0/focal libpcre2-posix2/focal
       - name: Set up dependencies
         run: |
           sudo apt-get update -qq
diff --git a/carla b/carla
index 3bc96e3..613e695 160000
--- a/carla
+++ b/carla
@@ -1 +1 @@
-Subproject commit 3bc96e352c113820cacadea7f15fcaa4a1542a01
+Subproject commit 613e6950581ad0cb3c037fac7f0db89633e099e6
diff --git a/dpf b/dpf
index 7b3b7ba..5d7fd17 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 7b3b7bacf5b57afd294603642811e72452847f17
+Subproject commit 5d7fd17f6a634ccd648a264743319c145928a27c