diff options
author | Naveen Saini <naveen.kumar.saini@intel.com> | 2022-04-20 10:26:55 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-20 13:14:00 +0100 |
commit | a807ba311d9024d0ce5de6ca4b0ad5d859f742cd (patch) | |
tree | fb730d2effd6100ecc898caf2958d919ec8a97eb /meta | |
parent | e64ee2d2a24f366ad2c3d84f8f2ed05c71489bbd (diff) | |
download | poky-a807ba311d9024d0ce5de6ca4b0ad5d859f742cd.tar.gz |
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: eaa3b31247b4d3cc47428f4d80ae31f232e344d4)
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch | 40 | ||||
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.1.bb | 1 |
2 files changed, 0 insertions, 41 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch deleted file mode 100644 index 273b45bd49..0000000000 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0005-msdk-fix-includedir-path.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From e31f68c46ff0c29fa3c22755f18d5dde87b23bf2 Mon Sep 17 00:00:00 2001 | ||
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> | ||
11 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | ||
12 | |||
13 | --- | ||
14 | sys/msdk/meson.build | 4 ++++ | ||
15 | 1 file changed, 4 insertions(+) | ||
16 | |||
17 | diff --git a/sys/msdk/meson.build b/sys/msdk/meson.build | ||
18 | index 24aabc7..6003bb7 100644 | ||
19 | --- a/sys/msdk/meson.build | ||
20 | +++ b/sys/msdk/meson.build | ||
21 | @@ -46,7 +46,9 @@ if mfx_api != 'oneVPL' | ||
22 | mfx_dep = dependency('libmfx', version: ['>= 1.0', '<= 1.99'], required: false) | ||
23 | |||
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 | ||
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.1.bb index 78e8f35025..134bd3adad 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.1.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.20.1.bb | |||
@@ -10,7 +10,6 @@ SRC_URI = "https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad | |||
10 | file://0002-avoid-including-sys-poll.h-directly.patch \ | 10 | file://0002-avoid-including-sys-poll.h-directly.patch \ |
11 | file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch \ | 11 | file://0003-ensure-valid-sentinals-for-gst_structure_get-etc.patch \ |
12 | file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ | 12 | file://0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch \ |
13 | file://0005-msdk-fix-includedir-path.patch \ | ||
14 | " | 13 | " |
15 | SRC_URI[sha256sum] = "09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848" | 14 | SRC_URI[sha256sum] = "09d3c2cf5911f0bc7da6bf557a55251779243d3de216b6a26cc90c445b423848" |
16 | 15 | ||