Packages: X11: give ability to build xorg-server (not kdrive)

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

2 files changed, 44 insertions, 11 deletions

diff --git a/packages/x11/xserver/xserver.kconfig b/packages/x11/xserver/xserver.kconfig
index 699bcf7..64aea03 100644
--- a/packages/x11/xserver/xserver.kconfig
+++ b/packages/x11/xserver/xserver.kconfig
@@ -24,7 +24,7 @@
 ################################################################################
 
 config EMBTK_HAVE_XSERVER
-	bool "Have xserver (kdrive)"
+	bool "Have X window system server"
 	select EMBTK_HAVE_UTILMACROS
 	select EMBTK_HAVE_BIGREQSPROTO
 	select EMBTK_HAVE_COMPOSITEPROTO
@@ -48,7 +48,28 @@ config EMBTK_HAVE_XSERVER
 	select EMBTK_HAVE_OPENSSL
 	select EMBTK_HAVE_PIXMAN
 	help
-		xserver (actually kdrive)
+		Have a X server in your root file system
+choice
+	prompt "X server variant to install"
+	depends on EMBTK_HAVE_XSERVER
+	help
+		Choose which variant of X server to install
+	config EMBTK_HAVE_XSERVER_KDRIVE
+		bool "kdrive X server: Xfbdev"
+		help
+			KDrive is a small X Window System server implementation.
+			It is commonly used in embedded systems with the need
+			for a very thin X server.
+			Kdriver is almost unmaintained now days, despite the
+			fact it is integrated in the official xorg-server
+			package.
+	config EMBTK_HAVE_XSERVER_XORG
+		bool "xorg-server X server"
+		select KEMBTK_EGLIBC_OPTION_EGLIBC_STREAMS if EMBTK_CLIB_EGLIBC
+		select EMBTK_HAVE_LIBPCIACCESS
+		help
+			Traditional X server found on most Linux distributions.
+endchoice
 choice
 	prompt "xserver version you wish"
 	depends on EMBTK_HAVE_XSERVER
diff --git a/packages/x11/xserver/xserver.mk b/packages/x11/xserver/xserver.mk
index 9cd92aa..1652aa8 100644
--- a/packages/x11/xserver/xserver.mk
+++ b/packages/x11/xserver/xserver.mk
@@ -28,11 +28,17 @@ XSERVER_SITE := http://ftp.x.org/pub/individual/xserver
 XSERVER_PACKAGE := xorg-server-$(XSERVER_VERSION).tar.bz2
 XSERVER_BUILD_DIR := $(PACKAGES_BUILD)/xorg-server-$(XSERVER_VERSION)
 
-XSERVER_BINS = Xfbdev
+XSERVER_BINS = Xfbdev X Xorg
 XSERVER_SBINS =
-XSERVER_INCLUDES =
-XSERVER_LIBS = xorg/protocol.txt
-XSERVER_PKGCONFIGS =
+XSERVER_INCLUDES = xorg
+XSERVER_LIBS = xorg
+XSERVER_PKGCONFIGS = xorg-server.pc
+
+ifeq ($(CONFIG_EMBTK_HAVE_XSERVER_KDRIVE),y)
+XSERVER_VARIANT := --enable-kdrive --disable-xorg
+else
+XSERVER_VARIANT := --disable-kdrive --enable-xorg
+endif
 
 XSERVER_DEPS := utilmacros_install bigreqsproto_install compositeproto_install \
 		damageproto_install fixesproto_install fontsproto_install \
@@ -42,15 +48,21 @@ XSERVER_DEPS := utilmacros_install bigreqsproto_install compositeproto_install \
 		xextproto_install xproto_install libxfont_install \
 		libxkbfile_install xtrans_install openssl_install
 
-XSERVER_CONFIGURE_OPTS := --enable-kdrive --with-sha1=libcrypto \
-		--disable-xorg --disable-aiglx --disable-glx-tls --disable-dga \
+ifeq ($(CONFIG_EMBTK_HAVE_XSERVER_XORG),y)
+XSERVER_DEPS += libpciaccess_install
+endif
+
+XSERVER_CONFIGURE_OPTS := $(XSERVER_VARIANT) --with-sha1=libcrypto \
+		--disable-dga --disable-dri --disable-xvmc --disable-fontserver \
 		--disable-xdmcp --disable-xdm-auth-1 --disable-config-hal \
 		--disable-xf86vidmode --disable-xf86bigfont --disable-xnest \
 		--disable-xquartz --disable-xwin --disable-xfake \
 		--disable-install-setuid --disable-xvfb --disable-dmx \
-		--disable-glx --disable-xinerama --disable-xfree86-utils \
-		--disable-screensaver --disable-dri --disable-tcp-transport \
-		--disable-ipv6
+		--disable-glx --disable-aiglx --disable-glx-tls --disable-libdrm \
+		--disable-xinerama --disable-xace --disable-dbe --disable-dpms \
+		--disable-vgahw --disable-xfree86-utils --disable-vbe \
+		--disable-int10-module --disable-xaa --disable-screensaver \
+		--disable-tcp-transport --disable-ipv6 --disable-secure-rpc
 
 ifeq ($(CONFIG_EMBTK_HAVE_XSERVER_WITH_TSLIB),y)
 XSERVER_DEPS += tslib_install