fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 20:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

meson/megadriver: Don't invoke the megadriver script with no drivers

Browse source 
Otherwise, the install will fail due to missing arguments to
install_megadrivers.py.

Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Dylan Baker <dylan.c.baker@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30277>
(cherry picked from commit 74b4c91e7b)
This commit is contained in:
Faith Ekstrand 2024-07-19 19:50:01 -05:00 • committed by Eric Engestrom
parent 6fef8f1800
commit d256a04d5b
4 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -454,7 +454,7 @@
"description": "meson/megadriver: Don't invoke the megadriver script with no drivers",
"nominated": false,
"nomination_type": 3,
"resolution": 4,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

16
src/gallium/targets/dril/meson.build
View file

@ -140,10 +140,12 @@ if prog_ln.found()
endforeach
endif
meson.add_install_script(
install_megadrivers_py.full_path(),
dril_dri.full_path(),
dri_drivers_path,
dril_drivers,
install_tag : 'runtime',
)
if dril_drivers.length() > 0
meson.add_install_script(
install_megadrivers_py.full_path(),
dril_dri.full_path(),
dri_drivers_path,
dril_drivers,
install_tag : 'runtime',
)
endif

16
src/gallium/targets/va/meson.build
View file

@ -97,11 +97,13 @@ else
endif
endforeach
meson.add_install_script(
install_megadrivers_py.full_path(),
libva_gallium.full_path(),
va_drivers_path,
va_drivers,
install_tag : 'runtime',
)
if va_drivers.length() > 0
meson.add_install_script(
install_megadrivers_py.full_path(),
libva_gallium.full_path(),
va_drivers_path,
va_drivers,
install_tag : 'runtime',
)
endif
endif

16
src/gallium/targets/vdpau/meson.build
View file

@ -59,10 +59,12 @@ foreach d : [[with_gallium_r600, 'r600'],
endif
endforeach
meson.add_install_script(
install_megadrivers_py.full_path(),
libvdpau_gallium.full_path(),
vdpau_drivers_path,
vdpau_drivers,
install_tag : 'runtime',
)
if vdpau_drivers.length() > 0
meson.add_install_script(
install_megadrivers_py.full_path(),
libvdpau_gallium.full_path(),
vdpau_drivers_path,
vdpau_drivers,
install_tag : 'runtime',
)
endif