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>

diff --git a/package/x11r7/xapp_xdriinfo/Config.in b/package/x11r7/xapp_xdriinfo/Config.in
index 74426907ce53978ef1f42dcffdc741675076771e..970bff57191e8c7294d26eb5abda605bff53b0aa 100644 (file)
--- a/package/x11r7/xapp_xdriinfo/Config.in
+++ b/package/x11r7/xapp_xdriinfo/Config.in
@@ -2,6 +2,6 @@ config BR2_PACKAGE_XAPP_XDRIINFO
        bool "xdriinfo"
        select BR2_PACKAGE_XLIB_LIBX11
        select BR2_PACKAGE_XPROTO_GLPROTO
-       select BR2_PACKAGE_MESA3D
+       depends on BR2_PACKAGE_MESA3D
        help
          query configuration information of DRI drivers

diff --git a/package/x11r7/xdriver_xf86-video-ati/Config.in b/package/x11r7/xdriver_xf86-video-ati/Config.in
index d61f11c9642ae0a53d017efed810b6295ddb8431..107a57b7b0383e75a55f609577279d2b8d76fafd 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-ati/Config.in
+++ b/package/x11r7/xdriver_xf86-video-ati/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI
        bool "xf86-video-ati"
        select BR2_PACKAGE_XSERVER_XORG_SERVER
        select BR2_PACKAGE_LIBDRM
+       select BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_XPROTO_FONTSPROTO
        select BR2_PACKAGE_XPROTO_GLPROTO
        select BR2_PACKAGE_XPROTO_RANDRPROTO

diff --git a/package/x11r7/xdriver_xf86-video-glint/Config.in b/package/x11r7/xdriver_xf86-video-glint/Config.in
index 703e02096ba8fa19fa5f3b33e568b99cc7a19b27..782b6dac51c259c299c57c6fcd1ed3bbc8e2abe5 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-glint/Config.in
+++ b/package/x11r7/xdriver_xf86-video-glint/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT
        bool "xf86-video-glint"
        select BR2_PACKAGE_XSERVER_XORG_SERVER
        select BR2_PACKAGE_LIBDRM
+       select BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_XPROTO_FONTSPROTO
        select BR2_PACKAGE_XPROTO_GLPROTO
        select BR2_PACKAGE_XPROTO_RANDRPROTO

diff --git a/package/x11r7/xdriver_xf86-video-intel/Config.in b/package/x11r7/xdriver_xf86-video-intel/Config.in
index ddbf4fff298a7f6f906bd8a7076fd7664b314175..9a1d6cf92a3f58b8e9837f2026747b947572c053 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-intel/Config.in
+++ b/package/x11r7/xdriver_xf86-video-intel/Config.in
@@ -7,5 +7,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL
        select BR2_PACKAGE_XPROTO_XPROTO
        select BR2_PACKAGE_XLIB_LIBPCIACCESS
        select BR2_PACKAGE_LIBDRM
+       select BR2_PACKAGE_MESA3D
        help
          Intel video driver

diff --git a/package/x11r7/xdriver_xf86-video-mach64/Config.in b/package/x11r7/xdriver_xf86-video-mach64/Config.in
index 8202045dfff58ea50d48738ea63f6846deb3322f..f2464e731793d4069b9555503a3f13328e832b11 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-mach64/Config.in
+++ b/package/x11r7/xdriver_xf86-video-mach64/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MACH64
        bool "xf86-video-mach64"
+       select BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_XSERVER_XORG_SERVER
        select BR2_PACKAGE_XPROTO_FONTSPROTO
        select BR2_PACKAGE_XPROTO_RANDRPROTO

diff --git a/package/x11r7/xdriver_xf86-video-mga/Config.in b/package/x11r7/xdriver_xf86-video-mga/Config.in
index 575bca44bbddcc3e8b9b6cc15875e49dd37268b8..40c6f3a9475e8770eb142a367030d62fd625c184 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-mga/Config.in
+++ b/package/x11r7/xdriver_xf86-video-mga/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA
        bool "xf86-video-mga"
        select BR2_PACKAGE_XSERVER_XORG_SERVER
        select BR2_PACKAGE_LIBDRM
+       select BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_XPROTO_FONTSPROTO
        select BR2_PACKAGE_XPROTO_GLPROTO
        select BR2_PACKAGE_XPROTO_RANDRPROTO

diff --git a/package/x11r7/xdriver_xf86-video-openchrome/Config.in b/package/x11r7/xdriver_xf86-video-openchrome/Config.in
index 2b42fe0ccc40342b9e4b176ee843e33b1fcee24b..25424ff5b612e5cdd7972c08a0b8f12d239a21df 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-openchrome/Config.in
+++ b/package/x11r7/xdriver_xf86-video-openchrome/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME
        bool "xf86-video-openchrome"
        select BR2_PACKAGE_XSERVER_XORG_SERVER
        select BR2_PACKAGE_LIBDRM
+       select BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_XLIB_LIBX11
        select BR2_PACKAGE_XLIB_LIBXVMC
        select BR2_PACKAGE_XPROTO_GLPROTO

diff --git a/package/x11r7/xdriver_xf86-video-r128/Config.in b/package/x11r7/xdriver_xf86-video-r128/Config.in
index feb8893c3e7dc0e1551a6b6d83f514913a4945b7..96bd8d7d3d9913356484fadd8f0aa7711503ad3c 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-r128/Config.in
+++ b/package/x11r7/xdriver_xf86-video-r128/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_R128
        bool "xf86-video-r128"
+       select BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_XSERVER_XORG_SERVER
        select BR2_PACKAGE_XPROTO_FONTSPROTO
        select BR2_PACKAGE_XPROTO_RANDRPROTO

diff --git a/package/x11r7/xdriver_xf86-video-savage/Config.in b/package/x11r7/xdriver_xf86-video-savage/Config.in
index ec311bdd4e3d032309d68b85d3607fccfe4bbeaa..a9c8f6c4e1e7d320fda3484049c11b1dae35e9bc 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-savage/Config.in
+++ b/package/x11r7/xdriver_xf86-video-savage/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE
        bool "xf86-video-savage"
        select BR2_PACKAGE_XSERVER_XORG_SERVER
        select BR2_PACKAGE_LIBDRM
+       select BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_XPROTO_FONTSPROTO
        select BR2_PACKAGE_XPROTO_RANDRPROTO
        select BR2_PACKAGE_XPROTO_RENDERPROTO

diff --git a/package/x11r7/xdriver_xf86-video-sis/Config.in b/package/x11r7/xdriver_xf86-video-sis/Config.in
index fd76847c0fae51a3d451b94bd991b650b02e288a..ac2b63201db6b2d74cbd5fb6d0d66b112ffdeb34 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-sis/Config.in
+++ b/package/x11r7/xdriver_xf86-video-sis/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS
        bool "xf86-video-sis"
        select BR2_PACKAGE_XSERVER_XORG_SERVER
        select BR2_PACKAGE_LIBDRM
+       select BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_XPROTO_FONTSPROTO
        select BR2_PACKAGE_XPROTO_RANDRPROTO
        select BR2_PACKAGE_XPROTO_RENDERPROTO

diff --git a/package/x11r7/xdriver_xf86-video-tdfx/Config.in b/package/x11r7/xdriver_xf86-video-tdfx/Config.in
index 08104c948ee8cca2cc3378afbf610d90c8b85c3b..57bb4117d2fcc2684d717c6f7aac6f36f1ba4d81 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-tdfx/Config.in
+++ b/package/x11r7/xdriver_xf86-video-tdfx/Config.in
@@ -2,6 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX
        bool "xf86-video-tdfx"
        select BR2_PACKAGE_XSERVER_XORG_SERVER
        select BR2_PACKAGE_LIBDRM
+       select BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_XPROTO_FONTSPROTO
        select BR2_PACKAGE_XPROTO_RANDRPROTO
        select BR2_PACKAGE_XPROTO_RENDERPROTO

diff --git a/package/x11r7/xdriver_xf86-video-xgi/Config.in b/package/x11r7/xdriver_xf86-video-xgi/Config.in
index 9a0c215313881adaa7aff0e3782e9b121ae3b7cf..d0fe6653358f8dd5904ff08a775af2d1671ea526 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-xgi/Config.in
+++ b/package/x11r7/xdriver_xf86-video-xgi/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_XGI
        bool "xf86-video-xgi"
+       select BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_XSERVER_XORG_SERVER
        select BR2_PACKAGE_XPROTO_FONTSPROTO
        select BR2_PACKAGE_XPROTO_RANDRPROTO

diff --git a/package/x11r7/xdriver_xf86-video-xgixp/Config.in b/package/x11r7/xdriver_xf86-video-xgixp/Config.in
index e9052804fd357c56da1271ffd2f532fb2f54d3aa..8d466f45d0522abef807266fc2144ccc7efd25a7 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-xgixp/Config.in
+++ b/package/x11r7/xdriver_xf86-video-xgixp/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_XGIXP
        bool "xf86-video-xgixp"
+       select BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_XSERVER_XORG_SERVER
        select BR2_PACKAGE_XPROTO_FONTSPROTO
        select BR2_PACKAGE_XPROTO_RANDRPROTO

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 6aa4a03261d61acbaa44fa3c3a94c5ffaff490c8..d57467568ac4bed13a3fb8c5792072b04ec95623 100644 (file)
--- 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 0dd6127f0243b79ad34ece82a56bdda303ae83aa..6c6017bac6f3a629fbd18b88cfedd14527c82150 100644 (file)
--- 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