Commit 2fd85105 authored by Samuel Thibault's avatar Samuel Thibault Committed by Marge Bot

meson: Do not require libdrm for DRI2 on hurd

Cc: 19.3 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Dylan Baker's avatarDylan Baker <dylan@pnwbakers.com>
Signed-off-by: Samuel Thibault's avatarSamuel Thibault <samuel.thibault@ens-lyon.org>
Tested-by: Marge Bot <!3231>
Part-of: <!3231>
parent 4f524251
Pipeline #100206 passed with stages
in 16 minutes and 59 seconds
...@@ -436,6 +436,7 @@ if with_vulkan_icd_dir == '' ...@@ -436,6 +436,7 @@ if with_vulkan_icd_dir == ''
with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d') with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d')
endif endif
# GNU/Hurd includes egl_dri2, without drm.
with_dri2 = (with_dri or with_any_vk) and (with_dri_platform == 'drm' or with_dri2 = (with_dri or with_any_vk) and (with_dri_platform == 'drm' or
host_machine.system() == 'gnu') host_machine.system() == 'gnu')
_dri3 = get_option('dri3') _dri3 = get_option('dri3')
...@@ -1358,7 +1359,8 @@ endforeach ...@@ -1358,7 +1359,8 @@ endforeach
with_gallium_drisw_kms = false with_gallium_drisw_kms = false
dep_libdrm = dependency( dep_libdrm = dependency(
'libdrm', version : '>=' + _drm_ver, '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() if dep_libdrm.found()
pre_args += '-DHAVE_LIBDRM' pre_args += '-DHAVE_LIBDRM'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment