From e3aab80d4f9b69d7fb8d124da5b346fcda4340a9 Mon Sep 17 00:00:00 2001 From: Alba Mendez Date: Sun, 27 Aug 2023 16:35:17 +0200 Subject: [PATCH] meson: support installation tags the only thing missing is to tag custom install targets, namely: - ICDs (vulkan, glvnd, OpenCL, VA-API, VDPAU) - Vulkan layers - custom install script for megadrivers - drirc file Part-of: --- src/amd/vulkan/meson.build | 1 + src/broadcom/vulkan/meson.build | 1 + src/egl/meson.build | 1 + src/freedreno/vulkan/meson.build | 1 + src/gallium/targets/dri/meson.build | 1 + src/gallium/targets/lavapipe/meson.build | 1 + src/gallium/targets/opencl/meson.build | 1 + src/gallium/targets/rusticl/meson.build | 1 + src/gallium/targets/va/meson.build | 1 + src/gallium/targets/vdpau/meson.build | 1 + src/imagination/vulkan/meson.build | 1 + src/intel/nullhw-layer/meson.build | 1 + src/intel/vulkan/meson.build | 1 + src/intel/vulkan_hasvk/meson.build | 1 + src/microsoft/vulkan/meson.build | 1 + src/nouveau/vulkan/meson.build | 1 + src/panfrost/vulkan/meson.build | 1 + src/util/meson.build | 2 +- src/virtio/vulkan/meson.build | 1 + src/vulkan/device-select-layer/meson.build | 1 + src/vulkan/overlay-layer/meson.build | 1 + 21 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index 8db4d587c5b..5a17dc02707 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -255,6 +255,7 @@ radeon_icd = custom_target( command : icd_command, build_by_default : true, install_dir : with_vulkan_icd_dir, + install_tag : 'runtime', install : true, ) diff --git a/src/broadcom/vulkan/meson.build b/src/broadcom/vulkan/meson.build index 3adb6c4f85d..9ded8f720e2 100644 --- a/src/broadcom/vulkan/meson.build +++ b/src/broadcom/vulkan/meson.build @@ -166,6 +166,7 @@ broadcom_icd = custom_target( ], build_by_default : true, install_dir : with_vulkan_icd_dir, + install_tag : 'runtime', install : true, ) diff --git a/src/egl/meson.build b/src/egl/meson.build index f387bde4bde..00a1da395e8 100644 --- a/src/egl/meson.build +++ b/src/egl/meson.build @@ -180,6 +180,7 @@ else input : 'main/50_mesa.json', output: '50_@0@.json'.format(glvnd_vendor_name), install : true, + install_tag : 'runtime', install_dir : join_paths(get_option('datadir'), 'glvnd', 'egl_vendor.d') ) endif diff --git a/src/freedreno/vulkan/meson.build b/src/freedreno/vulkan/meson.build index fc7d5cf13e9..3a68b1e40ce 100644 --- a/src/freedreno/vulkan/meson.build +++ b/src/freedreno/vulkan/meson.build @@ -202,6 +202,7 @@ freedreno_icd = custom_target( ], build_by_default : true, install_dir : with_vulkan_icd_dir, + install_tag : 'runtime', install : true, ) diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index ecd01c1a586..66619bba0db 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -143,4 +143,5 @@ meson.add_install_script( libgallium_dri.full_path(), dri_drivers_path, gallium_dri_drivers, + install_tag : 'runtime', ) diff --git a/src/gallium/targets/lavapipe/meson.build b/src/gallium/targets/lavapipe/meson.build index 369aad5455d..9277d3433b1 100644 --- a/src/gallium/targets/lavapipe/meson.build +++ b/src/gallium/targets/lavapipe/meson.build @@ -38,6 +38,7 @@ lvp_icd = custom_target( command : icd_command, build_by_default : true, install_dir : with_vulkan_icd_dir, + install_tag : 'runtime', install : true, ) diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build index 8e3ca0d47e2..7c14135898e 100644 --- a/src/gallium/targets/opencl/meson.build +++ b/src/gallium/targets/opencl/meson.build @@ -124,6 +124,7 @@ if with_opencl_icd input : 'mesa.icd.in', output : 'mesa.icd', install : true, + install_tag : 'runtime', install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), ) diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build index 2e284c5abf5..8205ed77eca 100644 --- a/src/gallium/targets/rusticl/meson.build +++ b/src/gallium/targets/rusticl/meson.build @@ -76,6 +76,7 @@ configure_file( input : 'rusticl.icd.in', output : 'rusticl.icd', install : true, + install_tag : 'runtime', install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'), ) diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build index 653ee8d7fae..0b4e40b63f1 100644 --- a/src/gallium/targets/va/meson.build +++ b/src/gallium/targets/va/meson.build @@ -116,5 +116,6 @@ else libva_gallium.full_path(), va_drivers_path, va_drivers, + install_tag : 'runtime', ) endif diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build index 07799370b47..87097fe144e 100644 --- a/src/gallium/targets/vdpau/meson.build +++ b/src/gallium/targets/vdpau/meson.build @@ -80,4 +80,5 @@ meson.add_install_script( libvdpau_gallium.full_path(), vdpau_drivers_path, vdpau_drivers, + install_tag : 'runtime', ) diff --git a/src/imagination/vulkan/meson.build b/src/imagination/vulkan/meson.build index 109f526780d..18f011bf630 100644 --- a/src/imagination/vulkan/meson.build +++ b/src/imagination/vulkan/meson.build @@ -165,6 +165,7 @@ powervr_mesa_icd = custom_target( ], build_by_default : true, install_dir : with_vulkan_icd_dir, + install_tag : 'runtime', install : true, ) diff --git a/src/intel/nullhw-layer/meson.build b/src/intel/nullhw-layer/meson.build index 11c3c9a6d81..ad008f920a3 100644 --- a/src/intel/nullhw-layer/meson.build +++ b/src/intel/nullhw-layer/meson.build @@ -35,4 +35,5 @@ vklayer_intel_nullhw = shared_library( install_data( files('VkLayer_INTEL_nullhw.json'), install_dir : join_paths(get_option('datadir'), 'vulkan', 'explicit_layer.d'), + install_tag : 'runtime', ) diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index 615c306f81a..8c08a92562c 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -76,6 +76,7 @@ intel_icd = custom_target( ], build_by_default : true, install_dir : with_vulkan_icd_dir, + install_tag : 'runtime', install : true, ) diff --git a/src/intel/vulkan_hasvk/meson.build b/src/intel/vulkan_hasvk/meson.build index 7c1b71989fa..ba117e2b329 100644 --- a/src/intel/vulkan_hasvk/meson.build +++ b/src/intel/vulkan_hasvk/meson.build @@ -46,6 +46,7 @@ intel_hasvk_icd = custom_target( ], build_by_default : true, install_dir : with_vulkan_icd_dir, + install_tag : 'runtime', install : true, ) diff --git a/src/microsoft/vulkan/meson.build b/src/microsoft/vulkan/meson.build index 8e450afcf02..99bcfbd0c56 100644 --- a/src/microsoft/vulkan/meson.build +++ b/src/microsoft/vulkan/meson.build @@ -128,6 +128,7 @@ dzn_icd = custom_target( command : icd_command, build_by_default : true, install_dir : with_vulkan_icd_dir, + install_tag : 'runtime', install : true, ) diff --git a/src/nouveau/vulkan/meson.build b/src/nouveau/vulkan/meson.build index f631631a7d4..588c43052f9 100644 --- a/src/nouveau/vulkan/meson.build +++ b/src/nouveau/vulkan/meson.build @@ -137,6 +137,7 @@ nouveau_icd = custom_target( ], build_by_default : true, install_dir : with_vulkan_icd_dir, + install_tag : 'runtime', install : true, ) diff --git a/src/panfrost/vulkan/meson.build b/src/panfrost/vulkan/meson.build index 594b9239568..4052465a944 100644 --- a/src/panfrost/vulkan/meson.build +++ b/src/panfrost/vulkan/meson.build @@ -152,6 +152,7 @@ panfrost_icd = custom_target( ], build_by_default : true, install_dir : with_vulkan_icd_dir, + install_tag : 'runtime', install : true, ) diff --git a/src/util/meson.build b/src/util/meson.build index 9731d3f1f23..ccb7c0fb02b 100644 --- a/src/util/meson.build +++ b/src/util/meson.build @@ -295,7 +295,7 @@ idep_mesautil = declare_dependency( # Only install the drirc file if we build with support for parsing drirc files if use_xmlconfig - install_data(files_drirc, install_dir : join_paths(get_option('datadir'), 'drirc.d')) + install_data(files_drirc, install_dir : join_paths(get_option('datadir'), 'drirc.d'), install_tag : 'runtime') endif xmlconfig_deps = [] diff --git a/src/virtio/vulkan/meson.build b/src/virtio/vulkan/meson.build index 11c245579a2..68f25aa8590 100644 --- a/src/virtio/vulkan/meson.build +++ b/src/virtio/vulkan/meson.build @@ -28,6 +28,7 @@ virtio_icd = custom_target( ], build_by_default : true, install_dir : with_vulkan_icd_dir, + install_tag : 'runtime', install : true, ) diff --git a/src/vulkan/device-select-layer/meson.build b/src/vulkan/device-select-layer/meson.build index 4a2228eedfc..e2da2cac034 100644 --- a/src/vulkan/device-select-layer/meson.build +++ b/src/vulkan/device-select-layer/meson.build @@ -53,4 +53,5 @@ vklayer_mesa_device_select = shared_library( install_data( files('VkLayer_MESA_device_select.json'), install_dir : join_paths(get_option('datadir'), 'vulkan', 'implicit_layer.d'), + install_tag : 'runtime', ) diff --git a/src/vulkan/overlay-layer/meson.build b/src/vulkan/overlay-layer/meson.build index 7854847d3f8..8a01300bd37 100644 --- a/src/vulkan/overlay-layer/meson.build +++ b/src/vulkan/overlay-layer/meson.build @@ -48,6 +48,7 @@ vklayer_mesa_overlay = shared_library( install_data( files('VkLayer_MESA_overlay.json'), install_dir : join_paths(get_option('datadir'), 'vulkan', 'explicit_layer.d'), + install_tag : 'runtime', ) install_data(