From 5cfe18eaf0efb3a8fe86e4f6eb03f78e2d5a08bd Mon Sep 17 00:00:00 2001 From: James Mckenzie Date: Wed, 25 Nov 2009 06:48:59 +0000 Subject: [PATCH] Fix xorg dependancy issues --- package/x11r7/xserver_xorg-server/Config.in | 6 ++++++ package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 6c89a8d..e936a35 100644 --- 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 f40cf2f..47c4e81 100644 --- 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 -- 2.39.5