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

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

diff --git a/Xorg/xorg/xserver/xorg-server/Makefile b/Xorg/xorg/xserver/xorg-server/Makefile
index 88f0ae2e36e32dfa46e1a17a466edf49ca9b1f7d..41a9a808b6494b65ff7f617293f442ae7162a110 100644 (file)
--- a/Xorg/xorg/xserver/xorg-server/Makefile
+++ b/Xorg/xorg/xserver/xorg-server/Makefile
@@ -1,25 +1,30 @@
 #
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-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:=xorg-server
+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:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/xserver/$(PKG_NAME)-$(PKG_VERSION)/
+PKG_MD5SUM:=dda7842467cda6018fdc87e6002e4db1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/xserver/$(PKG_NAME)-$(PKG_VERSION)/
 PKG_BUILD_DEPENDS:=randrproto renderproto fixesproto damageproto xcmiscproto \
                                   xextproto xproto scrnsaverproto bigreqsproto resourceproto \
                                   fontsproto inputproto kbproto videoproto resourceproto \
-                                  xf86dgaproto xtrans xf86driproto
+                                  compositeproto xf86dgaproto xtrans xf86driproto dri2proto
 
 PKG_INSTALL:=1
+PKG_FIXUP:=libtool
+
+PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_xserver-xorg CONFIG_PACKAGE_xserver-common
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -45,6 +50,7 @@ $(call Package/xorg/Default)
   TITLE:=Xorg xserver
   DEPENDS:=+xserver-common \
   +libpthread \
+  +xkbcomp \
   +libxkbfile \
   +libXfont \
   +libXau \
@@ -58,12 +64,6 @@ $(call Package/xorg/Default)
   @DISPLAY_SUPPORT
 endef
 
-define Package/xserver-xorg-config
-$(call Package/xorg/Default)
-  TITLE:=Xorg server configuration tools
-  DEPENDS:=xserver-xorg
-endef
-
 define Package/xserver-common
 $(call Package/xorg/Default)
   TITLE:=meta-package
@@ -71,56 +71,74 @@ endef
 
 define Build/Configure
        $(call Build/Configure/Default, \
-               --enable-xorg \
-               --enable-dri \
-               --disable-kdrive \
-               --disable-cfb \
-               --disable-afb \
-               --disable-mfb \
-               --disable-aiglx \
+               --disable-dependency-tracking \
+               --disable-debug \
+               --disable-unit-tests \
+               --disable-builddocs \
                --disable-glx-tls \
+               --disable-composite \
+               --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 \
+               --enable-dri2 \
+               --disable-xinerama \
                --disable-xf86vidmode \
+               --disable-xace \
+               --disable-xselinux \
+               --disable-xsecurity \
+               --disable-xcalibrate \
+               --disable-tslib \
+               --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 \
+               --enable-xorg \
+               --disable-dmx \
+               --disable-xvfb \
                --disable-xnest \
                --disable-xquartz \
+               --disable-standalone-xpbproxy \
                --disable-xwin \
-               --disable-x11app \
-               --disable-xsdl \
+               --disable-kdrive \
                --disable-xfake \
-               --disable-install-setuid \
-               --disable-kbd_mode \
-               --disable-xvfb \
-               --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-xfbdev \
+               --disable-installsetuid \
+               --disable-secure-rpc \
+               --enable-silent-rules \
+               --disable-shave \
        )
 endef
 
 define Package/xserver-common/install
-       $(INSTALL_DIR) $(1)/etc/{init.d,config}
+       $(INSTALL_DIR) $(1)/etc/{init.d,config,X11}
        $(INSTALL_BIN) \
                ./files/x.init \
                $(1)/etc/init.d/x11
-       $(if $(X_CONFIG), \
+       $(INSTALL_DATA) ./files/tmp/x11.uci \
+               $(1)/etc/config/x11
+       test -f ./files/config.xorg/$(X_CONFIG) && \
                $(INSTALL_DATA) \
-                       ./files/config/$(X_CONFIG) \
-                       $(1)/etc/config/x11 \
-       )
+                       ./files/config.xorg/$(X_CONFIG) \
+                       $(1)/etc/X11/xorg.conf
+#      test -f ./files/config.uci/$(X_CONFIG) && \
+#              $(INSTALL_DATA) \
+#                      ./files/config.uci/$(X_CONFIG) \
+#                      $(1)/etc/config/x11
 endef
 
 define Package/xserver-xorg/install
@@ -151,12 +169,18 @@ define Build/InstallDev
        $(INSTALL_DATA) \
                $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
                $(1)/usr/lib/pkgconfig/
+
        $(if $(CONFIG_PACKAGE_xserver-xorg), \
                $(INSTALL_DIR) $(1)/usr/include/xorg; \
                $(INSTALL_DATA) \
                        $(PKG_INSTALL_DIR)/usr/include/xorg/*.h \
                        $(1)/usr/include/xorg/; \
        )
+       $(INSTALL_DIR) $(1)/mk
+       $(INSTALL_DATA) \
+               ./files/xorg-driver.mk \
+               $(1)/mk/
+       $(SED) 's,@VERSION@,$(PKG_VERSION),' $(1)/mk/xorg-driver.mk
 endef
 
 $(eval $(call BuildPackage,xserver-common))