From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 17 Nov 2026 07:15:19 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1xTCTO-000KXP-1d for lore@lore.pengutronix.de; Tue, 17 Nov 2026 07:15:19 +0100 Received: from [127.0.0.1] (helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xTCTM-0000cX-6e; Tue, 17 Nov 2026 07:15:16 +0100 Received: from mx1.white.stw.pengutronix.de ([2a0a:edc0:0:b01:1d::107]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1xTCSp-0006sE-OD for ptxdist@pengutronix.de; Tue, 17 Nov 2026 07:14:43 +0100 Received: from dude05.red.stw.pengutronix.de (dude05.red.stw.4.pengutronix.de [10.17.1.19]) (Authenticated sender: relay-from-dude05.red.stw.pengutronix.de) by mx1.white.stw.pengutronix.de (Postfix) with ESMTPSA id A7DE7201D0E; Tue, 17 Nov 2026 07:14:43 +0100 (CET) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=pengutronix.de; s=20260414; t=1794896083; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z6xJ/FAhsuMLShtkFJl2a9KZdFNEQPwzO6kcTRjwGyU=; b=P4HfcGUoDO2SduLASwJYdcE3d9wz70pK+fwsDvvRP2T1aHvTFgJt5gFXZumvSoU+2KB24x JNWXIi20CwOy4m/rjhyNe7mwVTpl1DaGJPRMsFccTt9CcjY4YTODJr4V9OfxEupf/JTTC6 2x6yjf54WlETj3GCuSNTXlBxwzXvbjOyp7hRVjbNw3m2KZjB6k8CxX34KENmen8yeCTIbn ZrQ2K+vYw11x9E6lfk2Py4k6dVcOrE78u/lZBydsTqb9sk/PhJhnHmoezJpNXNLglPkN38 B/c+APyeDPIPF/4dCF5xOdUBKAJzesso56+wumA19Ah6zeliSB9fryCC9xK2lw== ARC-Seal: i=1; s=20260414; d=pengutronix.de; t=1794896083; a=rsa-sha256; cv=none; b=ePn4HqEVRXvCrFDnh32+iepJVzhEK65RT9ZwUQnPxZjc0NjmzWxI14K1vJMutFO1jafziR vmq9ee11TE9zMFDfgcRMdbpxafAxbYLlKQexqSLDE7bO+csYVT9NTHDQQqpCqotd4/i9cc XMZrlkI3vvQLL9SB+wPfMw2qQcuAgCPnf8vFEbuBunFAubYH73f6EpMBjAeo87w+gsWHtU LYgPzhegiVVCrKKdrRec/s51FZr1Th/pBCs2M00s9URbxuIxZiaOsrQcS9eu/Q9lWpXlgv +xFfmp0KHkPzBkZkhJwU/710BKhxHyU8AkeDhUmpm2ivoKvPC1MzTPfrZUqR6A== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=relay-from-dude05.red.stw.pengutronix.de smtp.mailfrom=mol@pengutronix.de Received: by dude05.red.stw.pengutronix.de (Postfix, from userid 1014) id 98E94741AD6; Tue, 17 Nov 2026 07:14:43 +0100 (CET) From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 17 Nov 2026 07:14:43 +0100 Message-ID: <20261117061443.3091821-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261112100228.716805-1-m.tretter@pengutronix.de> References: <20261112100228.716805-1-m.tretter@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] weston: allow to select and install demo clients X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Michael Tretter Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 2875e1bdcc1a95db39bb8269229dd15447c52c12. Michael [sent from post-receive hook] On Tue, 17 Nov 2026 07:14:43 +0100, Michael Tretter wrote: > Some of these demo clients are useful for testing. > > Add options to enable and install the demo clients. > > The IVI shell example already enabled and installed some of the demo > clients. Select the required options instead of installing the demo > clients directly. > > Signed-off-by: Michael Tretter > Message-Id: <20261112100228.716805-1-m.tretter@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/weston.in b/rules/weston.in > index 26f6b20c0ac6..6897c6109779 100644 > --- a/rules/weston.in > +++ b/rules/weston.in > @@ -31,7 +31,7 @@ menuconfig WESTON > select SYSTEMD if WESTON_SYSTEMD > select LUA if WESTON_SHELL_LUA > select LUA_INSTALL_LIBLUA if WESTON_SHELL_LUA > - select PANGO if WESTON_IVISHELL_EXAMPLE > + select PANGO if WESTON_DEMO_CLIENTS > select PIPEWIRE if WESTON_BACKEND_PIPEWIRE > select NEATVNC if WESTON_BACKEND_VNC > select PAM if WESTON_BACKEND_VNC > @@ -91,6 +91,12 @@ config WESTON_IVISHELL_EXAMPLE > bool > depends on WESTON_IVISHELL > select WESTON_INSTALL_CONFIG > + select WESTON_DEMO_CLIENTS > + select WESTON_DEMO_CLICKDOT > + select WESTON_DEMO_FLOWER > + select WESTON_DEMO_SMOKE > + select WESTON_DEMO_TABLET > + select WESTON_SIMPLE_CLIENTS > prompt "install example IVI-Shell user interface" > help > Install the example hmi-controller, the IVI-Shell user interface > @@ -111,6 +117,96 @@ config WESTON_SIMPLE_CLIENTS > help > Install the weston-simple-* test clients. > > +config WESTON_DEMO_CLIENTS > + bool > + prompt "demo clients" > + help > + Install the selected Weston demo clients. > + > +if WESTON_DEMO_CLIENTS > + > +config WESTON_DEMO_CLICKDOT > + bool > + prompt "weston-clickdot" > + > +config WESTON_DEMO_CLIPTEST > + bool > + prompt "weston-cliptest" > + > +config WESTON_DEMO_COLOR > + bool > + prompt "weston-color" > + > +config WESTON_DEMO_CONSTRAIT > + bool > + prompt "weston-contraint" > + > +config WESTON_DEMO_CONTENT_PROTECTION > + bool > + prompt "weston-content-protection" > + > +config WESTON_DEMO_DND > + bool > + prompt "weston-dnd" > + > +config WESTON_DEMO_EDITOR > + bool > + prompt "weston-editor" > + > +config WESTON_DEMO_EVENTDEMO > + bool > + prompt "weston-eventdemo" > + > +config WESTON_DEMO_FLOWER > + bool > + prompt "weston-flower" > + > +config WESTON_DEMO_FULLSCREEN > + bool > + prompt "weston-fullscreen" > + > +config WESTON_DEMO_IMAGE > + bool > + prompt "weston-image" > + > +config WESTON_DEMO_MULTI_RESOURCE > + bool > + prompt "weston-multi-resource" > + > +config WESTON_DEMO_PRESENTATION_SHM > + bool > + prompt "weston-presentation-shm" > + > +config WESTON_DEMO_RESIZOR > + bool > + prompt "weston-resizor" > + > +config WESTON_DEMO_SCALER > + bool > + prompt "weston-scaler" > + > +config WESTON_DEMO_SMOKE > + bool > + prompt "weston-smoke" > + > +config WESTON_DEMO_STACKING > + bool > + prompt "weston-stacking" > + > +config WESTON_DEMO_SUBSURFACES > + bool > + prompt "weston-subsurfaces" > + > +config WESTON_DEMO_TABLET > + bool > + prompt "weston-tablet" > + > +config WESTON_DEMO_TRANSFORMED > + bool > + prompt "weston-transformed" > + > +endif > + > config WESTON_TOUCH_CALIBRATOR > bool > prompt "touch calibrator" > diff --git a/rules/weston.make b/rules/weston.make > index 3146b0664527..39c49f923c01 100644 > --- a/rules/weston.make > +++ b/rules/weston.make > @@ -46,7 +46,7 @@ WESTON_CONF_OPT := \ > -Dbackend-wayland=$(call ptx/truefalse,PTXCONF_WESTON_GL) \ > -Dbackend-x11=false \ > -Dcolor-management-lcms=$(call ptx/truefalse,PTXCONF_WESTON_COLOR_MANAGEMENT_LCMS) \ > - -Ddemo-clients=$(call ptx/truefalse,PTXCONF_WESTON_IVISHELL_EXAMPLE) \ > + -Ddemo-clients=$(call ptx/truefalse,PTXCONF_WESTON_DEMO_CLIENTS) \ > -Ddeprecated-pipewire=false \ > -Ddeprecated-remoting=false \ > -Ddeprecated-xdg-shell-v6-unstable=false \ > @@ -93,6 +93,27 @@ endif > # Target-Install > # ---------------------------------------------------------------------------- > > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_CLICKDOT) += clickdot > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_CLIPTEST) += cliptest > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_COLOR) += color > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_CONSTRAIT) += constraints > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_CONTENT_PROTECTION) += content_protection > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_DND) += dnd > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_EDITOR) += editor > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_EVENTDEMO) += eventdemo > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_FLOWER) += flower > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_FULLSCREEN) += fullscreen > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_IMAGE) += image > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_MULTI_RESOURCE) += multi-resource > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_PRESENTATION_SHM) += presentation-shm > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_RESIZOR) += resizor > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_SCALER) += scaler > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_SMOKE) += smoke > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_STACKING) += stacking > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_SUBSURFACES) += subsurfaces > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_TABLET) += tablet > +WESTON_DEMO_CLIENTS-$(PTXCONF_WESTON_DEMO_TRANSFORMED) += transformed > + > $(STATEDIR)/weston.targetinstall: > @$(call targetinfo) > > @@ -208,17 +229,12 @@ ifdef PTXCONF_WESTON_IVISHELL_EXAMPLE > sidebyside.png \ > tiling.png, \ > $(call install_copy, weston, 0, 0, 0644, -, /usr/share/weston/$(image))$(ptx/nl)) > - > - @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-clickdot) > - @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-flower) > -ifdef PTXCONF_WESTON_GL > - @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-egl) > -endif > - @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-shm) > - @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-smoke) > - @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-tablet) > endif > > + @$(foreach bin, $(WESTON_DEMO_CLIENTS-y), \ > + $(call install_copy, weston, 0, 0, 0755, -, \ > + /usr/bin/weston-$(bin))$(ptx/nl)) > + > @$(call install_finish, weston) > > @$(call touch)