From 6586f755b9abfd31850c33f22c883838f7bc75f2 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Mon, 25 Nov 2024 18:26:30 +0100 Subject: [PATCH] meson/megadriver: simplify setting common megadriver arguments Cc: mesa-stable Part-of: --- bin/meson.build | 3 +++ src/gallium/targets/dri/meson.build | 4 ++-- src/gallium/targets/dril/meson.build | 2 +- src/gallium/targets/va/meson.build | 2 +- src/gallium/targets/vdpau/meson.build | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/bin/meson.build b/bin/meson.build index 2034bccf1c1..73a980fcb10 100644 --- a/bin/meson.build +++ b/bin/meson.build @@ -11,3 +11,6 @@ gen_vs_module_defs_normal_command = [ ] symbols_check = find_program('symbols-check.py') install_megadrivers_py = find_program('install_megadrivers.py') +install_megadrivers = [ + install_megadrivers_py.full_path(), +] diff --git a/src/gallium/targets/dri/meson.build b/src/gallium/targets/dri/meson.build index 28d090ba206..c1b6ab7772f 100644 --- a/src/gallium/targets/dri/meson.build +++ b/src/gallium/targets/dri/meson.build @@ -90,7 +90,7 @@ if with_gallium_va or with_gallium_vdpau if va_drivers.length() > 0 meson.add_install_script( - install_megadrivers_py.full_path(), + install_megadrivers, libgallium_dri.full_path(), va_drivers_path, va_drivers, @@ -101,7 +101,7 @@ if with_gallium_va or with_gallium_vdpau if vdpau_drivers.length() > 0 meson.add_install_script( - install_megadrivers_py.full_path(), + install_megadrivers, libgallium_dri.full_path(), vdpau_drivers_path, vdpau_drivers, diff --git a/src/gallium/targets/dril/meson.build b/src/gallium/targets/dril/meson.build index 3adf97b24a7..1da0c082312 100644 --- a/src/gallium/targets/dril/meson.build +++ b/src/gallium/targets/dril/meson.build @@ -143,7 +143,7 @@ endif if dril_drivers.length() > 0 meson.add_install_script( - install_megadrivers_py.full_path(), + install_megadrivers, dril_dri.full_path(), dri_drivers_path, dril_drivers, diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build index 520370001d7..cdf2e49edeb 100644 --- a/src/gallium/targets/va/meson.build +++ b/src/gallium/targets/va/meson.build @@ -99,7 +99,7 @@ else if va_drivers.length() > 0 meson.add_install_script( - install_megadrivers_py.full_path(), + install_megadrivers, libva_gallium.full_path(), va_drivers_path, va_drivers, diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build index 98ddb83e3f1..e8523e02db8 100644 --- a/src/gallium/targets/vdpau/meson.build +++ b/src/gallium/targets/vdpau/meson.build @@ -61,7 +61,7 @@ endforeach if vdpau_drivers.length() > 0 meson.add_install_script( - install_megadrivers_py.full_path(), + install_megadrivers, libvdpau_gallium.full_path(), vdpau_drivers_path, vdpau_drivers,