diff options
Diffstat (limited to 'meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch')
-rw-r--r-- | meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch index 50a3143eca..965053348f 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/0004-opencv-resolve-missing-opencv-data-dir-in-yocto-buil.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From e6eb7536fcfc2c75f7831f67b1f16f3f36ef2545 Mon Sep 17 00:00:00 2001 | 1 | From 39fbcdfc5383bdae95293a3109c847f64d193b54 Mon Sep 17 00:00:00 2001 |
2 | From: Andrey Zhizhikin <andrey.z@gmail.com> | 2 | From: Andrey Zhizhikin <andrey.z@gmail.com> |
3 | Date: Mon, 27 Jan 2020 10:22:35 +0000 | 3 | Date: Mon, 27 Jan 2020 10:22:35 +0000 |
4 | Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build | 4 | Subject: [PATCH] opencv: resolve missing opencv data dir in yocto build |
@@ -12,18 +12,17 @@ Upstream-Status: Inappropriate [OE-specific] | |||
12 | 12 | ||
13 | Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> | 13 | Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> |
14 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | 14 | Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> |
15 | |||
16 | --- | 15 | --- |
17 | ext/opencv/meson.build | 3 +++ | 16 | gst-libs/gst/opencv/meson.build | 3 +++ |
18 | 1 file changed, 3 insertions(+) | 17 | 1 file changed, 3 insertions(+) |
19 | 18 | ||
20 | diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build | 19 | diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build |
21 | index 37e2015..326f737 100644 | 20 | index 1d337f1..f47939a 100644 |
22 | --- a/ext/opencv/meson.build | 21 | --- a/gst-libs/gst/opencv/meson.build |
23 | +++ b/ext/opencv/meson.build | 22 | +++ b/gst-libs/gst/opencv/meson.build |
24 | @@ -87,6 +87,9 @@ if opencv_found | 23 | @@ -52,6 +52,9 @@ if opencv_found |
25 | opencv_prefix = opencv_dep.get_variable('prefix') | 24 | # /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format string is not a string literal [-Werror,-Wformat-nonliteral] |
26 | gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] | 25 | gstopencv_cargs += cxx.get_supported_arguments(['-Wno-missing-include-dirs', '-Wno-format-nonliteral']) |
27 | 26 | ||
28 | + pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() | 27 | + pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() |
29 | + opencv_prefix = pkgconf_sysroot + opencv_prefix | 28 | + opencv_prefix = pkgconf_sysroot + opencv_prefix |