package/libxkbcommon: enable wayland support

Tweak the applied configuration options to flag support for Wayland if
the wayland package is detected. This will allow the generation of the
`interactive-wayland` utility (when `BR2_PACKAGE_LIBXKBCOMMON_TOOLS` is
also configured).

Signed-off-by: James Knight <james.d.knight@live.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2023.05.x
James Knight 2023-04-27 21:33:35 -04:00 committed by Yann E. MORIN
parent 0a5d8d5f85
commit 73e3a8f8a8
2 changed files with 8 additions and 1 deletions

View File

@ -12,6 +12,7 @@ if BR2_PACKAGE_LIBXKBCOMMON
config BR2_PACKAGE_LIBXKBCOMMON_TOOLS
bool "tools"
select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND
help
Tools: xkbcli, xkbcli-compile-keymap, xkbcli-how-to-type,
xkbcli-interactive-evdev, xkbcli-interactive-x11,

View File

@ -14,7 +14,6 @@ LIBXKBCOMMON_INSTALL_STAGING = YES
LIBXKBCOMMON_DEPENDENCIES = host-bison host-flex
LIBXKBCOMMON_CONF_OPTS = \
-Denable-docs=false \
-Denable-wayland=false \
-Denable-xkbregistry=false
ifeq ($(BR2_PACKAGE_XORG7),y)
@ -30,4 +29,11 @@ else
LIBXKBCOMMON_CONF_OPTS += -Denable-tools=false
endif
ifeq ($(BR2_PACKAGE_LIBXKBCOMMON_TOOLS)$(BR2_PACKAGE_WAYLAND),yy)
LIBXKBCOMMON_CONF_OPTS += -Denable-wayland=true
LIBXKBCOMMON_DEPENDENCIES += wayland wayland-protocols
else
LIBXKBCOMMON_CONF_OPTS += -Denable-wayland=false
endif
$(eval $(meson-package))