From a3fd375f259bb4e31072b7c594881e93f91d6d21 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 16 Feb 2021 14:29:22 +0100 Subject: [PATCH] opencv: Update recipe to new NXP BSP release imx_5.4.70_2.3.1 Remove outdated patch and update source revision Signed-off-by: Gabriel Valcazar --- .../opencv/opencv/uselocalxfeatures.patch | 21 ------------------- .../opencv/opencv_4.4.0.imx.bb | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 meta-digi-dey/recipes-support/opencv/opencv/uselocalxfeatures.patch diff --git a/meta-digi-dey/recipes-support/opencv/opencv/uselocalxfeatures.patch b/meta-digi-dey/recipes-support/opencv/opencv/uselocalxfeatures.patch deleted file mode 100644 index 8ffee51dd..000000000 --- a/meta-digi-dey/recipes-support/opencv/opencv/uselocalxfeatures.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: contrib/modules/xfeatures2d/CMakeLists.txt -=================================================================== ---- contrib.orig/modules/xfeatures2d/CMakeLists.txt -+++ contrib/modules/xfeatures2d/CMakeLists.txt -@@ -5,11 +5,11 @@ ocv_define_module(xfeatures2d opencv_cor - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_vgg.cmake) - include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_boostdesc.cmake) - set(DOWNLOAD_DIR "${OpenCV_BINARY_DIR}/downloads/xfeatures2d") --download_boost_descriptors("${DOWNLOAD_DIR}" boost_status) --download_vgg_descriptors("${DOWNLOAD_DIR}" vgg_status) --if(NOT boost_status OR NOT vgg_status) -- ocv_module_disable(xfeatures2d) --endif() -+#download_boost_descriptors("${DOWNLOAD_DIR}" boost_status) -+#download_vgg_descriptors("${DOWNLOAD_DIR}" vgg_status) -+#if(NOT boost_status OR NOT vgg_status) -+# ocv_module_disable(xfeatures2d) -+#endif() - - ocv_module_include_directories("${DOWNLOAD_DIR}") - diff --git a/meta-digi-dey/recipes-support/opencv/opencv_4.4.0.imx.bb b/meta-digi-dey/recipes-support/opencv/opencv_4.4.0.imx.bb index 9a35573fd..77af844d0 100644 --- a/meta-digi-dey/recipes-support/opencv/opencv_4.4.0.imx.bb +++ b/meta-digi-dey/recipes-support/opencv/opencv_4.4.0.imx.bb @@ -2,7 +2,7 @@ require opencv_4.4.0.bb LIC_FILES_CHKSUM = "file://LICENSE;md5=19598330421859a6dd353a4318091ac7" -SRCREV_opencv = "3dbe28a38b6f7d1e24572e2533044adfe4287a40" +SRCREV_opencv = "e39e6eded2d365a5dc370e1a72717e132166cf07" SRCREV_contrib = "5fae4082cc493efa5cb7a7486f9e009618a5198b" SRCREV_extra = "65796edadce27ed013e3deeedb3c081ff527e4ec" SRC_URI[tinydnn.md5sum] = "adb1c512e09ca2c7a6faef36f9c53e59"