1*73bd93f1SPatrick WilliamsFrom e6eb7536fcfc2c75f7831f67b1f16f3f36ef2545 Mon Sep 17 00:00:00 2001 26ce62a20SAndrew GeisslerFrom: Andrey Zhizhikin <andrey.z@gmail.com> 36ce62a20SAndrew GeisslerDate: Mon, 27 Jan 2020 10:22:35 +0000 47e0e3c0cSAndrew GeisslerSubject: [PATCH] opencv: resolve missing opencv data dir in yocto build 56ce62a20SAndrew Geissler 66ce62a20SAndrew GeisslerWhen Yocto build is performed, opencv searches for data dir using simple 76ce62a20SAndrew Geissler'test' command, this fails because pkg-config provides an absolute 86ce62a20SAndrew Geisslerpath on the target which needs to be prepended by PKG_CONFIG_SYSROOT_DIR 96ce62a20SAndrew Geisslerin order for the 'test' utility to pick up the absolute path. 106ce62a20SAndrew Geissler 116ce62a20SAndrew GeisslerUpstream-Status: Inappropriate [OE-specific] 126ce62a20SAndrew Geissler 136ce62a20SAndrew GeisslerSigned-off-by: Andrey Zhizhikin <andrey.z@gmail.com> 147e0e3c0cSAndrew GeisslerSigned-off-by: Jose Quaresma <quaresma.jose@gmail.com> 157e0e3c0cSAndrew Geissler 166ce62a20SAndrew Geissler--- 177e0e3c0cSAndrew Geissler ext/opencv/meson.build | 3 +++ 187e0e3c0cSAndrew Geissler 1 file changed, 3 insertions(+) 196ce62a20SAndrew Geissler 206ce62a20SAndrew Geisslerdiff --git a/ext/opencv/meson.build b/ext/opencv/meson.build 21*73bd93f1SPatrick Williamsindex 37e2015..326f737 100644 226ce62a20SAndrew Geissler--- a/ext/opencv/meson.build 236ce62a20SAndrew Geissler+++ b/ext/opencv/meson.build 247e0e3c0cSAndrew Geissler@@ -87,6 +87,9 @@ if opencv_found 257e0e3c0cSAndrew Geissler opencv_prefix = opencv_dep.get_variable('prefix') 266ce62a20SAndrew Geissler gstopencv_cargs += ['-DOPENCV_PREFIX="' + opencv_prefix + '"'] 276ce62a20SAndrew Geissler 287e0e3c0cSAndrew Geissler+ pkgconf_sysroot = run_command(python3, '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() 297e0e3c0cSAndrew Geissler+ opencv_prefix = pkgconf_sysroot + opencv_prefix 307e0e3c0cSAndrew Geissler+ 316ce62a20SAndrew Geissler # Check the data dir used by opencv for its xml data files 326ce62a20SAndrew Geissler # Use prefix from pkg-config to be compatible with cross-compilation 337e0e3c0cSAndrew Geissler r = run_command('test', '-d', opencv_prefix + '/share/opencv', check: false) 34