| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 1 | From e31f68c46ff0c29fa3c22755f18d5dde87b23bf2 Mon Sep 17 00:00:00 2001 |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 2 | From: Naveen Saini <naveen.kumar.saini@intel.com> |
| 3 | Date: Wed, 30 Dec 2020 16:37:47 +0800 |
| 4 | Subject: [PATCH] msdk: fix includedir path |
| 5 | |
| 6 | In cross compilation, need to prepend PKG_CONFIG_SYSROOT_DIR to the dir path. |
| 7 | |
| 8 | Upstream-Status: Inappropriate [OE-specific] |
| 9 | |
| 10 | Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> |
| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 11 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
| 12 | |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 13 | --- |
| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 14 | sys/msdk/meson.build | 4 ++++ |
| 15 | 1 file changed, 4 insertions(+) |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 16 | |
| 17 | diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build |
| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 18 | index 24aabc7..6003bb7 100644 |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 19 | --- a/sys/msdk/meson.build |
| 20 | +++ b/sys/msdk/meson.build |
| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 21 | @@ -46,7 +46,9 @@ if mfx_api != 'oneVPL' |
| 22 | mfx_dep = dependency('libmfx', version: ['>= 1.0', '<= 1.99'], required: false) |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 23 | |
| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame] | 24 | if mfx_dep.found() |
| 25 | + pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() |
| 26 | mfx_incdir = mfx_dep.get_variable('includedir') |
| 27 | + mfx_incdir = pkgconf_sysroot + mfx_incdir |
| 28 | mfx_inc = [] |
| 29 | use_msdk = true |
| 30 | else |
| 31 | @@ -75,7 +77,9 @@ if not use_msdk and mfx_api != 'MSDK' |
| 32 | mfx_dep = dependency('vpl', version: '>= 2.2', required: false) |
| 33 | |
| 34 | if mfx_dep.found() |
| 35 | + pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() |
| 36 | mfx_incdir = mfx_dep.get_variable('includedir') |
| 37 | + mfx_incdir = pkgconf_sysroot + mfx_incdir |
| 38 | mfx_inc = [] |
| 39 | use_onevpl = true |
| 40 | endif |