Skip to content

Commit 1c87f23

Browse files
committed
[gtk] add wayland support on linux
1 parent ffffe61 commit 1c87f23

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

ports/gtk/portfile.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ get_filename_component(PKGCONFIG_DIR "${PKGCONFIG}" DIRECTORY )
2121
vcpkg_add_to_path("${PKGCONFIG_DIR}") # Post install script runs pkg-config so it needs to be on PATH
2222
vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/glib/")
2323

24+
set(wayland false)
2425
set(x11 false)
2526
set(win32 false)
2627
set(osx false)
2728
if(VCPKG_TARGET_IS_LINUX)
28-
set(OPTIONS -Dwayland-backend=false) # CI missing at least wayland-protocols
29+
set(wayland true)
2930
set(x11 true)
3031
# Enable the wayland gdk backend (only when building on Unix except for macOS)
3132
elseif(VCPKG_TARGET_IS_WINDOWS)
@@ -34,6 +35,7 @@ elseif(VCPKG_TARGET_IS_OSX)
3435
set(osx true)
3536
endif()
3637

38+
list(APPEND OPTIONS -Dwayland-backend=${wayland}) #Enable the Wayland gdk backend (only when building on Unix)
3739
list(APPEND OPTIONS -Dx11-backend=${x11}) #Enable the X11 gdk backend (only when building on Unix)
3840
list(APPEND OPTIONS -Dbroadway-backend=false) #Enable the broadway (HTML5) gdk backend
3941
list(APPEND OPTIONS -Dwin32-backend=${win32}) #Enable the Windows gdk backend (only when building on Windows)

ports/gtk/vcpkg.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@
5656
{
5757
"name": "vcpkg-tool-meson",
5858
"host": true
59+
},
60+
{
61+
"name": "wayland-protocols",
62+
"platform": "linux"
5963
}
6064
],
6165
"features": {

versions/g-/gtk.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"versions": [
33
{
4-
"git-tree": "a00d8b7fc33fb6fa4794606fa5a83d682dc94e70",
4+
"git-tree": "adfa7f2296204fe8e67abcc0a1ce8ea44215c15e",
55
"version": "4.22.0",
66
"port-version": 0
77
},

0 commit comments

Comments
 (0)