Mesa (staging/20.0): meson: Use dependency.partial_dependency()

[GitLab Mirror]

Module: Mesa
Branch: staging/20.0
Commit: a2776c24c7bb3a203b94b4c8e31864263c63bfc4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a2776c24c7bb3a203b94b4c8e31864263c63bfc4

Author: Quentin Glidic <sardemff7+git at sardemff7.net>
Date:   Thu Apr 23 10:47:05 2020 +0200

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 <sardemff7+git at sardemff7.net>
Fixes: 53f9131205a63fa8b282ab2a7e96c48209447da0
       ("meson: fix getting cflags from pkg-config")

Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4701>
(cherry picked from commit 00f5ea9fdc8f5a8d460767cfa8a10639646fb665)

---

 .pick_status.json |  2 +-
 meson.build       | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index cd0668ed740..19ffbac413a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1318,7 +1318,7 @@
         "description": "meson: Use dependency.partial_dependency()",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "53f9131205a63fa8b282ab2a7e96c48209447da0"
     },
diff --git a/meson.build b/meson.build
index 366c41b5fed..ef4bdc2cb02 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
@@ -1564,8 +1558,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',