From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 12 Sep 2024 14:15:13 +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 1soijC-003mrh-1M for lore@lore.pengutronix.de; Thu, 12 Sep 2024 14:15:13 +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 1soijB-0006Hb-Lz; Thu, 12 Sep 2024 14:15:13 +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 ) id 1soift-0001ki-8v; Thu, 12 Sep 2024 14:11:49 +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 ) id 1soifs-007NRG-SV; Thu, 12 Sep 2024 14:11:48 +0200 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1soifs-00BGn3-2i; Thu, 12 Sep 2024 14:11:48 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 12 Sep 2024 14:11:48 +0200 Message-Id: <20240912121148.2686112-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240815115743.2888439-1-p.zabel@pengutronix.de> References: <20240815115743.2888439-1-p.zabel@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] xwayland: fix build with glx without glamor 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: Philipp Zabel 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 Thanks, applied as 7cb6f66cc94fd8a59b380a1208c669081d79edb0. Michael [sent from post-receive hook] On Thu, 12 Sep 2024 14:11:48 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20240815115743.2888439-1-p.zabel@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/xwayland.in b/rules/xwayland.in > index a662ec2ec032..c2b0de95b280 100644 > --- a/rules/xwayland.in > +++ b/rules/xwayland.in > @@ -20,7 +20,7 @@ menuconfig XWAYLAND > select XORG_LIB_XSHMFENCE > select XORG_LIB_XTRANS > select LIBEPOXY if XWAYLAND_GLAMOR > - select MESALIB if XWAYLAND_GLAMOR > + select MESALIB if XWAYLAND_GLAMOR || XWAYLAND_EXT_GLX > select MESALIB_GBM if XWAYLAND_GLAMOR > select MESALIB_GLX if XWAYLAND_EXT_GLX > select XORG_LIB_XV if XWAYLAND_EXT_XV