From mboxrd@z Thu Jan  1 00:00:00 1970
Delivery-date: Mon, 10 Jun 2024 21:43:08 +0200
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 <ptxdist-bounces+lore=lore.pengutronix.de@pengutronix.de>)
	id 1sGkv6-003rCE-0W
	for lore@lore.pengutronix.de;
	Mon, 10 Jun 2024 21:43:08 +0200
Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de)
	by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92)
	(envelope-from <ptxdist-bounces@pengutronix.de>)
	id 1sGkv5-0007gZ-Rd; Mon, 10 Jun 2024 21:43:07 +0200
Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2])
 by metis.whiteo.stw.pengutronix.de with esmtps
 (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92)
 (envelope-from <mol@pengutronix.de>)
 id 1sGktc-0006Bt-Pl; Mon, 10 Jun 2024 21:41:36 +0200
Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de)
 by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls
 TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2)
 (envelope-from <mol@pengutronix.de>)
 id 1sGktc-001NRD-DD; Mon, 10 Jun 2024 21:41:36 +0200
Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96)
 (envelope-from <mol@pengutronix.de>) id 1sGktc-008v3P-19;
 Mon, 10 Jun 2024 21:41:36 +0200
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Date: Mon, 10 Jun 2024 21:41:36 +0200
Message-Id: <20240610194136.2125883-1-m.olbrich@pengutronix.de>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20240529140246.2852923-1-s.pueschel@pengutronix.de>
References: <20240529140246.2852923-1-s.pueschel@pengutronix.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: Re: [ptxdist] [APPLIED] xwayland: conditionally depend on libepoxy
X-BeenThere: ptxdist@pengutronix.de
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de>
List-Unsubscribe: <https://metis.pengutronix.de/mailman/options/ptxdist>,
 <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe>
List-Archive: <https://metis.pengutronix.de/mailman/private/ptxdist/>
List-Post: <mailto:ptxdist@pengutronix.de>
List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help>
List-Subscribe: <https://metis.pengutronix.de/mailman/listinfo/ptxdist>,
 <mailto:ptxdist-request@pengutronix.de?subject=subscribe>
Reply-To: ptxdist@pengutronix.de
Cc: =?UTF-8?q?Sven=20P=C3=BCschel?= <s.pueschel@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.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false

Thanks, applied as fbfbda705b3abcd5770ed4add6062c9a923bc1a1.

Michael

[sent from post-receive hook]

On Mon, 10 Jun 2024 21:41:36 +0200, Sven Püschel <s.pueschel@pengutronix.de> wrote:
> XWayland only needs libepoxy if the glamor option is enabled. Also added
> wayland-protocols as an explicit dependency, as it was previously only
> implicitly depended on through libepoxy.
> 
> Signed-off-by: Sven Püschel <s.pueschel@pengutronix.de>
> Message-Id: <20240529140246.2852923-1-s.pueschel@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/xwayland.in b/rules/xwayland.in
> index 9f23c6265de9..a662ec2ec032 100644
> --- a/rules/xwayland.in
> +++ b/rules/xwayland.in
> @@ -6,11 +6,11 @@ menuconfig XWAYLAND
>  	select HOST_MESON
>  	select LIBC_M
>  	select LIBDRM
> -	select LIBEPOXY
>  	select LIBXCVT
>  	select NETTLE
>  	select PIXMAN
>  	select WAYLAND
> +	select WAYLAND_PROTOCOLS
>  	select XORGPROTO
>  	select XORG_LIB_FONTENC
>  	select XORG_LIB_XAU
> @@ -19,6 +19,7 @@ menuconfig XWAYLAND
>  	select XORG_LIB_XKBFILE
>  	select XORG_LIB_XSHMFENCE
>  	select XORG_LIB_XTRANS
> +	select LIBEPOXY			if XWAYLAND_GLAMOR
>  	select MESALIB			if XWAYLAND_GLAMOR
>  	select MESALIB_GBM		if XWAYLAND_GLAMOR
>  	select MESALIB_GLX		if XWAYLAND_EXT_GLX