package/x11r7/xdriver_xf86-video-mach64: disable DRI support when not available

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/x11r7/xdriver_xf86-video-mach64/Config.in b/package/x11r7/xdriver_xf86-video-mach64/Config.in
index 42535e445de08b2d4d0e2fa23b76d29dda760524..82de826ad7fdd828b9c7ec0f7d896031b4ae1b3a 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-mach64/Config.in
+++ b/package/x11r7/xdriver_xf86-video-mach64/Config.in
@@ -1,7 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MACH64
        bool "xf86-video-mach64"
-       depends on BR2_PACKAGE_MESA3D
-       select BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST
        select BR2_PACKAGE_XPROTO_FONTSPROTO
        select BR2_PACKAGE_XPROTO_RANDRPROTO
        select BR2_PACKAGE_XPROTO_RENDERPROTO
@@ -9,6 +7,3 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MACH64
        select BR2_PACKAGE_XPROTO_XPROTO
        help
          mach64 video driver
-
-comment "xf86-video-mach64 needs mesa3d"
-       depends on !BR2_PACKAGE_MESA3D

diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
index 9b438cbc2610d542caf01a1c52dc7879d5d6225d..599036033d50d0c86cfd432b7d9f4c66d3edfb5e 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
+++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
@@ -12,4 +12,8 @@ XDRIVER_XF86_VIDEO_MACH64_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
 
+ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
+XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS = --disable-dri
+endif
+
 $(eval $(autotools-package))