From: Greg V <greg@unrelenting.technology>
Date: Wed, 24 Jan 2018 18:02:42 +0000 (+0300)
Subject: meson: fix getting cflags from pkg-config
X-Git-Tag: upstream/18.1.0~2360
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=53f9131205a63fa8b282ab2a7e96c48209447da0;p=platform%2Fupstream%2Fmesa.git

meson: fix getting cflags from pkg-config

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.

Fixes: 68076b87474e ("meson: build gallium vdpau state tracker")
Fixes: a817af8a89eb ("meson: build gallium xvmc state tracker")
Fixes: 1d36dc674d52 ("meson: build gallium omx state tracker")
Fixes: 5a785d51a6d6 ("meson: build gallium va state tracker")
Reviewed-by: Dylan Baker <dylan.c.baker@intel.com>
---

diff --git a/meson.build b/meson.build
index c3a5bbf..56ff916 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