[sdl2] Disable X11 feature and make it and Wayland defaults (#28148)

This commit is contained in:
Nick 2022-12-14 02:41:34 +01:00 committed by GitHub
parent e05c925db6
commit eaa1227aaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 4 deletions

View File

@ -14,7 +14,7 @@ string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" FORCE_STATIC_VCRT)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
vulkan SDL_VULKAN
x11 SDL_X11_SHARED
x11 SDL_X11
wayland SDL_WAYLAND
)
@ -37,7 +37,6 @@ vcpkg_cmake_configure(
-DSDL_SHARED=${SDL_SHARED}
-DSDL_FORCE_STATIC_VCRT=${FORCE_STATIC_VCRT}
-DSDL_LIBC=ON
-DSDL_HIDAPI_JOYSTICK=ON
-DSDL_TEST=OFF
-DSDL_IBUS=OFF
-DSDL_INSTALL_CMAKEDIR="cmake"

View File

@ -1,6 +1,7 @@
{
"name": "sdl2",
"version": "2.26.1",
"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/download-2.0.php",
"license": "Zlib",
@ -14,7 +15,24 @@
"host": true
}
],
"default-features": [
"base"
],
"features": {
"base": {
"description": "Base functionality for SDL",
"dependencies": [
{
"name": "sdl2",
"default-features": false,
"features": [
"wayland",
"x11"
],
"platform": "linux"
}
]
},
"vulkan": {
"description": "Vulkan functionality for SDL"
},
@ -23,7 +41,7 @@
"supports": "linux"
},
"x11": {
"description": "Dynamically load X11 support",
"description": "Build with X11 support",
"supports": "!windows"
}
}

View File

@ -6822,7 +6822,7 @@
},
"sdl2": {
"baseline": "2.26.1",
"port-version": 0
"port-version": 1
},
"sdl2-gfx": {
"baseline": "1.0.4",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "61ecd58c79e5522e8a23f842936e24b2b6f08c75",
"version": "2.26.1",
"port-version": 1
},
{
"git-tree": "323de63997d074a6076426bcc5f90fb2a183d534",
"version": "2.26.1",