mirror of
https://gitlab.freedesktop.org/wayland/weston.git
synced 2026-05-07 07:18:06 +02:00
Merge branch 'wip/mvlad/retire-xdg-shell-v6' into 'main'
xdg-shell-v6: Deprecate in favor of xdg-shell stable See merge request wayland/weston!1887
This commit is contained in:
commit
0cd8e3b5f9
2 changed files with 16 additions and 3 deletions
|
|
@ -5,12 +5,18 @@ srcs_libweston += files([
|
|||
'surface.c',
|
||||
'xwayland.c',
|
||||
'xdg-shell.c',
|
||||
'xdg-shell-v6.c',
|
||||
])
|
||||
|
||||
srcs_libweston += [
|
||||
xdg_shell_unstable_v6_server_protocol_h,
|
||||
xdg_shell_unstable_v6_protocol_c,
|
||||
xdg_shell_server_protocol_h,
|
||||
xdg_shell_protocol_c,
|
||||
]
|
||||
|
||||
if get_option('deprecated-xdg-shell-v6-unstable')
|
||||
warning('deprecated-xdg-shell-v6-unstable enabled. This will be removed in future versions.')
|
||||
srcs_libweston += files([ 'xdg-shell-v6.c' ])
|
||||
srcs_libweston += [
|
||||
xdg_shell_unstable_v6_server_protocol_h,
|
||||
xdg_shell_unstable_v6_protocol_c
|
||||
]
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -132,6 +132,13 @@ option(
|
|||
description: 'Weston desktop shell: default helper client selection'
|
||||
)
|
||||
|
||||
option(
|
||||
'deprecated-xdg-shell-v6-unstable',
|
||||
type: 'boolean',
|
||||
value: false,
|
||||
description: 'DEPRECATED: xdg-shell v6 unstable support. Use xdg-shell stable'
|
||||
)
|
||||
|
||||
option(
|
||||
'color-management-lcms',
|
||||
type: 'boolean',
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue