From 112aea3cedf827c82357241a6a1edfb32a9570a2 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Sun, 1 Mar 2020 08:33:01 +0800 Subject: 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 Signed-off-by: Khem Raj Signed-off-by: Yeoh Ee Peng Signed-off-by: Armin Kuster --- meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-oe/recipes-support/opencv/opencv_4.1.0.bb') 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," -- cgit 1.2.3-korg