From dce04609c076dc2cb03a71efe7d6c1585eb9ce6f Mon Sep 17 00:00:00 2001
From: SimoneN64 <simococo03@gmail.com>
Date: Tue, 21 May 2024 18:47:45 +0200
Subject: [PATCH 1/2] Attempt at fixing Linux CI

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bb10b67d..1e54cfd0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -5,7 +5,7 @@ on:
       - master
 jobs:
   build-linux:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@master
         with:
@@ -15,7 +15,7 @@ jobs:
           sudo add-apt-repository universe
           sudo apt-get update -qq
           sudo apt-get install -y clang build-essential libgtk-3-dev libsdl2-dev git ninja-build qt6-base-dev
-          sudo apt-get install -y vulkan-tools libvulkan1 libvulkan-dev vulkan-validationlayers-dev spirv-tools
+          sudo apt-get install -y vulkan-tools libvulkan1 libvulkan-dev vulkan-utility-libraries-dev spirv-tools
       - name: Build Kaizen
         run: |
           cmake -G Ninja -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -B build -DCMAKE_BUILD_TYPE=Release

From 6003f026442d2a3eec8c087edc0b74cd8aebc9e3 Mon Sep 17 00:00:00 2001
From: SimoneN64 <simococo03@gmail.com>
Date: Sat, 25 May 2024 18:46:17 +0200
Subject: [PATCH 2/2] Hotifx for Windows maybe

---
 src/backend/core/mmio/Audio.cpp | 1 +
 src/backend/core/mmio/Audio.hpp | 2 +-
 src/frontend/EmuThread.cpp      | 1 +
 src/frontend/EmuThread.hpp      | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/backend/core/mmio/Audio.cpp b/src/backend/core/mmio/Audio.cpp
index 900924d7..06fff418 100644
--- a/src/backend/core/mmio/Audio.cpp
+++ b/src/backend/core/mmio/Audio.cpp
@@ -1,5 +1,6 @@
 #include <Audio.hpp>
 #include <log.hpp>
+#include <SDL2/SDL.h>
 
 namespace n64 {
 #define AUDIO_SAMPLE_RATE 44100
diff --git a/src/backend/core/mmio/Audio.hpp b/src/backend/core/mmio/Audio.hpp
index 25cc1730..487a221c 100644
--- a/src/backend/core/mmio/Audio.hpp
+++ b/src/backend/core/mmio/Audio.hpp
@@ -1,6 +1,6 @@
 #pragma once
 #include <MemoryHelpers.hpp>
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_audio.h>
 
 namespace n64 {
 struct AudioDevice {
diff --git a/src/frontend/EmuThread.cpp b/src/frontend/EmuThread.cpp
index 61772f07..02c8d465 100644
--- a/src/frontend/EmuThread.cpp
+++ b/src/frontend/EmuThread.cpp
@@ -2,6 +2,7 @@
 #include <RenderWidget.hpp>
 #include <ParallelRDPWrapper.hpp>
 #include "Audio.hpp"
+#include <SDL2/SDL.h>
 
 EmuThread::EmuThread(std::unique_ptr<QtInstanceFactory>&& instance_, std::unique_ptr<Vulkan::WSIPlatform>&& wsiPlatform_, std::unique_ptr<ParallelRDP::WindowInfo>&& windowInfo_, SettingsWindow& settings) noexcept
   : instance(std::move(instance_)), wsiPlatform(std::move(wsiPlatform_)),
diff --git a/src/frontend/EmuThread.hpp b/src/frontend/EmuThread.hpp
index 6963aeee..481e30b8 100644
--- a/src/frontend/EmuThread.hpp
+++ b/src/frontend/EmuThread.hpp
@@ -4,7 +4,7 @@
 #include <Core.hpp>
 #include <SettingsWindow.hpp>
 #include <memory>
-#include <SDL2/SDL.h>
+#include <SDL2/SDL_gamecontroller.h>
 
 class EmuThread : public QThread
 {