From f47d199ff89b8757be0ab41c837848d48e114779 Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Tue, 10 Apr 2012 08:24:07 +0000 Subject: xserver_xorg-server: Xvfb support Signed-off-by: Ismael Luceno Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/Config.in | 13 +++++++++++-- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 6 +++--- 2 files changed, 14 insertions(+), 5 deletions(-) (limited to 'package') diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index ddc03c6ae..4e284a0cb 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -56,14 +56,23 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER comment "xorg-xserver is BROKEN on AVR32" depends on BR2_avr32 +if BR2_PACKAGE_XSERVER_XORG_SERVER + config BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR bool "Null root cursor" - depends on BR2_PACKAGE_XSERVER_XORG_SERVER help Don't display root cursor. config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX bool "Enable AIGLX Extension" - depends on BR2_PACKAGE_XSERVER_XORG_SERVER help Enable/Use AIGLX extension. + +comment "Optional Servers" + +config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB + bool "Xvfb server" + help + Virtual frame buffer X server. + +endif diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 5913f7987..9b2d9aeef 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -58,11 +58,11 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \ host-pkg-config XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \ - --disable-xnest --disable-xephyr --disable-xvfb \ - --disable-dmx \ + --disable-xnest --disable-xephyr --disable-dmx \ --with-builder-addr=buildroot@uclibc.org \ CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1" \ - --with-fontdir=/usr/share/fonts/X11/ --localstatedir=/var + --with-fontdir=/usr/share/fonts/X11/ --localstatedir=/var \ + --$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb ifeq ($(BR2_PACKAGE_XSERVER_xorg),y) XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg -- cgit v1.2.3