[ptxdist] [PATCH] wlroots: allow to enable Xwayland support

[ptxdist] [PATCH] wlroots: allow to enable Xwayland support

[Philipp Zabel]

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 rules/wlroots.in   | 10 ++++++++++
 rules/wlroots.make |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/rules/wlroots.in b/rules/wlroots.in
index 654bfaa32ce4..4a8ea26ed614 100644
--- a/rules/wlroots.in
+++ b/rules/wlroots.in
@@ -18,8 +18,18 @@ config WLROOTS
 	select UDEV_LIBUDEV
 	select PIXMAN
 	select SEATD
+	select XORG			if WLROOTS_XWAYLAND
+	select XCB_UTIL_WM		if WLROOTS_XWAYLAND
+	select XWAYLAND			if WLROOTS_XWAYLAND
 	prompt "wlroots"
 	help
 	  wlroots provides pluggable, composable, unopinionated modules for
 	  building a Wayland compositor.
 
+if WLROOTS
+
+config WLROOTS_XWAYLAND
+	bool
+	prompt "Xwayland support"
+
+endif
diff --git a/rules/wlroots.make b/rules/wlroots.make
index 5cea2161494b..81b4f850e8cf 100644
--- a/rules/wlroots.make
+++ b/rules/wlroots.make
@@ -36,7 +36,7 @@ WLROOTS_CONF_OPT := \
 	-Dicon_directory= \
 	-Drenderers=gles2 \
 	-Dxcb-errors=disabled \
-	-Dxwayland=disabled
+	-Dxwayland=$(call ptx/endis,PTXCONF_WLROOTS_XWAYLAND)d
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.30.2

Re: [ptxdist] [APPLIED] wlroots: allow to enable Xwayland support

[Michael Olbrich]

Thanks, applied as 0569cddf244f6ef082ef9abf8fb648f478198799.

Michael

[sent from post-receive hook]

On Mon, 05 Dec 2022 13:53:55 +0100, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
> Message-Id: <20221202104954.682-1-p.zabel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/wlroots.in b/rules/wlroots.in
> index 654bfaa32ce4..4a8ea26ed614 100644
> --- a/rules/wlroots.in
> +++ b/rules/wlroots.in
> @@ -18,8 +18,18 @@ config WLROOTS
>  	select UDEV_LIBUDEV
>  	select PIXMAN
>  	select SEATD
> +	select XORG			if WLROOTS_XWAYLAND
> +	select XCB_UTIL_WM		if WLROOTS_XWAYLAND
> +	select XWAYLAND			if WLROOTS_XWAYLAND
>  	prompt "wlroots"
>  	help
>  	  wlroots provides pluggable, composable, unopinionated modules for
>  	  building a Wayland compositor.
>  
> +if WLROOTS
> +
> +config WLROOTS_XWAYLAND
> +	bool
> +	prompt "Xwayland support"
> +
> +endif
> diff --git a/rules/wlroots.make b/rules/wlroots.make
> index 5cea2161494b..81b4f850e8cf 100644
> --- a/rules/wlroots.make
> +++ b/rules/wlroots.make
> @@ -36,7 +36,7 @@ WLROOTS_CONF_OPT := \
>  	-Dicon_directory= \
>  	-Drenderers=gles2 \
>  	-Dxcb-errors=disabled \
> -	-Dxwayland=disabled
> +	-Dxwayland=$(call ptx/endis,PTXCONF_WLROOTS_XWAYLAND)d
>  
>  # ----------------------------------------------------------------------------
>  # Target-Install