From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Mon, 05 Dec 2022 13:54:30 +0100
Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33])
	by lore.white.stw.pengutronix.de with esmtps  (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
	(Exim 4.94.2)
	(envelope-from <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1p2AzN-00BcLA-Qt
	for lore@lore.pengutronix.de; Mon, 05 Dec 2022 13:54:30 +0100
Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de)
	by metis.ext.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1p2AzN-0006Mr-O9; Mon, 05 Dec 2022 13:54:29 +0100
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.ext.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1p2Ayr-00057X-0c; Mon, 05 Dec 2022 13:53:57 +0100
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1p2Ayp-002TXf-IW; Mon, 05 Dec 2022 13:53:56 +0100
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1p2Ayp-00A5fO-Cm; Mon, 05 Dec 2022 13:53:55 +0100
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Mon,  5 Dec 2022 13:53:55 +0100
Message-Id: <20221205125355.2405002-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20221202104954.682-1-p.zabel@pengutronix.de>
References: <20221202104954.682-1-p.zabel@pengutronix.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] wlroots: allow to enable Xwayland support
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, 
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Sender: "ptxdist" <ptxdist-bounces@pengutronix.de>
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.ext.pengutronix.de); SAEximRunCond expanded to false

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