| Message ID | 20211010191936.15090-1-ismael@iodev.co.uk |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [RESEND] package/x11r7/xserver_xorg-server: Add support for Xephyr | expand |
On 10/10/2021 21:19, Ismael Luceno wrote: > Signed-off-by: Ismael Luceno <ismael@iodev.co.uk> Applied to master, thanks. Regards, Arnout > --- > package/x11r7/xserver_xorg-server/Config.in | 5 +++++ > package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- > 2 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in > index 4dc15435a8aa..7f37f2f1acd4 100644 > --- a/package/x11r7/xserver_xorg-server/Config.in > +++ b/package/x11r7/xserver_xorg-server/Config.in > @@ -82,4 +82,9 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB > help > Virtual frame buffer X server. > > +config BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR > + bool "Xephyr server" > + help > + Xephyr nested X server; successor to Xnest. > + > endif > diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk > index 2d276f90d56b..6d0876f1fdbe 100644 > --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk > +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk > @@ -47,12 +47,12 @@ XSERVER_XORG_SERVER_CONF_OPTS = \ > --disable-config-hal \ > --enable-record \ > --disable-xnest \ > - --disable-xephyr \ > --disable-dmx \ > --disable-unit-tests \ > --with-builder-addr=buildroot@buildroot.org \ > CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1 -O2" \ > --with-fontrootdir=/usr/share/fonts/X11/ \ > + --$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR),en,dis)able-xephyr \ > --$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb > > ifeq ($(BR2_PACKAGE_SYSTEMD),y) >
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 4dc15435a8aa..7f37f2f1acd4 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -82,4 +82,9 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB help Virtual frame buffer X server. +config BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR + bool "Xephyr server" + help + Xephyr nested X server; successor to Xnest. + endif diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 2d276f90d56b..6d0876f1fdbe 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -47,12 +47,12 @@ XSERVER_XORG_SERVER_CONF_OPTS = \ --disable-config-hal \ --enable-record \ --disable-xnest \ - --disable-xephyr \ --disable-dmx \ --disable-unit-tests \ --with-builder-addr=buildroot@buildroot.org \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1 -O2" \ --with-fontrootdir=/usr/share/fonts/X11/ \ + --$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XEPHYR),en,dis)able-xephyr \ --$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb ifeq ($(BR2_PACKAGE_SYSTEMD),y)
Signed-off-by: Ismael Luceno <ismael@iodev.co.uk> --- package/x11r7/xserver_xorg-server/Config.in | 5 +++++ package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)