diff options
| author | Pulkit Singh Tak <quic_ptak@quicinc.com> | 2025-05-08 14:24:13 +0530 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2025-05-08 07:22:50 -0700 |
| commit | 817e5876a2b21ca73d02ae7d54729b55b6ef4e9f (patch) | |
| tree | 707aefac407a803ee0313e01e4cbd11ea9c9472a /meta-oe/recipes-support | |
| parent | 7dd27c20504790eb5090b8732781ae463a99f8b1 (diff) | |
| download | meta-openembedded-817e5876a2b21ca73d02ae7d54729b55b6ef4e9f.tar.gz | |
opencv: Added fix for Cluster Euclidean and Box Filter
Updated FastCV libs hash to include fix for Cluster Euclidean and Box Filter
and support for FastCV SVD API
Signed-off-by: Pulkit Singh Tak <quic_ptak@quicinc.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-FastCV-latest-libs-hash-update.patch | 50 | ||||
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv_4.11.0.bb | 5 |
2 files changed, 53 insertions, 2 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-FastCV-latest-libs-hash-update.patch b/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-FastCV-latest-libs-hash-update.patch new file mode 100644 index 0000000000..b35335c35e --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-FastCV-latest-libs-hash-update.patch | |||
| @@ -0,0 +1,50 @@ | |||
| 1 | From ba6eb8d95292f4631a3b8de09bfaa59e43c17226 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: adsha-quic <quic_adsha@quicinc.com> | ||
| 3 | Date: Wed, 16 Apr 2025 18:54:40 +0530 | ||
| 4 | Subject: [PATCH] FROMLIST: Merge pull request #27214 from CodeLinaro:fastcv_lib_hash_update | ||
| 5 | |||
| 6 | Signed-off-by: Alexander Smorkalov <alexander.smorkalov@opencv.ai> | ||
| 7 | Upstream-Status: Submitted [https://github.com/opencv/opencv/pull/27214] | ||
| 8 | |||
| 9 | --- | ||
| 10 | 3rdparty/fastcv/fastcv.cmake | 14 +++++++------- | ||
| 11 | 1 file changed, 7 insertions(+), 7 deletions(-) | ||
| 12 | |||
| 13 | diff --git a/3rdparty/fastcv/fastcv.cmake b/3rdparty/fastcv/fastcv.cmake | ||
| 14 | index 5c81c11300..6fee4ce4ce 100644 | ||
| 15 | --- a/3rdparty/fastcv/fastcv.cmake | ||
| 16 | +++ b/3rdparty/fastcv/fastcv.cmake | ||
| 17 | @@ -1,23 +1,23 @@ | ||
| 18 | function(download_fastcv root_dir) | ||
| 19 | |||
| 20 | # Commit SHA in the opencv_3rdparty repo | ||
| 21 | - set(FASTCV_COMMIT "f4413cc2ab7233fdfc383a4cded402c072677fb0") | ||
| 22 | + set(FASTCV_COMMIT "8d86e68dad8b80b8575a8d3cf401d3ee96c24148") | ||
| 23 | |||
| 24 | # Define actual FastCV versions | ||
| 25 | if(ANDROID) | ||
| 26 | if(AARCH64) | ||
| 27 | message(STATUS "Download FastCV for Android aarch64") | ||
| 28 | - set(FCV_PACKAGE_NAME "fastcv_android_aarch64_2024_12_11.tgz") | ||
| 29 | - set(FCV_PACKAGE_HASH "9dac41e86597305f846212dae31a4a88") | ||
| 30 | + set(FCV_PACKAGE_NAME "fastcv_android_aarch64_2025_04_08.tgz") | ||
| 31 | + set(FCV_PACKAGE_HASH "e028966a1d1b2f3f0bc5967d316e8b64") | ||
| 32 | else() | ||
| 33 | message(STATUS "Download FastCV for Android armv7") | ||
| 34 | - set(FCV_PACKAGE_NAME "fastcv_android_arm32_2024_12_11.tgz") | ||
| 35 | - set(FCV_PACKAGE_HASH "fe2d30334180b17e3031eee92aac43b6") | ||
| 36 | + set(FCV_PACKAGE_NAME "fastcv_android_arm32_2025_04_08.tgz") | ||
| 37 | + set(FCV_PACKAGE_HASH "6fc1e812a4b3ef392469d2283e037ffe") | ||
| 38 | endif() | ||
| 39 | elseif(UNIX AND NOT APPLE AND NOT IOS AND NOT XROS) | ||
| 40 | if(AARCH64) | ||
| 41 | - set(FCV_PACKAGE_NAME "fastcv_linux_aarch64_2025_02_12.tgz") | ||
| 42 | - set(FCV_PACKAGE_HASH "33ac2a59cf3e7d6402eee2e010de1202") | ||
| 43 | + set(FCV_PACKAGE_NAME "fastcv_linux_aarch64_2025_04_08.tgz") | ||
| 44 | + set(FCV_PACKAGE_HASH "062a26639cd2788beee2e0dd8743d680") | ||
| 45 | else() | ||
| 46 | message("FastCV: fastcv lib for 32-bit Linux is not supported for now!") | ||
| 47 | endif() | ||
| 48 | -- | ||
| 49 | 2.34.1 | ||
| 50 | |||
diff --git a/meta-oe/recipes-support/opencv/opencv_4.11.0.bb b/meta-oe/recipes-support/opencv/opencv_4.11.0.bb index 61dc681a39..3f90500784 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.11.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.11.0.bb | |||
| @@ -16,7 +16,7 @@ SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" | |||
| 16 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" | 16 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" |
| 17 | SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" | 17 | SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" |
| 18 | SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252" | 18 | SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252" |
| 19 | SRCREV_fastcv = "f4413cc2ab7233fdfc383a4cded402c072677fb0" | 19 | SRCREV_fastcv = "8d86e68dad8b80b8575a8d3cf401d3ee96c24148" |
| 20 | 20 | ||
| 21 | 21 | ||
| 22 | SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg_fastcv" | 22 | SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg_fastcv" |
| @@ -26,7 +26,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=ht | |||
| 26 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \ | 26 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \ |
| 27 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \ | 27 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \ |
| 28 | git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \ | 28 | git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \ |
| 29 | git://github.com/opencv/opencv_3rdparty.git;branch=fastcv/4.x_20250212;destsuffix=git/fastcv;name=fastcv;protocol=https \ | 29 | git://github.com/opencv/opencv_3rdparty.git;branch=fastcv/4.x_20250410;destsuffix=git/fastcv;name=fastcv;protocol=https \ |
| 30 | file://0003-To-fix-errors-as-following.patch \ | 30 | file://0003-To-fix-errors-as-following.patch \ |
| 31 | file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ | 31 | file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ |
| 32 | file://0001-Dont-use-isystem.patch \ | 32 | file://0001-Dont-use-isystem.patch \ |
| @@ -35,6 +35,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=ht | |||
| 35 | file://0008-Do-not-embed-build-directory-in-binaries.patch \ | 35 | file://0008-Do-not-embed-build-directory-in-binaries.patch \ |
| 36 | file://0001-core-fixed-VSX-intrinsics-implementation.patch \ | 36 | file://0001-core-fixed-VSX-intrinsics-implementation.patch \ |
| 37 | file://0001-FROMLIST-Switch-to-static-instance-of-FastCV-on-Linux.patch \ | 37 | file://0001-FROMLIST-Switch-to-static-instance-of-FastCV-on-Linux.patch \ |
| 38 | file://0001-FROMLIST-FastCV-latest-libs-hash-update.patch \ | ||
| 38 | " | 39 | " |
| 39 | SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" | 40 | SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" |
| 40 | 41 | ||
