From 7444de6b1325d5cc67fe3395cf9c65fd49322e5c Mon Sep 17 00:00:00 2001 From: Jessica Clarke Date: Wed, 17 Jul 2024 15:43:38 +0100 Subject: [PATCH] Revert "meson: Do not require libdrm for DRI2 on hurd" This reverts commit 2fd85105c6b144d1f44e5faef33363e554b58455. Despite its name, egl_dri2 works under plain DRI without DRI2, and the old autotools build system built it when $enable_dri = yes, with no check for DRI2. A future commit will adapt meson.build to follow that approach rather than this hackier one. Note that the case removed in the second hunk is already dead code, since system_has_kms_drm is false on GNU/Hurd, and could have been dropped as part of 66d2ae038622 ("meson: forcefully disable libdrm when host doesn't have it"). Cc: mesa-stable Part-of: (cherry picked from commit 8461776a09cac6540fe168e431528b4c71ffdca4) --- .pick_status.json | 2 +- meson.build | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 3a34ea12ce8..a0943ada9c5 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -294,7 +294,7 @@ "description": "Revert \"meson: Do not require libdrm for DRI2 on hurd\"", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/meson.build b/meson.build index 7b9a0f06bd6..f0889cf947e 100644 --- a/meson.build +++ b/meson.build @@ -562,7 +562,6 @@ 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 with_dri_platform == 'apple' or host_machine.system() == 'gnu') with_dri3 = get_option('dri3').disable_auto_if(not (system_has_kms_drm and with_dri2)).allowed() @@ -1696,8 +1695,7 @@ with_gallium_drisw_kms = false if system_has_kms_drm dep_libdrm = dependency( 'libdrm', version : '>=' + _drm_ver, - # GNU/Hurd includes egl_dri2, without drm. - required : (with_dri2 and host_machine.system() != 'gnu') or with_dri3 + required : with_dri2 or with_dri3 ) else # We should prevent libdrm from being available when the target doesn't have it to avoid transitive