fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 02:50:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

meson: Do not require libdrm for DRI2 on hurd

Browse source 
Cc: 19.3 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Signed-off-by: Samuel Thibault <samuel.thibault@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 2fd85105c6)
This commit is contained in:
Samuel Thibault 2019-12-28 22:51:39 +01:00 • committed by Dylan Baker
parent 08f1629534
commit 0c2ac0f455
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1192,7 +1192,7 @@
"description": "meson: Do not require libdrm for DRI2 on hurd", "description": "meson: Do not require libdrm for DRI2 on hurd",
"nominated": true, "nominated": true,
"nomination_type": 0, "nomination_type": 0,
"resolution": 0, "resolution": 1,
"master_sha": null, "master_sha": null,
"because_sha": null "because_sha": null
}, },

4
meson.build
View file

@ -431,6 +431,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')
@ -1338,7 +1339,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'