From d0c7bea72703b3e94c2b895c5641f9daf56d8b88 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 24 Jun 2025 18:13:25 +0200 Subject: [PATCH] meson: allow "venus without virgl" builds `cc: mesa-stable` instead of `fixes:` because several commits have modified this but keeping this bug: - 06e57e32310f51e752d7 ("virtio: Add vdrm native-context helper") made an unconditional copy of subdir(virtio) - cede4e7ac3c481f87236 ("meson: Only include virtio when DRM available") introduced a new condition, which doesn't cover everything that was needed - other commits made more changes Cc: mesa-stable Part-of: --- src/meson.build | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/meson.build b/src/meson.build index f5dd630d912..15bbb233dd1 100644 --- a/src/meson.build +++ b/src/meson.build @@ -69,7 +69,7 @@ endif if with_any_intel subdir('intel') endif -if system_has_kms_drm or with_gallium_virgl +if system_has_kms_drm or with_gallium_virgl or with_virtio_vk subdir('virtio') endif if with_gallium_radeonsi or with_amd_vk or with_gallium_r300 or with_gallium_r600 @@ -90,9 +90,6 @@ endif if with_gallium_panfrost or with_gallium_lima or with_panfrost_vk or with_tools.contains('panfrost') subdir('panfrost') endif -#if with_gallium_virgl or with_virtio_vk -# subdir('virtio') -#endif if with_microsoft_clc or with_gallium_d3d12 or with_spirv_to_dxil or with_microsoft_vk subdir('microsoft') endif