diff options
Diffstat (limited to 'poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch')
| -rw-r--r-- | poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch index cb3bb7d361..273b45bd49 100644 --- a/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch +++ b/poky/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch @@ -1,4 +1,4 @@ -From 1f00d5026118ebd48e4ccf83d32d67155c4e7f60 Mon Sep 17 00:00:00 2001 +From e31f68c46ff0c29fa3c22755f18d5dde87b23bf2 Mon Sep 17 00:00:00 2001 From: Naveen Saini <naveen.kumar.saini@intel.com> Date: Wed, 30 Dec 2020 16:37:47 +0800 Subject: [PATCH] msdk: fix includedir path @@ -8,24 +8,33 @@ In cross compilation, need to prepend PKG_CONFIG_SYSROOT_DIR to the dir path. Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> + --- - sys/msdk/meson.build | 2 ++ - 1 file changed, 2 insertions(+) + sys/msdk/meson.build | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build -index 6346c9451..068f38548 100644 +index 24aabc7..6003bb7 100644 --- a/sys/msdk/meson.build +++ b/sys/msdk/meson.build -@@ -40,7 +40,9 @@ endif +@@ -46,7 +46,9 @@ if mfx_api != 'oneVPL' + mfx_dep = dependency('libmfx', version: ['>= 1.0', '<= 1.99'], required: false) - mfx_dep = dependency('libmfx', required: false) - if mfx_dep.found() -+ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() - mfx_incdir = mfx_dep.get_pkgconfig_variable('includedir') -+ mfx_incdir = pkgconf_sysroot + mfx_incdir - mfx_inc = [] - else - # Old versions of MediaSDK don't provide a pkg-config file --- -2.17.1 - + if mfx_dep.found() ++ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() + mfx_incdir = mfx_dep.get_variable('includedir') ++ mfx_incdir = pkgconf_sysroot + mfx_incdir + mfx_inc = [] + use_msdk = true + else +@@ -75,7 +77,9 @@ if not use_msdk and mfx_api != 'MSDK' + mfx_dep = dependency('vpl', version: '>= 2.2', required: false) + + if mfx_dep.found() ++ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() + mfx_incdir = mfx_dep.get_variable('includedir') ++ mfx_incdir = pkgconf_sysroot + mfx_incdir + mfx_inc = [] + use_onevpl = true + endif |