From 00f5ea9fdc8f5a8d460767cfa8a10639646fb665 Mon Sep 17 00:00:00 2001 From: Quentin Glidic Date: Thu, 23 Apr 2020 10:47:05 +0200 Subject: [PATCH] meson: Use dependency.partial_dependency() It avoids calling pkg-config which was searched for in a wrong way, thus breaking setup where unprefixed pkg-config was banned (e.g. on Exherbo). Signed-off-by: Quentin Glidic Fixes: 53f9131205a63fa8b282ab2a7e96c48209447da0 ("meson: fix getting cflags from pkg-config") Reviewed-by: Dylan Baker Part-of: --- meson.build | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index d3557d318d7..ba4fdb2a59f 100644 --- a/meson.build +++ b/meson.build @@ -455,8 +455,6 @@ if with_dri endif endif -prog_pkgconfig = find_program('pkg-config') - _vdpau = get_option('gallium-vdpau') if not system_has_kms_drm if _vdpau == 'true' @@ -483,9 +481,7 @@ with_gallium_vdpau = false if _vdpau != 'false' dep_vdpau = dependency('vdpau', version : '>= 1.1', required : _vdpau == 'true') if dep_vdpau.found() - dep_vdpau = declare_dependency( - compile_args : run_command(prog_pkgconfig, ['vdpau', '--cflags']).stdout().split() - ) + dep_vdpau = dep_vdpau.partial_dependency(compile_args : true) with_gallium_vdpau = true endif endif @@ -635,9 +631,7 @@ dep_va = null_dep if _va != 'false' dep_va = dependency('libva', version : '>= 0.38.0', required : _va == 'true') if dep_va.found() - dep_va_headers = declare_dependency( - compile_args : run_command(prog_pkgconfig, ['libva', '--cflags']).stdout().split() - ) + dep_va_headers = dep_va.partial_dependency(compile_args : true) with_gallium_va = true endif endif @@ -1590,8 +1584,7 @@ if with_platform_wayland dep_wayland_server = dependency('wayland-server', version : '>=1.11') if with_egl dep_wayland_egl = dependency('wayland-egl-backend', version : '>= 3') - dep_wayland_egl_headers = declare_dependency( - compile_args : run_command(prog_pkgconfig, ['wayland-egl-backend', '--cflags']).stdout().split()) + dep_wayland_egl_headers = dep_wayland_egl.partial_dependency(compile_args : true) endif wayland_dmabuf_xml = join_paths( dep_wl_protocols.get_pkgconfig_variable('pkgdatadir'), 'unstable', -- 2.30.2