From 73e3a8f8a8d906627a15f4f5be81ce0ceca4aeb0 Mon Sep 17 00:00:00 2001 From: James Knight Date: Thu, 27 Apr 2023 21:33:35 -0400 Subject: [PATCH] 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 Signed-off-by: Yann E. MORIN --- package/libxkbcommon/Config.in | 1 + package/libxkbcommon/libxkbcommon.mk | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/libxkbcommon/Config.in b/package/libxkbcommon/Config.in index e9f61227a0..c7fe188a0e 100644 --- a/package/libxkbcommon/Config.in +++ b/package/libxkbcommon/Config.in @@ -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, diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index 236bf4c5d9..882791b917 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -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))