Fix xorg dependancy issues

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 6c89a8dce14fb933871d8ab881480d05e68ffc99..e936a35c03c33a733d23454f4fd6eab234e5a2a6 100644 (file)
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -1,5 +1,10 @@
+config BR2_PACKAGE_XSERVER_xorg
+       select BR2_PACKAGE_XSERVER_XORG_SERVER
+       bool "xorg-server placeholder"
+
 config BR2_PACKAGE_XSERVER_XORG_SERVER
        bool "xorg-server"
+       #select BR2_PACKAGE_XSERVER_xorg
        select BR2_PACKAGE_XLIB_LIBXFONT
        select BR2_PACKAGE_XLIB_LIBXKBUI
        select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
@@ -55,6 +60,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
          xorg-server 1.4
          No description available
 
+
 config BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR
     bool "Null root cursor"
     depends on BR2_PACKAGE_XSERVER_XORG_SERVER

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index f40cf2f966ecb20de467c51a5d13ad4a649a2d27..47c4e8152340a2efb3a5b77e2aa1cda828f0e9d8 100644 (file)
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -11,7 +11,7 @@ XSERVER_XORG_SERVER_AUTORECONF = NO
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
 XSERVER_XORG_SERVER_USE_CONFIG_CACHE = NO
 
-ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER),y)
+ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
 XSERVER_XORG_MESA_DEPS:=#mesa3d
 XSERVER_XORG_MESA_DIR:=#--with-mesa-source="$(BUILD_DIR)/Mesa-$(MESA3D_VERSION)"
 XSERVER_XORG_ENABLE_MODULAR:=--enable-xorg