From d31b0c9b3b6677fc25875e2ee1208dfa5e1e89c1 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 28 Feb 2023 17:59:12 +0000 Subject: [PATCH] egl/meson: include glvnd in the devenv This was working by accident in the case where `-D glvnd-vendor-name` was not set, because `meson devenv` adds all the folders that produce a lib to `LD_LIBRARY_PATH` and the system's glvnd's json was pointing to the same filename as the build had, which ended up getting picked up. This breaks when `-D glvnd-vendor-name` is set to any other value than the one set by the distro packagers though, so let's set it up properly. Part-of: --- src/egl/meson.build | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/egl/meson.build b/src/egl/meson.build index a4022398a44..da1d360683e 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -216,6 +216,13 @@ if with_glvnd install_tag : 'runtime', install_dir : join_paths(get_option('datadir'), 'glvnd', 'egl_vendor.d') ) + + devenv_glvnd_egl_json_file = configure_file( + configuration: {'library_path' : libegl.full_path()}, + input : 'main/50_mesa.json', + output: 'devenv_glvnd_egl.json', + ) + devenv.set('__EGL_VENDOR_LIBRARY_FILENAMES', devenv_glvnd_egl_json_file.full_path()) else pkg.generate( name : 'egl',