fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 17:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

egl/meson: include glvnd in the devenv
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
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: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35652>
This commit is contained in:
Eric Engestrom 2023-02-28 17:59:12 +00:00 • committed by Marge Bot
parent 367fb5e233
commit d31b0c9b3b
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/egl/meson.build
View file

@ -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',