mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 21:32:12 +02:00
gstreamer1.0-plugins-bad: drop patch
With latest gstreamer version pkg-config able to find header path with msdk enabled. Drop this patch as its not require anymore. (From OE-Core rev: aaea86534127b1c78d78ffe3a98bacec63d2d8a2) Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit eaa3b31247b4d3cc47428f4d80ae31f232e344d4) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
ce24cf8f2c
commit
c99977a517
@@ -1,40 +0,0 @@
|
||||
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
|
||||
|
||||
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 | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build
|
||||
index 24aabc7..6003bb7 100644
|
||||
--- a/sys/msdk/meson.build
|
||||
+++ b/sys/msdk/meson.build
|
||||
@@ -46,7 +46,9 @@ if mfx_api != 'oneVPL'
|
||||
mfx_dep = dependency('libmfx', version: ['>= 1.0', '<= 1.99'], 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_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
|
||||
@@ -10,7 +10,6 @@ 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] = "09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user