From 4da8ab8ef910293046e651287ff1115d9a4f14b0 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <tpearson@raptorengineering.com>
Date: Thu, 19 Mar 2026 01:13:55 -0500
Subject: [PATCH] [sdl3] Make dbus dependency optional (#50468)

Co-authored-by: Timothy Pearson <tpearson@raptorcs.com>
---
 ports/sdl3/portfile.cmake       |  1 +
 ports/sdl3/vcpkg.json           | 16 +++++++++++-----
 scripts/ci.feature.baseline.txt |  2 +-
 versions/baseline.json          |  2 +-
 versions/s-/sdl3.json           |  5 +++++
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ports/sdl3/portfile.cmake b/ports/sdl3/portfile.cmake
index 059cd782e9..69ef3493cd 100644
--- a/ports/sdl3/portfile.cmake
+++ b/ports/sdl3/portfile.cmake
@@ -15,6 +15,7 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT)
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
         alsa     SDL_ALSA
+        dbus     SDL_DBUS
         ibus     SDL_IBUS
         vulkan   SDL_VULKAN
         wayland  SDL_WAYLAND
diff --git a/ports/sdl3/vcpkg.json b/ports/sdl3/vcpkg.json
index 211ac9dfcb..b3bc8ffc6e 100644
--- a/ports/sdl3/vcpkg.json
+++ b/ports/sdl3/vcpkg.json
@@ -1,16 +1,12 @@
 {
   "name": "sdl3",
   "version": "3.4.2",
+  "port-version": 1,
   "description": "Simple DirectMedia Layer is a cross-platform development library designed to provide low level access to audio, keyboard, mouse, joystick, and graphics hardware via OpenGL and Direct3D.",
   "homepage": "https://www.libsdl.org",
   "license": "Zlib AND MIT AND Apache-2.0",
   "supports": "!uwp",
   "dependencies": [
-    {
-      "name": "dbus",
-      "default-features": false,
-      "platform": "linux"
-    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -44,6 +40,16 @@
         }
       ]
     },
+    "dbus": {
+      "description": "Build with D-Bus support",
+      "dependencies": [
+        {
+          "name": "dbus",
+          "default-features": false,
+          "platform": "linux"
+        }
+      ]
+    },
     "emscripten-pthreads": {
       "description": "Build Emscripten pthreads support",
       "supports": "emscripten"
diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt
index 77e0f99269..4a2fd254da 100644
--- a/scripts/ci.feature.baseline.txt
+++ b/scripts/ci.feature.baseline.txt
@@ -1359,7 +1359,7 @@ sdl2-mixer-ext:arm64-linux=cascade
 sdl2-net:arm64-linux=cascade
 sdl2-ttf:arm64-linux=cascade
 sdl2pp:arm64-linux=cascade
-sdl3:arm64-linux=cascade
+sdl3[dbus]:arm64-linux=cascade
 sdl3-image:arm64-linux=cascade
 sdl3-shadercross((!windows | arm32 | uwp | xbox) & (!linux | !x64))=cascade
 sdl3-ttf:arm64-linux=cascade
diff --git a/versions/baseline.json b/versions/baseline.json
index 6ac662016f..9f3a3fa148 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -8978,7 +8978,7 @@
     },
     "sdl3": {
       "baseline": "3.4.2",
-      "port-version": 0
+      "port-version": 1
     },
     "sdl3-image": {
       "baseline": "3.4.0",
diff --git a/versions/s-/sdl3.json b/versions/s-/sdl3.json
index 282a57fde8..e9affbc6d0 100644
--- a/versions/s-/sdl3.json
+++ b/versions/s-/sdl3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "03a5817f59c402809823b884830132bc9c8d6fd4",
+      "version": "3.4.2",
+      "port-version": 1
+    },
     {
       "git-tree": "fed2a405770d3ac4416e972ea31f0476e6ac23dd",
       "version": "3.4.2",