egl: put full path to libEGL_mesa.so in GLVND json
This is useful when installing to a non-standard path. glvnd_icd.py copied & adapted from src/intel/vulkan/anv_icd.py Signed-off-by: Eric Engestrom <eric.engestrom@intel.com> Acked-by: Matt Turner <mattst88@gmail.com> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3038> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3038>
This commit is contained in:

committed by
Eric Engestrom

parent
d5fd8cd46e
commit
0021f7dc30
24
src/egl/glvnd_icd.py
Normal file
24
src/egl/glvnd_icd.py
Normal file
@@ -0,0 +1,24 @@
|
||||
# Copyright 2019 Intel Corporation
|
||||
# SPDX-License-Identifier: MIT
|
||||
|
||||
import argparse
|
||||
import json
|
||||
import os.path
|
||||
|
||||
if __name__ == '__main__':
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument('--out', help='Output json file.', required=True)
|
||||
parser.add_argument('--lib-path', help='Path to libEGL_mesa.so', required=True)
|
||||
args = parser.parse_args()
|
||||
|
||||
path = os.path.join(args.lib_path, 'libEGL_mesa.so')
|
||||
|
||||
json_data = {
|
||||
'file_format_version': '1.0.0',
|
||||
'ICD': {
|
||||
'library_path': path,
|
||||
},
|
||||
}
|
||||
|
||||
with open(args.out, 'w') as f:
|
||||
json.dump(json_data, f, indent=4, sort_keys=True, separators=(',', ': '))
|
@@ -1,6 +0,0 @@
|
||||
{
|
||||
"file_format_version" : "1.0.0",
|
||||
"ICD" : {
|
||||
"library_path" : "libEGL_mesa.so.0"
|
||||
}
|
||||
}
|
@@ -152,8 +152,18 @@ else
|
||||
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',
|
||||
|
||||
egl_icd = custom_target(
|
||||
'glvnd_icd',
|
||||
input : 'glvnd_icd.py',
|
||||
output : '50_mesa.json',
|
||||
command : [
|
||||
prog_python, '@INPUT@',
|
||||
'--lib-path', join_paths(get_option('prefix'), get_option('libdir')),
|
||||
'--out', '@OUTPUT@',
|
||||
],
|
||||
build_by_default : true,
|
||||
install : true,
|
||||
install_dir : join_paths(get_option('datadir'), 'glvnd', 'egl_vendor.d')
|
||||
)
|
||||
endif
|
||||
|
Reference in New Issue
Block a user