diff options
| author | Adam Jackson <ajax@redhat.com> | 2020-11-18 10:26:19 -0500 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-12-03 22:36:27 +0000 |
| commit | df0157dc697b858a3fa939dc6a938dd58c976bd2 (patch) | |
| tree | 1a1a913bc4fb1bf0b9641ca81efac50be62cde6f /src/egl | |
| parent | 9a3aaffeb809e2bc11b828ee3ccbe66a01e9b8d6 (diff) | |
meson: Make the glvnd vendor name configurable
Leave the default as "mesa", but this enables parallel Mesa installs.
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7674>
Diffstat (limited to 'src/egl')
| -rw-r--r-- | src/egl/main/50_mesa.json | 2 | ||||
| -rw-r--r-- | src/egl/meson.build | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/egl/main/50_mesa.json b/src/egl/main/50_mesa.json index 8aaaa100ffa..5f9c18aad6e 100644 --- a/src/egl/main/50_mesa.json +++ b/src/egl/main/50_mesa.json @@ -1,6 +1,6 @@ { "file_format_version" : "1.0.0", "ICD" : { - "library_path" : "libEGL_mesa.so.0" + "library_path" : "libEGL_@glvnd_vendor_name@.so.0" } } diff --git a/src/egl/meson.build b/src/egl/meson.build index 7a3fcdca157..599a66706b7 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -144,13 +144,18 @@ if not with_glvnd egl_lib_name = 'EGL' + get_option('egl-lib-suffix') egl_lib_version = '1.0.0' else - egl_lib_name = 'EGL_mesa' + egl_lib_name = 'EGL_@0@'.format(glvnd_vendor_name) egl_lib_version = '0.0.0' deps_for_egl += dep_glvnd files_egl += [g_egldispatchstubs_h, g_egldispatchstubs_c] files_egl += files('main/eglglvnd.c', 'main/egldispatchstubs.c') - install_data( - 'main/50_mesa.json', + glvnd_config = configuration_data() + glvnd_config.set('glvnd_vendor_name', get_option('glvnd-vendor-name')) + configure_file( + configuration: glvnd_config, + input : 'main/50_mesa.json', + output: '50_@0@.json'.format(glvnd_vendor_name), + install : true, install_dir : join_paths(get_option('datadir'), 'glvnd', 'egl_vendor.d') ) endif |