mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00
Code Issues Projects Releases Wiki Activity

gstreamer1.0-plugins-bad: fix msdk pkgconfig build failure

Browse Source 
Error log:
| Run-time dependency libmfx found: YES 1.34
| Has header "mfx/mfxdefs.h" : YES
|
| ../gst-plugins-bad-1.18.2/sys/msdk/meson.build:75:2: ERROR: Include dir /usr/include/mfx does not exist.
|
| A full log can be found at /home/s

When msdk is enable in PACKAGECONFIG, plugin fails to locate includedir, so
adding a patch which prepend PKG_CONFIG_SYSROOT_DIR to the dir path

(From OE-Core rev: 204aa9cfa6ac99846ac494778dd143a13746ac7e)

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Naveen Saini
2021-01-13 11:07:22 +08:00
committed by Richard Purdie
parent 43e8dd7934
commit c750a47a5e
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch
+31
View File
@@ -0,0 +1,31 @@
From 1f00d5026118ebd48e4ccf83d32d67155c4e7f60 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
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>
---
sys/msdk/meson.build | 2 ++
1 file changed, 2 insertions(+)
diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build
index 6346c9451..068f38548 100644
--- a/sys/msdk/meson.build
+++ b/sys/msdk/meson.build
@@ -40,7 +40,9 @@ endif
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
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.18.2.bb
+1
View File
@@ -5,6 +5,7 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad
file://0002-avoid-including-sys-poll.h-directly.patch \
file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch \
file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \
file://0005-msdk-fix-includedir-path.patch \
"
SRC_URI[sha256sum] = "8ad5822f1118fe46a19af54422b74e3a16d79a6800dcb173b49e199a496b341a"