From 4f37d900c476df3f31e2382fa5f6038c9f662c8a Mon Sep 17 00:00:00 2001
From: Kae <80987908+Novaenia@users.noreply.github.com>
Date: Tue, 31 Dec 2024 18:21:12 +1100
Subject: [PATCH] get rid of SDL2's dbus dependency

---
 .github/workflows/build.yml | 8 ++++----
 source/vcpkg.json           | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c7cf799..73aa3be 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
   build_windows:
     name: Build OpenStarbound Windows x64
     runs-on: windows-latest
-    if: ${{ (github.event_name != 'workflow_dispatch') || (inputs.windows == true) }}
+    if: ${{ (github.event_name == 'workflow_dispatch') && (inputs.windows == true) }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -103,7 +103,7 @@ jobs:
   
   build_linux:
     name: Build OpenStarbound Linux x86_64
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-20.04
     if: ${{ (github.event_name != 'workflow_dispatch') || (inputs.linux == true) }}
     env:
         CC: clang
@@ -171,7 +171,7 @@ jobs:
   build-mac-intel:
     name: Build OpenStarbound macOS x86_64
     runs-on: macos-13
-    if: ${{ (github.event_name != 'workflow_dispatch') || (inputs.macOS == true) }}
+    if: ${{ (github.event_name == 'workflow_dispatch') && (inputs.macOS == true) }}
     steps:
       - uses: actions/checkout@v4
         with:
@@ -213,7 +213,7 @@ jobs:
   build-mac-arm:
     name: Build OpenStarbound macOS arm64
     runs-on: macos-14
-    if: ${{ (github.event_name != 'workflow_dispatch') || (inputs.macOS == true) }}
+    if: ${{ (github.event_name == 'workflow_dispatch') && (inputs.macOS == true) }}
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/source/vcpkg.json b/source/vcpkg.json
index f603aab..ffa41e7 100644
--- a/source/vcpkg.json
+++ b/source/vcpkg.json
@@ -2,7 +2,8 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
   "dependencies": [
     "glew",
-    "sdl2",
+    { "name": "sdl2", "default-features": false, "features": ["wayland", "x11", "alsa", "ibus"], "platform": "linux" },
+    { "name": "sdl2", "platform": "windows" },
     "libvorbis",
     "zlib",
     "freetype",