mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Philipp Zabel <p.zabel@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Subject: [ptxdist] [PATCH] wlroots: allow to enable Xwayland support
Date: Fri,  2 Dec 2022 11:49:54 +0100	[thread overview]
Message-ID: <20221202104954.682-1-p.zabel@pengutronix.de> (raw)

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




             reply	other threads:[~2022-12-02 10:50 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-02 10:49 Philipp Zabel [this message]
2022-12-05 12:53 ` [ptxdist] [APPLIED] " Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221202104954.682-1-p.zabel@pengutronix.de \
    --to=p.zabel@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox