From 90c05d1abfef4f42e7e576601b3964b8b5d2b57f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 22 Jan 2024 22:14:51 +0100 Subject: [PATCH] package/weston: fix build without gbm Fix the following build failure without gbm raised since commit 534c22dd606e200969fce49b8d23b27902dec94e: Message: dmabuf-feedback requires gbm which was not found. If you rather not build this, drop "dmabuf-feedback" from simple-clients option. Move the option assignment further down, below all the simple-clients lists; in Makefile, and because we are usign simply expanded variables, this is not necessary, but it is easier on us humans when we review the code. Also add a comment explaining why the initial list is incomplete. Fixes: - http://autobuild.buildroot.org/results/ebbba1d73ceeaacee17fde0c6c853415cd316091 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN (cherry picked from commit 611c0cb198041f518f2be3e0f5236d5c6ef93f58) Signed-off-by: Peter Korsgaard --- package/weston/weston.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 6a5c0e57f5..b07e798765 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -23,11 +23,9 @@ WESTON_CONF_OPTS = \ -Dtools=calibrator,debug,info,terminal,touch-calibrator ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y) +# Note: some clients are conditional, see further for the others. WESTON_SIMPLE_CLIENTS = \ damage \ - dmabuf-egl \ - dmabuf-feedback \ - egl \ im \ shm \ touch @@ -38,8 +36,6 @@ WESTON_SIMPLE_CLIENTS += dmabuf-v4l endif endif # BR2_PACKAGE_WESTON_SIMPLE_CLIENTS -WESTON_CONF_OPTS += -Dsimple-clients=$(subst $(space),$(comma),$(strip $(WESTON_SIMPLE_CLIENTS))) - ifeq ($(BR2_PACKAGE_JPEG),y) WESTON_CONF_OPTS += -Dimage-jpeg=true WESTON_DEPENDENCIES += jpeg @@ -57,6 +53,9 @@ endif ifeq ($(BR2_PACKAGE_HAS_LIBEGL_WAYLAND)$(BR2_PACKAGE_HAS_LIBGBM)$(BR2_PACKAGE_HAS_LIBGLES),yyy) WESTON_CONF_OPTS += -Drenderer-gl=true WESTON_DEPENDENCIES += libegl libgbm libgles +ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y) +WESTON_SIMPLE_CLIENTS += dmabuf-egl dmabuf-feedback egl +endif ifeq ($(BR2_PACKAGE_PIPEWIRE)$(BR2_PACKAGE_WESTON_DRM),yy) WESTON_CONF_OPTS += -Dpipewire=true -Dbackend-pipewire=true WESTON_DEPENDENCIES += pipewire @@ -70,6 +69,8 @@ WESTON_CONF_OPTS += \ -Dbackend-pipewire=false endif +WESTON_CONF_OPTS += -Dsimple-clients=$(subst $(space),$(comma),$(strip $(WESTON_SIMPLE_CLIENTS))) + ifeq ($(BR2_PACKAGE_WESTON_RDP),y) WESTON_DEPENDENCIES += freerdp WESTON_CONF_OPTS += -Dbackend-rdp=true