Module: Mesa Branch: main Commit: 1039da140019f10ed88a4eee84354446c9a36ba0 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1039da140019f10ed88a4eee84354446c9a36ba0
Author: duncan.hopkins <duncan.hopk...@foundry.com> Date: Fri Nov 3 09:34:30 2023 +0000 vulkan: added build dependencies for systems using non-standard prefixed X11 libs. To get MacOS to build, some extra dependencies need to be added to a couple of build targets. This mainly shows up when not installing the dependencies in the default prefix locations. On MacOS, this happens when using a custom build of brew to install the dependencies to 'odd' locations. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26022> --- src/gallium/drivers/zink/meson.build | 2 +- src/gallium/frontends/dri/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/zink/meson.build b/src/gallium/drivers/zink/meson.build index 98070ee3b57..831ccaae88c 100644 --- a/src/gallium/drivers/zink/meson.build +++ b/src/gallium/drivers/zink/meson.build @@ -99,7 +99,7 @@ libzink = static_library( link_args : [ld_args_build_id], dependencies: [ idep_nir_headers, idep_mesautil, idep_vulkan_util_headers, - idep_vulkan_wsi_defines, idep_vulkan_util, dep_libdrm + idep_vulkan_wsi_defines, idep_vulkan_util, dep_libdrm, vulkan_wsi_deps ], c_args: zink_c_args, ) diff --git a/src/gallium/frontends/dri/meson.build b/src/gallium/frontends/dri/meson.build index 6009322edd9..0713135d7db 100644 --- a/src/gallium/frontends/dri/meson.build +++ b/src/gallium/frontends/dri/meson.build @@ -52,7 +52,7 @@ if with_gallium_zink and not with_platform_android libdri_c_args += '-DKOPPER_LIB_NAMES="libEGL and libGLX"' endif files_libdri += files('kopper.c') - deps_for_libdri += idep_vulkan_wsi_defines + deps_for_libdri += vulkan_wsi_deps endif if with_gallium_softpipe
