From 09dfdcd476db9791fd2fd62c985109a474553fc5 Mon Sep 17 00:00:00 2001 From: Jessica Clarke Date: Wed, 17 Jul 2024 11:11:08 +0100 Subject: [PATCH] Revert "meson: fix with_dri2 definition for GNU Hurd" This reverts commit ad862c36e5e175d9bf2d112927be7348fb3560f7. This change does not work, because libdrm is required if with_dri2 is true. Moreover, we don't want all of DRI2 on Hurd, we just want the egl_dri2 driver, as done by autotools. So first revert this to stop trying to build all of DRI2. Cc: mesa-stable Part-of: (cherry picked from commit ec55a6c3292235aa56750989ee4a5bbd62fca61d) --- .pick_status.json | 2 +- meson.build | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index a0943ada9c5..20ee7bc587e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -284,7 +284,7 @@ "description": "Revert \"meson: fix with_dri2 definition for GNU 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 f0889cf947e..f13b4e60e1a 100644 --- a/meson.build +++ b/meson.build @@ -562,8 +562,7 @@ if with_vulkan_icd_dir == '' with_vulkan_icd_dir = join_paths(get_option('datadir'), 'vulkan/icd.d') endif -with_dri2 = (with_dri or with_any_vk) and (with_dri_platform == 'drm' or with_dri_platform == 'apple' or - host_machine.system() == 'gnu') +with_dri2 = (with_dri or with_any_vk) and (with_dri_platform == 'drm' or with_dri_platform == 'apple') with_dri3 = get_option('dri3').disable_auto_if(not (system_has_kms_drm and with_dri2)).allowed() if with_any_vk and (with_platform_x11 and not with_dri3)