From 8bcfaa71e035b6a1f89d5da5eb3c27850eb5ae45 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 21 Jan 2022 20:56:56 +0100 Subject: opencv: imx: prevent warning about distutils Merge latest opencv recipe in meta-openembedded. Prevents: | WARNING: distutils-common-base.bbclass is deprecated, please use setuptools3-base.bbclass instead Signed-off-by: Max Krummenacher --- recipes-support/opencv/opencv_4.5.2.imx.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-support') diff --git a/recipes-support/opencv/opencv_4.5.2.imx.bb b/recipes-support/opencv/opencv_4.5.2.imx.bb index f84e29d7c..df277d0ee 100644 --- a/recipes-support/opencv/opencv_4.5.2.imx.bb +++ b/recipes-support/opencv/opencv_4.5.2.imx.bb @@ -147,7 +147,7 @@ PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," inherit pkgconfig cmake -inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'distutils3-base', '', d)} +inherit ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'setuptools3-base', '', d)} inherit ${@bb.utils.contains('PACKAGECONFIG', 'python2', 'distutils-base', '', d)} export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" -- cgit v1.2.3-54-g00ecf From 4dda991038ad6d609933509b698d395e06df59a2 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 21 Jan 2022 20:59:18 +0100 Subject: opencv: imx: stop fetching tiny-dnn With commit f7ca9ef27 ("cleanup: drop dnn_modern") [1] tiny-dnn is no longer used by any module. There is no need to prefetch it. This was part of OpenCV 3.4.2. Prevents: | WARNING: opencv-4.5.2.imx-r0 do_unpack: QA Issue: opencv: SRC_URI uses unstable GitHub/GitLab archives, convert recipe to use git protocol [src-uri-bad] [1] https://github.com/opencv/opencv_contrib/commit/f7ca9ef279bbb9d7bbb791548725d91e46725550 Signed-off-by: Max Krummenacher --- recipes-support/opencv/opencv_4.5.2.imx.bb | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'recipes-support') diff --git a/recipes-support/opencv/opencv_4.5.2.imx.bb b/recipes-support/opencv/opencv_4.5.2.imx.bb index df277d0ee..f8824a18f 100644 --- a/recipes-support/opencv/opencv_4.5.2.imx.bb +++ b/recipes-support/opencv/opencv_4.5.2.imx.bb @@ -265,11 +265,8 @@ SRC_URI += " \ " SRCREV_FORMAT:append = "_extra" -# Add tiny-dnn -SRC_URI[tinydnn.md5sum] = "adb1c512e09ca2c7a6faef36f9c53e59" -SRC_URI[tinydnn.sha256sum] = "e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5175846505aa18b" +# Patch DNN example SRC_URI += " \ - https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz;destsuffix=git/3rdparty/tinydnn/tiny-dnn-1.0.0a3;name=tinydnn;unpack=false \ file://OpenCV_DNN_examples.patch \ " @@ -286,11 +283,6 @@ PACKAGECONFIG[openvx] = "-DWITH_OPENVX=ON -DOPENVX_ROOT=${STAGING_LIBDIR} -DOPEN PACKAGECONFIG[qt5] = "-DWITH_QT=ON -DOE_QMAKE_PATH_EXTERNAL_HOST_BINS=${STAGING_BINDIR_NATIVE} -DCMAKE_PREFIX_PATH=${STAGING_BINDIR_NATIVE}/cmake,-DWITH_QT=OFF,qtbase qtbase-native," PACKAGECONFIG[tests-imx] = "-DINSTALL_TESTS=ON -DOPENCV_TEST_DATA_PATH=${S}/../extra/testdata, -DINSTALL_TESTS=OFF," -do_unpack_extra:append() { - mkdir -p ${S}/3rdparty/tinydnn/ - tar xzf ${WORKDIR}/v1.0.0a3.tar.gz -C ${S}/3rdparty/tinydnn/ -} - do_install:append() { ln -sf opencv4/opencv2 ${D}${includedir}/opencv2 install -d ${D}${datadir}/OpenCV/samples/data -- cgit v1.2.3-54-g00ecf