[sdl2] Make dbus dependency optional. (#40633)

microsoft · Aug 29, 2024 · de99811 · de99811
1 parent dfa8003
commit de99811
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake
@@ -18,6 +18,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
         samplerate SDL_LIBSAMPLERATE
         vulkan   SDL_VULKAN

diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json
@@ -1,16 +1,11 @@
 {
   "name": "sdl2",
   "version": "2.30.6",
-  "port-version": 1,
+  "port-version": 2,
   "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/download-2.0.php",
   "license": "Zlib",
   "dependencies": [
-    {
-      "name": "dbus",
-      "default-features": false,
-      "platform": "linux"
-    },
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -21,6 +16,10 @@
     }
   ],
   "default-features": [
+    {
+      "name": "dbus",
+      "platform": "linux"
+    },
     {
       "name": "ibus",
       "platform": "linux"
@@ -44,6 +43,16 @@
         }
       ]
     },
+    "dbus": {
+      "description": "Build with D-Bus support",
+      "dependencies": [
+        {
+          "name": "dbus",
+          "default-features": false,
+          "platform": "linux"
+        }
+      ]
+    },
     "ibus": {
       "description": "Build with ibus IME support",
       "supports": "linux"

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -8094,7 +8094,7 @@
     },
     "sdl2": {
       "baseline": "2.30.6",
-      "port-version": 1
+      "port-version": 2
     },
     "sdl2-gfx": {
       "baseline": "1.0.4",

diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5d52d326d6f43ce1c7481188402e8c2828bbb369",
+      "version": "2.30.6",
+      "port-version": 2
+    },
     {
       "git-tree": "35851962eb04c90f32822e7574ae69265113d88b",
       "version": "2.30.6",