From 4f6e0e612ed1345242ad300a499ad3080ee73629 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Tue, 15 Jul 2025 17:50:31 -0400 Subject: [PATCH] meson: Only build src/x11 if with_platform_x11 Reviewed-by: Eric Engestrom Part-of: --- src/egl/meson.build | 4 ++-- src/gallium/auxiliary/meson.build | 4 +++- src/meson.build | 4 +++- src/x11/meson.build | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/egl/meson.build b/src/egl/meson.build index 746e935c3f4..66bb48de2f6 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -94,7 +94,6 @@ if with_dri deps_for_egl += idep_xmlconfig link_for_egl += libloader incs_for_egl += inc_loader - incs_for_egl += inc_loader_x11 incs_for_egl += inc_gallium incs_for_egl += inc_gallium_aux incs_for_egl += inc_mesa @@ -107,9 +106,10 @@ if with_dri if with_platform_x11 files_egl += files('drivers/dri2/platform_x11.c') + incs_for_egl += inc_loader_x11 + link_for_egl += libloader_x11 if with_dri_platform == 'drm' files_egl += files('drivers/dri2/platform_x11_dri3.c') - link_for_egl += [libloader_x11] endif deps_for_egl += [dep_x11_xcb, dep_xcb_xrandr, dep_xcb_xfixes, dep_xcb_shm] endif diff --git a/src/gallium/auxiliary/meson.build b/src/gallium/auxiliary/meson.build index a5707fb6887..12249f42a3e 100644 --- a/src/gallium/auxiliary/meson.build +++ b/src/gallium/auxiliary/meson.build @@ -427,6 +427,7 @@ files_libgalliumvl = files( vlwinsys_deps = [] files_libgalliumvlwinsys = files('vl/vl_winsys.h') +links_libgalliumvlwinsys = [] if host_machine.system() == 'windows' files_libgalliumvlwinsys += files('vl/vl_winsys_win32.c') else @@ -434,6 +435,7 @@ else endif if with_platform_x11 files_libgalliumvlwinsys += files('vl/vl_winsys_dri.c') + links_libgalliumvlwinsys += libloader_x11 if with_dri_platform == 'drm' vlwinsys_deps += [ dep_xcb_sync, dep_xcb_present, dep_xshmfence, dep_xcb_xfixes, @@ -572,6 +574,6 @@ libgalliumvlwinsys = static_library( files_libgalliumvlwinsys, include_directories : [inc_gallium, inc_include, inc_loader, inc_src, include_directories('../drivers/zink')], dependencies : [dep_libdrm, vlwinsys_deps, idep_mesautil], - link_with : [libloader_x11], + link_with : links_libgalliumvlwinsys, build_by_default : false, ) diff --git a/src/meson.build b/src/meson.build index e4cbcc89fc0..70bf4952db6 100644 --- a/src/meson.build +++ b/src/meson.build @@ -47,7 +47,9 @@ if cc.get_argument_syntax() == 'msvc' else idep_getopt = null_dep endif -subdir('x11') +if with_platform_x11 + subdir('x11') +endif if with_gallium_or_lvp or with_gbm or with_platform_wayland subdir('loader') endif diff --git a/src/x11/meson.build b/src/x11/meson.build index 88ba0bb1c46..d2e919985d3 100644 --- a/src/x11/meson.build +++ b/src/x11/meson.build @@ -3,7 +3,7 @@ inc_loader_x11 = include_directories('.') -if with_platform_x11 and with_dri_platform == 'drm' +if with_dri_platform == 'drm' libloader_x11 = static_library( 'loader_x11', 'loader_x11.c',