aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2020-01-09 14:28:17 +0000
committerRoss Burton <ross.burton@intel.com>2020-01-09 16:15:57 +0000
commit1e7c1aee75f483b8309e3f5c8a75f44041abc251 (patch)
treeaf519c297bee79483ae3d2a1d47a36997d234284
parent1fedd1e0117f9649646ed324f4d0e48332754fdb (diff)
downloadmeta-openembedded-contrib-1e7c1aee75f483b8309e3f5c8a75f44041abc251.tar.gz
meta-openembedded-contrib-1e7c1aee75f483b8309e3f5c8a75f44041abc251.tar.bz2
meta-openembedded-contrib-1e7c1aee75f483b8309e3f5c8a75f44041abc251.zip
opencv: PACKAGECONFIG for G-API, use system ADE
The Graph API is enabled by default, and if ADE isn't present it will download a copy of the source during do_configure. Add a PACKAGECONFIG for the Graph API, and depend on the ADE that we package. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta-oe/recipes-support/opencv/opencv_4.1.0.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
index 487393f388..03e4f58dca 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb
@@ -93,10 +93,11 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \
"
EXTRA_OECMAKE_append_x86 = " -DX86=ON"
-PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \
+PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \
${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \
${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}"
+PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade"
PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native,"