Mesa (master): meson: fix with_dri2 definition for GNU Hurd

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Mar 6 12:40:24 UTC 2019


Module: Mesa
Branch: master
Commit: ad862c36e5e175d9bf2d112927be7348fb3560f7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ad862c36e5e175d9bf2d112927be7348fb3560f7

Author: Eric Engestrom <eric.engestrom at intel.com>
Date:   Tue Mar  5 12:32:13 2019 +0000

meson: fix with_dri2 definition for GNU Hurd

Suggested-by: Dylan Baker <dylan at pnwbakers.com>
Cc: Timo Aaltonen <tjaalton at debian.org>
Cc: James Clarke <jrtc27 at debian.org>
Signed-off-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

---

 meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 46f86eb0000..8a40c48e435 100644
--- a/meson.build
+++ b/meson.build
@@ -376,7 +376,8 @@ if with_vulkan_icd_dir == ''
   with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d')
 endif
 
-with_dri2 = (with_dri or with_any_vk) and with_dri_platform == 'drm'
+with_dri2 = (with_dri or with_any_vk) and (with_dri_platform == 'drm' or
+  host_machine.system() == 'gnu')
 _dri3 = get_option('dri3')
 if _dri3 == 'auto'
   with_dri3 = system_has_kms_drm and with_dri2




More information about the mesa-commit mailing list