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 | 20 |
1 files changed, 10 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 4d0d0e2693..d49cf5bd89 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 bd389203124592cfd91fb020ea05a5e4ad1c1394 Mon Sep 17 00:00:00 2001 | 1 | From 11a08e3f3135b649b68714c77670c37559f3a33c 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 |
| @@ -17,16 +17,16 @@ Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> | |||
| 17 | 1 file changed, 3 insertions(+) | 17 | 1 file changed, 3 insertions(+) |
| 18 | 18 | ||
| 19 | diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build | 19 | diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build |
| 20 | index 1d337f1..f47939a 100644 | 20 | index 64e913e..42a0958 100644 |
| 21 | --- a/gst-libs/gst/opencv/meson.build | 21 | --- a/gst-libs/gst/opencv/meson.build |
| 22 | +++ b/gst-libs/gst/opencv/meson.build | 22 | +++ b/gst-libs/gst/opencv/meson.build |
| 23 | @@ -52,6 +52,9 @@ if opencv_found | 23 | @@ -61,6 +61,9 @@ gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] |
| 24 | # /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format string is not a string literal [-Werror,-Wformat-nonliteral] | 24 | # /usr/include/opencv4/opencv2/flann/logger.h:83:36: error: format string is not a string literal [-Werror,-Wformat-nonliteral] |
| 25 | gstopencv_cargs += cxx.get_supported_arguments(['-Wno-missing-include-dirs', '-Wno-format-nonliteral']) | 25 | gstopencv_cargs += cxx.get_supported_arguments(['-Wno-missing-include-dirs', '-Wno-format-nonliteral']) |
| 26 | 26 | ||
| 27 | + 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() |
| 28 | + opencv_prefix = pkgconf_sysroot + opencv_prefix | 28 | +opencv_prefix = pkgconf_sysroot + opencv_prefix |
| 29 | + | 29 | + |
| 30 | # Check the data dir used by opencv for its xml data files | 30 | # Check the data dir used by opencv for its xml data files |
| 31 | # Use prefix from pkg-config to be compatible with cross-compilation | 31 | # Use prefix from pkg-config to be compatible with cross-compilation |
| 32 | r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false) | 32 | fsmod = import('fs') |