Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sdl2] Make dbus dependency optional. #40633

Merged
merged 2 commits into from
Aug 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ports/sdl2/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 15 additions & 6 deletions ports/sdl2/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -21,6 +16,10 @@
}
],
"default-features": [
{
"name": "dbus",
"platform": "linux"
},
{
"name": "ibus",
"platform": "linux"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -8086,7 +8086,7 @@
},
"sdl2": {
"baseline": "2.30.6",
"port-version": 1
"port-version": 2
},
"sdl2-gfx": {
"baseline": "1.0.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/sdl2.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5d52d326d6f43ce1c7481188402e8c2828bbb369",
"version": "2.30.6",
"port-version": 2
},
{
"git-tree": "35851962eb04c90f32822e7574ae69265113d88b",
"version": "2.30.6",
Expand Down