From 6fa923a65daf1ee73c5cc763ade91abc82da7085 Mon Sep 17 00:00:00 2001 From: David Shao Date: Sun, 24 Feb 2019 09:00:36 +0000 Subject: [PATCH] meson: ensure that xmlpool_options.h is generated for gallium targets that need it Fixes: 68076b87474e7959c161 "meson: build gallium vdpau state tracker" Fixes: 22a817af8a89eb3c762f "meson: build gallium xvmc state tracker" Fixes: 5a785d51a6d68ec676ce "meson: build gallium va state tracker" Fixes: 0ba909f0f111824223bc "meson: build gallium xa state tracker" Fixes: 1d36dc674d528b93bec3 "meson: build gallium omx state tracker" Reviewed-by: Eric Engestrom --- src/gallium/targets/omx/meson.build | 2 +- src/gallium/targets/va/meson.build | 2 +- src/gallium/targets/vdpau/meson.build | 2 +- src/gallium/targets/xa/meson.build | 2 +- src/gallium/targets/xvmc/meson.build | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gallium/targets/omx/meson.build b/src/gallium/targets/omx/meson.build index 6811e6ff904..7772ae47bb5 100644 --- a/src/gallium/targets/omx/meson.build +++ b/src/gallium/targets/omx/meson.build @@ -32,7 +32,7 @@ endif libomx_gallium = shared_library( 'omx_mesa', - 'target.c', + ['target.c', xmlpool_options_h], c_args : c_vis_args, cpp_args : cpp_vis_args, link_args : [omx_link_args, ld_args_gc_sections], diff --git a/src/gallium/targets/va/meson.build b/src/gallium/targets/va/meson.build index ded689b464d..8786c80b810 100644 --- a/src/gallium/targets/va/meson.build +++ b/src/gallium/targets/va/meson.build @@ -33,7 +33,7 @@ endif libva_gallium = shared_library( 'gallium_drv_video', - 'target.c', + ['target.c', xmlpool_options_h], c_args : c_vis_args, cpp_args : cpp_vis_args, link_args : [va_link_args, ld_args_gc_sections], diff --git a/src/gallium/targets/vdpau/meson.build b/src/gallium/targets/vdpau/meson.build index 22e3f5ffdd8..b53a4c232e9 100644 --- a/src/gallium/targets/vdpau/meson.build +++ b/src/gallium/targets/vdpau/meson.build @@ -38,7 +38,7 @@ endif libvdpau_gallium = shared_library( 'vdpau_gallium', - 'target.c', + ['target.c', xmlpool_options_h], c_args : c_vis_args, cpp_args : cpp_vis_args, link_args : [vdpau_link_args, ld_args_gc_sections], diff --git a/src/gallium/targets/xa/meson.build b/src/gallium/targets/xa/meson.build index 733ef54ff85..582d5ef67f6 100644 --- a/src/gallium/targets/xa/meson.build +++ b/src/gallium/targets/xa/meson.build @@ -34,7 +34,7 @@ _xa_version = '.'.join(xa_version) libxatracker = shared_library( 'xatracker', - 'target.c', + ['target.c', xmlpool_options_h], c_args : c_vis_args, cpp_args : cpp_vis_args, link_args : [xa_link_args, ld_args_gc_sections], diff --git a/src/gallium/targets/xvmc/meson.build b/src/gallium/targets/xvmc/meson.build index 0af5b6477ce..f91ac4e8c0c 100644 --- a/src/gallium/targets/xvmc/meson.build +++ b/src/gallium/targets/xvmc/meson.build @@ -33,7 +33,7 @@ endif libxvmc_gallium = shared_library( 'XvMCgallium', - 'target.c', + ['target.c', xmlpool_options_h], c_args : c_vis_args, cpp_args : cpp_vis_args, link_args : [xvmc_link_args, ld_args_gc_sections], -- 2.30.2