From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 29 May 2024 16:03:35 +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 ) id 1sCJtv-001BI6-1N for lore@lore.pengutronix.de; Wed, 29 May 2024 16:03:35 +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 ) id 1sCJtv-0003jj-2r; Wed, 29 May 2024 16:03:35 +0200 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1sCJtV-0003j9-Eu; Wed, 29 May 2024 16:03:09 +0200 From: =?UTF-8?q?Sven=20P=C3=BCschel?= To: ptxdist@pengutronix.de Date: Wed, 29 May 2024 16:02:46 +0200 Message-Id: <20240529140246.2852923-1-s.pueschel@pengutronix.de> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH] xwayland: conditionally depend on libepoxy X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: =?UTF-8?q?Sven=20P=C3=BCschel?= Sender: "ptxdist" 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 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 --- 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