Mesa (staging/19.3): meson: Do not require libdrm for DRI2 on hurd

[GitLab Mirror]

Module: Mesa
Branch: staging/19.3
Commit: 20e72570c765bbd4c4340e48f0e6072d9f861c5a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=20e72570c765bbd4c4340e48f0e6072d9f861c5a

Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
Date:   Sat Dec 28 22:51:39 2019 +0100

meson: Do not require libdrm for DRI2 on hurd

Cc: 19.3 <mesa-stable at lists.freedesktop.org>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Signed-off-by: Samuel Thibault <samuel.thibault at ens-lyon.org>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3231>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3231>
(cherry picked from commit 2fd85105c6b144d1f44e5faef33363e554b58455)

---

 .pick_status.json | 2 +-
 meson.build       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 1cb8ab98981..9cff666164e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -715,7 +715,7 @@
         "description": "meson: Do not require libdrm for DRI2 on hurd",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": null
     },
diff --git a/meson.build b/meson.build
index 898d025f066..7e2295b59c5 100644
--- a/meson.build
+++ b/meson.build
@@ -431,6 +431,7 @@ if with_vulkan_icd_dir == ''
   with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d')
 endif
 
+# GNU/Hurd includes egl_dri2, without drm.
 with_dri2 = (with_dri or with_any_vk) and (with_dri_platform == 'drm' or
   host_machine.system() == 'gnu')
 _dri3 = get_option('dri3')
@@ -1338,7 +1339,8 @@ endforeach
 with_gallium_drisw_kms = false
 dep_libdrm = dependency(
   'libdrm', version : '>=' + _drm_ver,
-  required : with_dri2 or with_dri3
+  # GNU/Hurd includes egl_dri2, without drm.
+  required : (with_dri2 and host_machine.system() != 'gnu') or with_dri3
 )
 if dep_libdrm.found()
   pre_args += '-DHAVE_LIBDRM'