Reviewed-by: Dylan Baker <dy...@pnwbakers.com>
Quoting Greg V (2018-01-24 10:02:42)
> get_pkgconfig_variable('cflags') always returns an empty list, it's a
> function for getting *custom* variables.
>
> Meson does not yet support asking for cflags, so explicitly invoke
> pkg-config for now.
> ---
> meson.build | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 33c1b5c91b..aef2573e2d 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -373,6 +373,8 @@ if with_dri or with_gallium
> endif
> endif
>
> +prog_pkgconfig = find_program('pkg-config')
> +
> dep_vdpau = []
> _vdpau = get_option('gallium-vdpau')
> if _vdpau == 'auto'
> @@ -404,7 +406,7 @@ else
> endif
> if with_gallium_vdpau
> dep_vdpau = declare_dependency(
> - compile_args : dep_vdpau.get_pkgconfig_variable('cflags').split()
> + compile_args : run_command(prog_pkgconfig, ['vdpau',
> '--cflags']).stdout().split()
> )
> endif
>
> @@ -445,7 +447,7 @@ else
> endif
> if with_gallium_xvmc
> dep_xvmc = declare_dependency(
> - compile_args : dep_xvmc.get_pkgconfig_variable('cflags').split()
> + compile_args : run_command(prog_pkgconfig, ['xvmc',
> '--cflags']).stdout().split()
> )
> endif
>
> @@ -508,7 +510,7 @@ if with_gallium_omx
> endif
> if with_gallium_omx
> dep_omx = declare_dependency(
> - compile_args : dep_omx.get_pkgconfig_variable('cflags').split()
> + compile_args : run_command(prog_pkgconfig, ['libomxil-bellagio',
> '--cflags']).stdout().split()
> )
> endif
>
> @@ -541,7 +543,7 @@ else
> endif
> if with_gallium_va
> dep_va = declare_dependency(
> - compile_args : dep_va.get_pkgconfig_variable('cflags').split()
> + compile_args : run_command(prog_pkgconfig, ['libva',
> '--cflags']).stdout().split()
> )
> endif
>
> --
> 2.15.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
signature.asc
Description: signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
