From ea9f45d1bc03efbf43a3bbd0788d6a433b8fe445 Mon Sep 17 00:00:00 2001
From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
Date: Fri, 1 Dec 2023 18:16:35 +0800
Subject: [PATCH] [SDL2] update to 2.28.5 (#35352)

* [SDL2] update to 2.28.5

* Unroll the base feature into direct members of default-features

* Apply suggestion
---
 ports/sdl2/portfile.cmake |  2 +-
 ports/sdl2/vcpkg.json     | 31 +++++++++++++------------------
 versions/baseline.json    |  4 ++--
 versions/s-/sdl2.json     |  5 +++++
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/ports/sdl2/portfile.cmake b/ports/sdl2/portfile.cmake
index e9c6837b05..4e3ad0bfa3 100644
--- a/ports/sdl2/portfile.cmake
+++ b/ports/sdl2/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libsdl-org/SDL
     REF "release-${VERSION}"
-    SHA512 3199e535033c8728bd12b97931d5c5d7a7dcc9b0f502109ff722982601b6fbb00995d71cbaab7d3b780c738deece235ef76ab1963ce946084c482c2d31a4abe8
+    SHA512 d3cf7d356b79184dd211c9fbbfcb2a83d1acb68ee549ab82be109cd899039f18f0dbf3aedbf0800793c3a68580688014863b5d9bf79bcd366ff0e88252955e3c
     HEAD_REF main
     PATCHES
         deps.patch
diff --git a/ports/sdl2/vcpkg.json b/ports/sdl2/vcpkg.json
index 4f67f6ea0b..b5e96c4bac 100644
--- a/ports/sdl2/vcpkg.json
+++ b/ports/sdl2/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "sdl2",
-  "version": "2.28.4",
-  "port-version": 1,
+  "version": "2.28.5",
   "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",
@@ -20,7 +19,18 @@
     }
   ],
   "default-features": [
-    "base"
+    {
+      "name": "ibus",
+      "platform": "linux"
+    },
+    {
+      "name": "wayland",
+      "platform": "linux"
+    },
+    {
+      "name": "x11",
+      "platform": "linux"
+    }
   ],
   "features": {
     "alsa": {
@@ -32,21 +42,6 @@
         }
       ]
     },
-    "base": {
-      "description": "Base functionality for SDL",
-      "dependencies": [
-        {
-          "name": "sdl2",
-          "default-features": false,
-          "features": [
-            "ibus",
-            "wayland",
-            "x11"
-          ],
-          "platform": "linux"
-        }
-      ]
-    },
     "ibus": {
       "description": "Build with ibus IME support",
       "supports": "linux"
diff --git a/versions/baseline.json b/versions/baseline.json
index 7439b97b86..9465d8b0c0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7729,8 +7729,8 @@
       "port-version": 6
     },
     "sdl2": {
-      "baseline": "2.28.4",
-      "port-version": 1
+      "baseline": "2.28.5",
+      "port-version": 0
     },
     "sdl2-gfx": {
       "baseline": "1.0.4",
diff --git a/versions/s-/sdl2.json b/versions/s-/sdl2.json
index 88e296f3c0..5c450683eb 100644
--- a/versions/s-/sdl2.json
+++ b/versions/s-/sdl2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "06cf4722fa0f5f8467136faebe34cef0e85e1a4c",
+      "version": "2.28.5",
+      "port-version": 0
+    },
     {
       "git-tree": "3d625914314454b36d303ce86753840f6193f2bd",
       "version": "2.28.4",