some bugfixes and aesthetical changes regarding xserver

SVN-Revision: 13306

diff --git a/Xorg/xserver/xorg-xserver/Config.in b/Xorg/xserver/xorg-xserver/Config.in
index 32e2d8dc99ee1048da2fcb381acf97c8f0eb452e..1644e0602a47d7116d4692cdb0d63a803e17177c 100644 (file)
--- a/Xorg/xserver/xorg-xserver/Config.in
+++ b/Xorg/xserver/xorg-xserver/Config.in
@@ -1,34 +1,28 @@
-menu "kdrive library support --->"
-depends on PACKAGE_xserver-kdrive-xvesa || PACKAGE_xserver-kdrive-xfbdev
+menu "kdrive library support"
+depends on PACKAGE_xserver-kdrive-xvesa || PACKAGE_xserver-kdrive-xfbdev || PACKAGE_xserver-kdrive-xglamo || PACKAGE_xserver-kdrive-xephyr
 
        config X_TSLIB
                bool
                prompt "enable support for tslib"
-               depends PACKAGE_xserver-kdrive-xvesa || PACKAGE_xserver-kdrive-xfbdev
 
 #      config X_XCALIBRATE
 #              bool
 #              prompt "enable support for xcalibrate"
-#              depends PACKAGE_xserver-kdrive-xvesa || PACKAGE_xserver-kdrive-xfbdev
 
 #      config X_DRI
 #              bool
 #              prompt "enable support for DRI"
-#              depends PACKAGE_xserver-kdrive-xvesa || PACKAGE_xserver-kdrive-xfbdev
 
        config X_COMPOSITE
                bool
                prompt "enable support for composite"
-               depends PACKAGE_xserver-kdrive-xvesa || PACKAGE_xserver-kdrive-xfbdev
 
        config X_XINERAMA
                bool
                prompt "enable support for xinerama"
-               depends PACKAGE_xserver-kdrive-xvesa || PACKAGE_xserver-kdrive-xfbdev
 
 #      config X_GLX
 #              bool
 #              prompt "enable support for GLX"
-#              depends PACKAGE_xserver-kdrive-xvesa || PACKAGE_xserver-kdrive-xfbdev
 
 endmenu

diff --git a/Xorg/xserver/xorg-xserver/Makefile b/Xorg/xserver/xorg-xserver/Makefile
index 6e2e9c176d2ce11c547e34ed3dc81e37c257aa7a..bea37257a048094cab8e8b87d062fd92bc28ae47 100644 (file)
--- a/Xorg/xserver/xorg-xserver/Makefile
+++ b/Xorg/xserver/xorg-xserver/Makefile
@@ -29,7 +29,6 @@ CONFIGURE_ARGS+= \
        --disable-dga \
        --disable-xdmcp \
        --disable-xdm-auth-1 \
-       --disable-dri \
        --disable-config-hal \
        --disable-xf86misc \
        --disable-xf86vidmode \
@@ -50,8 +49,6 @@ CONFIGURE_ARGS+= \
        --disable-xtrap \
        --disable-dmx \
        --disable-glx \
-       --enable-xorg \
-       --disable-xephyr \
        --enable-builtin-fonts \
        --with-default-font-path=built-ins \
 
@@ -108,15 +105,12 @@ define Package/xserver-common/config
        source "$(SOURCE)/Config.in"
 endef
 
-# TODO: Move config file to indepedndent packages
+X_CONFIG=generic
 ifeq ($(CONFIG_TARGET_olpc),y)
   X_CONFIG=olpc
-else
+endif
 ifeq ($(CONFIG_TARGET_om_gta02),y)
   X_CONFIG=om_gta02
-else
-  X_CONFIG=generic
-endif
 endif
 
 define Package/xorg/Default
@@ -185,6 +179,18 @@ $(call Package/xserver/Default)
   +X_XINERAMA:xineramaproto
 endef
 
+define Package/xserver-kdrive-xephyr
+$(call Package/xserver/Default)
+  PROVIDES:=xserver
+  TITLE:=Kdrive ephyr xserver
+  DEPENDS+=+X_TSLIB:tslib \
+  +X_DRI:xf86driproto \
+  +X_DRI:libdrm \
+  +X_XCALIBRATE:calibrateproto \
+  +X_COMPOSITE:compositeproto \
+  +X_XINERAMA:xineramaproto
+endef
+
 define Package/xserver-xorg-config
 $(call Package/xorg/Default)
   TITLE:=Xorg server configuration tools
@@ -193,21 +199,21 @@ endef
 
 define Package/xserver-common
 $(call Package/xorg/Default)
-  TITLE:=Files shared by the different webservers
+  TITLE:=meta-package
 endef
 
 define Build/Configure
        $(call Build/Configure/Default, \
-               $(if $(CONFIG_PACKAGE_xserver-xorg),--enable-xorg,--disable-xorg) \
-               $(if $(CONFIG_PACKAGE_xserver-xvesa), \
+               $(if $(CONFIG_PACKAGE_xserver-xorg),--enable-xorg --disable-kdrive,--disable-xorg --enable-kdrive) \
+               $(if $(CONFIG_PACKAGE_xserver-kdrive-xvesa), \
                        --enable-kdrive-vesa, \
                        --disable-kdrive-vesa) \
-               $(if $(CONFIG_PACKAGE_xserver-xfbdev), \
+               $(if $(CONFIG_PACKAGE_xserver-kdrive-xfbdev), \
                        --enable-xfbdev, \
                        --disable-xfbdev) \
-               $(if $(CONFIG_PACKAGE_xserver-xfbdev)$(CONFIG_PACKAGE_xserver-xvesa), \
-                       --enable-kdrive, \
-                       --disable-kdrive) \
+               $(if $(CONFIG_PACKAGE_xserver-kdrive-xephyr), \
+                       --enable-xephyr, \
+                       --disable-xephyr) \
                $(if $(CONFIG_X_TSLIB),--enable-tslib,--disable-tslib) \
                $(if $(CONFIG_X_COMPOSITE),--enable-composite,--disable-composite) \
                $(if $(CONFIG_X_XINERAMA),--enable-xinerama,--disable-xinerama) \