Thanks, applied as 0569cddf244f6ef082ef9abf8fb648f478198799. Michael
[sent from post-receive hook] On Mon, 05 Dec 2022 13:53:55 +0100, Philipp Zabel <[email protected]> wrote: > Signed-off-by: Philipp Zabel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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
