[packages] xorg-kdrive: Add missing dependencies and 600x800 mode

[openwrt/svn-archive/archive.git] / Xorg / xorg / xserver / xorg-kdrive / Makefile

diff --git a/Xorg/xorg/xserver/xorg-kdrive/Makefile b/Xorg/xorg/xserver/xorg-kdrive/Makefile
index 6c23468b988ad6e995aa09f4dae4b8b1d8b15370..aeaa1ad399d2da5eeb632abb3e0deccbf8fbd249 100644 (file)
--- a/Xorg/xorg/xserver/xorg-kdrive/Makefile
+++ b/Xorg/xorg/xserver/xorg-kdrive/Makefile
@@ -1,32 +1,38 @@
 #
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$ 
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xserver-kdrive
+PKG_VERSION:=1.7.1
 PKG_RELEASE:=1
-PKG_VERSION:=1.5.1
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/xserver/
+
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/xserver/
 PKG_SOURCE:=xorg-server-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/xserver/$(PKG_NAME)/xorg-server-$(PKG_VERSION)/
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/xserver/$(PKG_NAME)/xorg-server-$(PKG_VERSION)/
+PKG_MD5SUM:=dda7842467cda6018fdc87e6002e4db1
+
 PKG_BUILD_DEPENDS:=randrproto renderproto fixesproto damageproto xcmiscproto \
                                   xextproto xproto bigreqsproto resourceproto \
                                   fontsproto inputproto kbproto videoproto resourceproto \
                                   xf86dgaproto xtrans xf86driproto calibrateproto \
                                   compositeproto xineramaproto
+
+PKG_CONFIG_DEPENDS := \
+       CONFIG_PACKAGE-xserver-kdrive-fbdev \
+       CONFIG_PACKAGE_xserver-kdrive-xephyr \
+    CONFIG_X_TSLIB CONFIG_X_COMPOSITE \
+       CONFIG_X_XINERAMA CONFIG_X_XCALIBRATE
+
+PKG_FIXUP:=libtool
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/xserver-kdrive-xvesa/config
-       source "$(SOURCE)/Config.in"
-endef
-
 define Package/xserver-kdrive/Default
   PROVIDES:=xserver
   SECTION:=xorg-server
@@ -43,15 +49,11 @@ define Package/xserver-kdrive/Default
   +libfontenc \
   +pixman \
   +libopenssl \
+  +libdrm \
+  +xkbcomp \
+  +xkbdata \
   @DISPLAY_SUPPORT \
-  +X_TSLIB:tslib \
-  +X_DRI:libdrm
-endef
-
-define Package/xserver-kdrive-xvesa
-$(call Package/xserver-kdrive/Default)
-  TITLE:=Kdrive vesa xserver
-  DEPENDS+= @TARGET_x86
+  +X_TSLIB:tslib
 endef
 
 define Package/xserver-kdrive-xfbdev
@@ -62,19 +64,12 @@ endef
 define Package/xserver-kdrive-xephyr
 $(call Package/xserver-kdrive/Default)
   TITLE:=Kdrive ephyr xserver
+  DEPENDS += @BROKEN
 endef
 
-STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar, \
-       CONFIG_PACKAGE_xserver-kdrive-xvesa CONFIG_PACKAGE-xserver-kdrive-fbdev \
-       CONFIG_PACKAGE_xserver-kdrive-xephyr CONFIG_X_TSLIB CONFIG_X_COMPOSITE \
-       CONFIG_X_XINERAMA CONFIG_X_XCALIBRATE)
-
 define Build/Configure
        $(call Build/Configure/Default, \
                --enable-kdrive \
-               $(if $(CONFIG_PACKAGE_xserver-kdrive-xvesa), \
-                       --enable-kdrive-vesa, \
-                       --disable-kdrive-vesa) \
                $(if $(CONFIG_PACKAGE_xserver-kdrive-xfbdev), \
                        --enable-xfbdev, \
                        --disable-xfbdev) \
@@ -85,39 +80,50 @@ define Build/Configure
                $(if $(CONFIG_X_COMPOSITE),--enable-composite,--disable-composite) \
                $(if $(CONFIG_X_XINERAMA),--enable-xinerama,--disable-xinerama) \
                $(if $(CONFIG_X_XCALIBRATE),--enable-xcalibrate,--disable-xcalibrate) \
-               --disable-xorg \
-               --disable-aiglx \
+               --disable-dependency-tracking \
+               --disable-debug \
+               --disable-unit-tests \
+               --disable-builddocs \
                --disable-glx-tls \
+               --disable-shm \
+               --disable-xres \
+               --disable-record \
+               --enable-xv \
+               --enable-xvmc \
                --disable-dga \
+               --disable-screensaver \
                --disable-xdmcp \
                --disable-xdm-auth-1 \
-               --disable-config-hal \
-               --disable-xf86misc \
+               --disable-glx \
+               --enable-dri \
+               --disable-dri2 \
                --disable-xf86vidmode \
+               --disable-xace \
+               --disable-xselinux \
+               --disable-xsecurity \
+               --disable-multibuffer \
+               --disable-dbe \
                --disable-xf86bigfont \
-               --disable-xorgcfg \
-               --disable-xkb \
+               --enable-dpms \
+               --disable-config-dbus \
+               --disable-config-hal \
+               --disable-xfree86-utils \
+               --disable-xaa \
+               --enable-vgahw \
+               --disable-vbe \
+               --enable-int10-module \
+               --disable-xorg \
+               --disable-dmx \
+               --disable-xvfb \
                --disable-xnest \
                --disable-xquartz \
+               --disable-standalone-xpbproxy \
                --disable-xwin \
-               --disable-x11app \
-               --disable-xsdl \
                --disable-xfake \
-               --disable-install-setuid \
-               --disable-kbd_mode \
-               --disable-xvfb \
-               --disable-xevie \
-               --disable-xprint \
-               --disable-xtrap \
-               --disable-dmx \
-               --disable-glx \
-               --disable-xinerama \
-               --disable-xfree86-utils \
-               --disable-cup \
-               --disable-xevie \
-               --disable-evi \
-               --disable-screensaver \
-               --enable-builtin-fonts \
+               --disable-installsetuid \
+               --disable-secure-rpc \
+               --enable-silent-rules \
+               --disable-shave \
        )
 endef
 
@@ -128,13 +134,6 @@ define Package/xserver-kdrive-xfbdev/install
                $(1)/usr/bin/
 endef
 
-define Package/xserver-kdrive-xvesa/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) \
-               $(PKG_INSTALL_DIR)/usr/bin/Xvesa \
-               $(1)/usr/bin/
-endef
-
 define Package/xserver-kdrive-xephyr/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) \
@@ -142,6 +141,5 @@ define Package/xserver-kdrive-xephyr/install
                $(1)/usr/bin/
 endef
 
-$(eval $(call BuildPackage,xserver-kdrive-xvesa))
 $(eval $(call BuildPackage,xserver-kdrive-xfbdev))
 $(eval $(call BuildPackage,xserver-kdrive-xephyr))