From 4294adf244cd5083ba957a106c4a13562692367d Mon Sep 17 00:00:00 2001 From: Yunhao Tian Date: Sat, 25 Dec 2021 13:08:53 +0800 Subject: [PATCH] package/cage: only enable XWayland if wlroots has X11 Cage requires wlroots to be built with X11 enabled in order to enable XWayland, otherwise it will fail with error: "ERROR: Problem encountered: Cannot build Cage with XWayland support: wlroots has been built without it" Signed-off-by: Yunhao Tian [yann.morin.1998@free.fr: - drop explicit _XORG7, as _WLROOTS_X11 depends on it ] Signed-off-by: Yann E. MORIN (cherry picked from commit 3e4c2d6213a09e9a0c598f800510acd6687ffcda) Signed-off-by: Peter Korsgaard --- package/cage/cage.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cage/cage.mk b/package/cage/cage.mk index 9fc01d36c1..731702b4d3 100644 --- a/package/cage/cage.mk +++ b/package/cage/cage.mk @@ -10,7 +10,7 @@ CAGE_LICENSE = MIT CAGE_LICENSE_FILES = LICENSE CAGE_DEPENDENCIES = host-pkgconf wlroots -ifeq ($(BR2_PACKAGE_XORG7),y) +ifeq ($(BR2_PACKAGE_WLROOTS_X11),y) CAGE_CONF_OPTS = -Dxwayland=true else CAGE_CONF_OPTS = -Dxwayland=false