From 40ff422160e1a5018bbfac53fd9acec702123d8f Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 3 Aug 2023 22:15:26 +0200 Subject: [PATCH] package/weston: introduce _SIMPLE_CLIENTS package option commit "package/weston: fix the configuration of simple-clients" fixed the configuration of Weston simple-clients by always enabling all supported applications. Since it is not desirable to always have all those applications installed on target, this commit introduces a new package Kconfig option to control this. Since there is already a BR2_PACKAGE_WESTON_DEMO_CLIENTS option present, this commit also update the Kconfig "help" entries, to clarify the difference between those "demo clients" and "simple clients". Those clients groups are directly coming from the upstream package (and are directly mapped to Meson configure options). Signed-off-by: Julien Olivain [yann.morin.1998@free.fr: - set -Dsimple-clients= only once, outside conditional block ] Signed-off-by: Yann E. MORIN --- package/weston/Config.in | 24 ++++++++++++++++++++++++ package/weston/weston.mk | 2 ++ 2 files changed, 26 insertions(+) diff --git a/package/weston/Config.in b/package/weston/Config.in index 1a7c27a715..db6a78ee8a 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -174,6 +174,18 @@ config BR2_PACKAGE_WESTON_SCREENSHARE bool "screenshare" default y +config BR2_PACKAGE_WESTON_SIMPLE_CLIENTS + bool "simple clients" + help + Simple clients includes application such as: + damage, dmabuf-feedback, dmabuf-egl, dmabuf-v4l, egl + + In the target filesystem, simple client program binaries are + prefixed with "weston-simple-". + + Note: Weston has two sets of clients. See also the weston + "demo clients" option. + config BR2_PACKAGE_WESTON_DEMO_CLIENTS bool "demo clients" depends on BR2_USE_MMU # pango @@ -188,6 +200,18 @@ config BR2_PACKAGE_WESTON_DEMO_CLIENTS help This enables the installation of Weston's demo clients. + Demo clients includes application such as: + clickdot, confine, content_protection, dnd, editor, + eventdemo, flower, fullscreen, image, multi-resource, + presentation-shm, resizor, scaler, smoke, stacking, + subsurfaces, tablet, transformed... + + In the target filesystem, demo client program binaries are + prefixed with "weston-". + + Note: Weston has two sets of clients. See also the weston + "simple clients" option. + comment "demo clients needs an OpenGL ES provider, an OpenEGL-capable Wayland backend and a toolchain w/ wchar, threads, C++, gcc >= 4.9" depends on BR2_USE_MMU depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package/weston/weston.mk b/package/weston/weston.mk index 5f8d915d5a..6a5c0e57f5 100644 --- a/package/weston/weston.mk +++ b/package/weston/weston.mk @@ -22,6 +22,7 @@ WESTON_CONF_OPTS = \ -Dlauncher-libseat=true \ -Dtools=calibrator,debug,info,terminal,touch-calibrator +ifeq ($(BR2_PACKAGE_WESTON_SIMPLE_CLIENTS),y) WESTON_SIMPLE_CLIENTS = \ damage \ dmabuf-egl \ @@ -35,6 +36,7 @@ ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),y) # dmabuf-v4l uses VIDIOC_EXPBUF, only available from 3.8+ WESTON_SIMPLE_CLIENTS += dmabuf-v4l endif +endif # BR2_PACKAGE_WESTON_SIMPLE_CLIENTS WESTON_CONF_OPTS += -Dsimple-clients=$(subst $(space),$(comma),$(strip $(WESTON_SIMPLE_CLIENTS)))