From: James Mckenzie <jamesmck@taoand.(none)>
Date: Tue, 24 Nov 2009 12:17:56 +0000 (+0000)
Subject: Add X11 and cover dom0 in dog turds
X-Git-Url: http://xenbits.xen.org/gitweb?a=commitdiff_plain;h=4516091e22d41f0565c007d5cee726502487321b;p=xenclient%2Fbuild.git

Add X11 and cover dom0 in dog turds
---

diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk
index 5682b98..0b95fa6 100644
--- a/package/x11r7/mesa3d/mesa3d.mk
+++ b/package/x11r7/mesa3d/mesa3d.mk
@@ -31,7 +31,7 @@ $(MESA3D_DIR)/.configured: $(MESA3D_DIR)/.extracted
 		echo "SRC_DIRS = glx/x11 mesa glu glut/glx" && \
 		echo "USING_EGL = 0" && \
 		echo "X11_INCLUDES = " && \
-		echo "EXTRA_LIB_PATH = " && \
+		echo "EXTRA_LIB_PATH = -L$(STAGING_DIR)/usr/lib" && \
 		echo "PROGRAM_DIRS =" \
 	) >> $(MESA_CONFIG_FILE)
 	touch $@
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index ffb6ee7..56205ee 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -11,13 +11,14 @@ XSERVER_XORG_SERVER_AUTORECONF = NO
 XSERVER_XORG_SERVER_INSTALL_STAGING = YES
 
 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_MESA_DEPS:=#mesa3d
+XSERVER_XORG_MESA_DIR:=#--with-mesa-source="$(BUILD_DIR)/Mesa-$(MESA3D_VERSION)"
 XSERVER_XORG_ENABLE_MODULAR:=--enable-xorg
 else
 XSERVER_XORG_ENABLE_MODULAR:=--disable-xorg
 endif
 
+
 ifeq ($(BR2_PACKAGE_XSERVER_tinyx),y)
 XSERVER_XORG_ENABLE_KDRIVE:=--enable-kdrive --enable-xfbdev --disable-glx --disable-dri
 else
@@ -60,7 +61,7 @@ XSERVER_XORG_SERVER_CONF_OPT = $(XSERVER_XORG_ENABLE_KDRIVE) \
 		--enable-freetype $(XSERVER_XORG_ENABLE_MODULAR) \
 		--disable-config-hal $(XSERVER_XORG_MESA_DIR) \
 		--disable-xnest --disable-xephyr --disable-xvfb \
-		$(XSERVER_XORG_NULL_CURSOR) \
+		$(XSERVER_XORG_NULL_CURSOR) --disable-glx --disable-dri \
 		CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1"
 
 XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data