[Mesa-dev] [7/6] meson: use va-api version reported by pkg-config

[Marc Dietrich]

Am Donnerstag, 18. Januar 2018, 19:05:41 CET schrieb Dylan Baker:
> Signed-off-by: Dylan Baker <dylan.c.baker at intel.com>
> ---
>  meson.build                               | 2 +-
>  src/gallium/state_trackers/va/meson.build | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)

vainfo reports no longer an error, so it seems to be fixed.

However, I did not checked the decoding/encodeing function. I hope I can give 
it a deeper testing sometime.

Marc


> 
> diff --git a/meson.build b/meson.build
> index 1ec9e4c2221..c95c44641f9 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -528,7 +528,7 @@ else
>    with_gallium_va = false
>  endif
>  if with_gallium_va
> -  dep_va = declare_dependency(
> +  dep_va_headers = declare_dependency(
>      compile_args : dep_va.get_pkgconfig_variable('cflags').split()
>    )
>  endif
> diff --git a/src/gallium/state_trackers/va/meson.build
> b/src/gallium/state_trackers/va/meson.build index 56e68e9e28d..35da5ab532d
> 100644
> --- a/src/gallium/state_trackers/va/meson.build
> +++ b/src/gallium/state_trackers/va/meson.build
> @@ -1,4 +1,4 @@
> -# Copyright © 2017 Intel Corporation
> +# Copyright © 2017-2018 Intel Corporation
> 
>  # Permission is hereby granted, free of charge, to any person obtaining a
> copy # of this software and associated documentation files (the
> "Software"), to deal @@ -18,7 +18,7 @@
>  # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> THE # SOFTWARE.
> 
> -libva_version = ['2', '3', '0']
> +libva_version = dep_va.version().split('.')
> 
>  libva_st = static_library(
>    'va_st',
> @@ -35,5 +35,5 @@ libva_st = static_library(
>      ),
>    ],
>    include_directories : [inc_common],
> -  dependencies : [dep_va, dep_x11_xcb, dep_xcb, dep_xcb_dri2,
> dep_xcb_dri3], +  dependencies : [dep_va_headers, dep_x11_xcb, dep_xcb,
> dep_xcb_dri2, dep_xcb_dri3], )


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part.
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180119/e0f67ba9/attachment.sig>