From eedbd6f97d51a0049ec512de26541465403ab06f Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Sun, 10 Oct 2021 21:19:36 +0200 Subject: [PATCH] package/x11r7/xserver_xorg-server: Add support for Xephyr Signed-off-by: Ismael Luceno Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- 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 4dc15435a8..7f37f2f1ac 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 2d276f90d5..6d0876f1fd 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)