summaryrefslogtreecommitdiffstats
path: root/package/x11r7/xserver_xorg-server
diff options
context:
space:
mode:
authorDarius Augulis <augulis.darius@gmail.com>2010-04-29 23:24:18 +0300
committerPeter Korsgaard <jacmet@sunsite.dk>2010-05-01 22:19:26 +0200
commit494149b989867d65b24f08cb428c596d0a0c3bc6 (patch)
tree63c51e13f02baa93c1e30ec651c6c155b557cd3b /package/x11r7/xserver_xorg-server
parent20c59892f9560184831154ab37bf519556303183 (diff)
downloadbuildroot-novena-494149b989867d65b24f08cb428c596d0a0c3bc6.tar.gz
buildroot-novena-494149b989867d65b24f08cb428c596d0a0c3bc6.zip
Make Mesa3D optional for X11
[Peter: XF86DRIPROTO should only be selected if mesa is enabled] Signed-off-by: Darius Augulis <augulis.darius@gmail.com> Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/x11r7/xserver_xorg-server')
-rw-r--r--package/x11r7/xserver_xorg-server/Config.in3
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk8
2 files changed, 7 insertions, 4 deletions
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 6aa4a0326..d57467568 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
bool "xorg-server"
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_MCOOKIE
- select BR2_PACKAGE_MESA3D if BR2_PACKAGE_XSERVER_xorg
select BR2_PACKAGE_OPENSSL
select BR2_PACKAGE_PIXMAN
select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS
@@ -43,7 +42,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XPROTO_XEXTPROTO
select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
select BR2_PACKAGE_XPROTO_XF86DGAPROTO
- select BR2_PACKAGE_XPROTO_XF86DRIPROTO
+ select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_XF86RUSHPROTO
select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
select BR2_PACKAGE_XPROTO_XPROTO
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 0dd6127f0..6c6017bac 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -50,7 +50,6 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
xproto_xextproto \
xproto_xf86bigfontproto \
xproto_xf86dgaproto \
- xproto_xf86driproto \
xproto_xf86rushproto \
xproto_xf86vidmodeproto \
xproto_xproto \
@@ -65,7 +64,6 @@ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \
CFLAGS="-I$(STAGING_DIR)/usr/include/pixman-1"
ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)
-XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d
XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg --disable-glx
else
XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg
@@ -77,6 +75,12 @@ else
XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive --disable-xfbdev
endif
+ifeq ($(BR2_PACKAGE_MESA3D),y)
+XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto
+else
+XSERVER_XORG_SERVER_CONF_OPT += --disable-dri
+endif
+
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR),y)
XSERVER_XORG_SERVER_CONF_OPT += --enable-null-root-cursor
else