[ptxdist] [PATCH] xwayland: conditionally depend on libepoxy

[ptxdist] [PATCH] xwayland: conditionally depend on libepoxy

[Sven Püschel]

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>
---
 rules/xwayland.in | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/xwayland.in b/rules/xwayland.in
index 9f23c6265..a662ec2ec 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
-- 
2.39.2

Re: [ptxdist] [APPLIED] xwayland: conditionally depend on libepoxy

[Michael Olbrich]

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