From 4fcc7439fb4e203f510e133a21e1bf9150b79368 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Tue, 3 Nov 2009 21:04:43 +0100
Subject: update X11, kerberos, samba, bluez

- fix some ipkg issues with ubuntu
- use grub2 for alix1c, no grub1 dependency on host
- boots up on alix1c
- fix some bcm203x problems
---
 package/xorg-server/Makefile | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

(limited to 'package/xorg-server')

diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 935195bdb..34b77a158 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		xorg-server
-PKG_VERSION:=		1.5.1
+PKG_VERSION:=		1.7.1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		7aca5d0dc8b824d3dff6140e381e03df
+PKG_MD5SUM:=		913a672cbd6da516de15965d594e20b9
 PKG_DESCR:=		Xorg server
 PKG_SECTION:=		x11
 PKG_DEPENDS:=		libopenssl
@@ -17,36 +17,25 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE:=	gnu
 CONFIGURE_ARGS+=	\
-			--enable-builtin-fonts \
 			--enable-dga \
 			--enable-xorg \
 			--enable-xv \
-			--disable-afb \
 			--disable-aiglx \
-			--disable-cfb \
 			--disable-config-hal \
-			--disable-cup \
-			--disable-evi \
 			--disable-dpms \
 			--disable-dri \
 			--disable-dri2 \
-			--disable-freetype \
 			--disable-glx \
-			--disable-kdrive-vesa \
-			--disable-mfb \
 			--disable-xace \
 			--disable-xephyr \
-			--disable-xevie \
 			--disable-xf86bigfont \
-			--disable-xf86misc \
 			--disable-xf86vidmode \
 			--disable-xfake \
 			--disable-xfbdev \
 			--disable-xinerama \
 			--disable-xnest \
-			--disable-xprint \
 			--disable-xsdl \
 			--disable-xselinux \
 			--disable-xcsecurity \
@@ -55,8 +44,8 @@ CONFIGURE_ARGS+=	\
 			--with-xkb-output=/tmp \
 			--with-os-vendor=OpenADK \
 			--with-vendor-web="http://www.openadk.org"
-BUILD_STYLE=		auto
-INSTALL_STYLE=		auto
+BUILD_STYLE:=		auto
+INSTALL_STYLE:=		auto
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin
@@ -66,8 +55,6 @@ post-install:
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules
 	${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*.so \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
-	${CP} ${WRKINST}/usr/lib/xorg/modules/fonts/*.so \
-		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/fonts
 	${CP} ${WRKINST}/usr/lib/xorg/modules/linux/*.so \
 		$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux
 	${CP} ${WRKINST}/usr/lib/xorg/modules/multimedia/*.so \
-- 
cgit v1.2.3