From b74845e7a1608a96af70e1b3ae4c6c28e5052e7a Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 31 May 2009 16:49:56 +0200
Subject: fix X issues

- missing xkbcmp
- missing files in libX11
- dependencies to other libraries
---
 package/xorg-server/Config.in |  3 +++
 package/xorg-server/Makefile  | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)

(limited to 'package/xorg-server')

diff --git a/package/xorg-server/Config.in b/package/xorg-server/Config.in
index b3dc66880..99409a37b 100644
--- a/package/xorg-server/Config.in
+++ b/package/xorg-server/Config.in
@@ -2,6 +2,9 @@ config ADK_PACKAGE_XORG_SERVER
 	prompt "xorg-server............................... X server"
 	tristate
 	default n
+	select ADK_PACKAGE_XKBCOMP
+	select ADK_PACKAGE_XKEYBOARD_CONFIG
+	select ADK_PACKAGE_LIBOPENSSL
 	select ADK_PACKAGE_LIBXKBFILE
 	select ADK_PACKAGE_LIBX11
 	select ADK_PACKAGE_LIBICE
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 9dd2ed8ec..2b6be24a2 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -11,6 +11,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		7aca5d0dc8b824d3dff6140e381e03df
 PKG_DESCR:=		Xorg server
 PKG_SECTION:=		x11
+PKG_DEPENDS:=		libopenssl
 PKG_URL:=		http://www.x.org
 PKG_SITES:=		${MASTER_SITE_XORG}
 
@@ -32,6 +33,27 @@ CONFIGURE_ARGS+=	--disable-xinerama \
 			--disable-afb \
 			--disable-xephyr \
 			--disable-xsdl \
+			--enable-freetype \
+			--disable-kdrive-vesa \
+			--disable-xfbdev \
+			--disable-xfake \
+			--disable-xsdl \
+			--disable-afb \
+			--disable-cfb \
+			--disable-mfb \
+			--disable-xnest \
+			--disable-xvfb \
+			--disable-xf86bigfont \
+			--disable-glx \
+			--disable-aiglx \
+			--enable-xv \
+			--disable-xvmc \
+			--disable-dri \
+			--disable-xace \
+			--disable-xephyr \
+			--with-xkb-output=/tmp \
+			--with-os-vendor=OpenADK \
+			--with-vendor-web="http://www.openadk.org" \
 			--enable-builtin-fonts
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
-- 
cgit v1.2.3