Module: Mesa Branch: master Commit: 2fd85105c6b144d1f44e5faef33363e554b58455 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2fd85105c6b144d1f44e5faef33363e554b58455
Author: Samuel Thibault <[email protected]> Date: Sat Dec 28 22:51:39 2019 +0100 meson: Do not require libdrm for DRI2 on hurd Cc: 19.3 <[email protected]> Reviewed-by: Dylan Baker <[email protected]> Signed-off-by: Samuel Thibault <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3231> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3231> --- meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 2cf0ee7fe0c..c48945b3c48 100644 --- a/meson.build +++ b/meson.build @@ -436,6 +436,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') @@ -1358,7 +1359,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' _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
