| Message ID | 20250506065344.146577-1-ptak@qti.qualcomm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-filesystems] opencv: Added fix for Cluster Euclidean and Box Filter | expand |
On Tue, May 6, 2025 at 5:57 AM Pulkit Singh Tak via lists.openembedded.org <ptak=qti.qualcomm.com@lists.openembedded.org> wrote: > > From: Pulkit Singh Tak <quic_ptak@quicinc.com> > > 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> > --- > ...MLIST-FastCV-latest-libs-hash-update.patch | 50 +++++++++++++++++++ > .../recipes-support/opencv/opencv_4.11.0.bb | 5 +- > 2 files changed, 53 insertions(+), 2 deletions(-) > create mode 100644 meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-FastCV-latest-libs-hash-update.patch > > 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..2f969e1ede > --- /dev/null > +++ b/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-FastCV-latest-libs-hash-update.patch > @@ -0,0 +1,50 @@ > +From ba6eb8d95292f4631a3b8de09bfaa59e43c17226 Mon Sep 17 00:00:00 2001 > +From: adsha-quic <quic_adsha@quicinc.com> > +Date: Wed, 16 Apr 2025 18:54:40 +0530 > +Subject: [PATCH] FROMLIST: Merge pull request #27214 from CodeLinaro:fastcv_lib_hash_update > + > +Signed-off-by: Alexander Smorkalov <alexander.smorkalov@opencv.ai> > +Upstream-Status: Submitted [https://github.com/opencv/opencv_3rdparty/pull/94] > + > +--- > + 3rdparty/fastcv/fastcv.cmake | 14 +++++++------- > + 1 file changed, 7 insertions(+), 7 deletions(-) > + > +diff --git a/3rdparty/fastcv/fastcv.cmake b/3rdparty/fastcv/fastcv.cmake > +index 5c81c11300..6fee4ce4ce 100644 > +--- a/3rdparty/fastcv/fastcv.cmake > ++++ b/3rdparty/fastcv/fastcv.cmake > +@@ -1,23 +1,23 @@ > + function(download_fastcv root_dir) > + > + # Commit SHA in the opencv_3rdparty repo > +- set(FASTCV_COMMIT "f4413cc2ab7233fdfc383a4cded402c072677fb0") > ++ set(FASTCV_COMMIT "8d86e68dad8b80b8575a8d3cf401d3ee96c24148") > + > + # Define actual FastCV versions > + if(ANDROID) > + if(AARCH64) > + message(STATUS "Download FastCV for Android aarch64") > +- set(FCV_PACKAGE_NAME "fastcv_android_aarch64_2024_12_11.tgz") > +- set(FCV_PACKAGE_HASH "9dac41e86597305f846212dae31a4a88") > ++ set(FCV_PACKAGE_NAME "fastcv_android_aarch64_2025_04_08.tgz") > ++ set(FCV_PACKAGE_HASH "e028966a1d1b2f3f0bc5967d316e8b64") > + else() > + message(STATUS "Download FastCV for Android armv7") > +- set(FCV_PACKAGE_NAME "fastcv_android_arm32_2024_12_11.tgz") > +- set(FCV_PACKAGE_HASH "fe2d30334180b17e3031eee92aac43b6") > ++ set(FCV_PACKAGE_NAME "fastcv_android_arm32_2025_04_08.tgz") > ++ set(FCV_PACKAGE_HASH "6fc1e812a4b3ef392469d2283e037ffe") > + endif() > + elseif(UNIX AND NOT APPLE AND NOT IOS AND NOT XROS) > + if(AARCH64) > +- set(FCV_PACKAGE_NAME "fastcv_linux_aarch64_2025_02_12.tgz") > +- set(FCV_PACKAGE_HASH "33ac2a59cf3e7d6402eee2e010de1202") > ++ set(FCV_PACKAGE_NAME "fastcv_linux_aarch64_2025_04_08.tgz") > ++ set(FCV_PACKAGE_HASH "062a26639cd2788beee2e0dd8743d680") > + else() > + message("FastCV: fastcv lib for 32-bit Linux is not supported for now!") > + endif() > +-- > +2.34.1 > + > 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..8a5821e2f1 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" > SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" > SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" > SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252" > -SRCREV_fastcv = "f4413cc2ab7233fdfc383a4cded402c072677fb0" > +SRCREV_fastcv = "8d86e68dad8b80b8575a8d3cf401d3ee96c24148" > > > 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 > git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \ > git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \ > git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \ > - git://github.com/opencv/opencv_3rdparty.git;branch=fastcv/4.x_20250212;destsuffix=git/fastcv;name=fastcv;protocol=https \ > + git://github.com/opencv/opencv_3rdparty.git;branch=fastcv/4.x_20250410;destsuffix=git/fastcv;name=fastcv;protocol=https \ > file://0003-To-fix-errors-as-following.patch \ > file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ > 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 > file://0008-Do-not-embed-build-directory-in-binaries.patch \ > file://0001-core-fixed-VSX-intrinsics-implementation.patch \ > file://0001-FROMLIST-Switch-to-static-instance-of-FastCV-on-Linux.patch \ > + file://0001-FROMLIST-FastCV-latest-libs-hash-update.patch \ \ double backslash here. How was this tested ? > " > SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" > > -- > 2.34.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#117350): https://lists.openembedded.org/g/openembedded-devel/message/117350 > Mute This Topic: https://lists.openembedded.org/mt/112645186/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
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..2f969e1ede --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-FastCV-latest-libs-hash-update.patch @@ -0,0 +1,50 @@ +From ba6eb8d95292f4631a3b8de09bfaa59e43c17226 Mon Sep 17 00:00:00 2001 +From: adsha-quic <quic_adsha@quicinc.com> +Date: Wed, 16 Apr 2025 18:54:40 +0530 +Subject: [PATCH] FROMLIST: Merge pull request #27214 from CodeLinaro:fastcv_lib_hash_update + +Signed-off-by: Alexander Smorkalov <alexander.smorkalov@opencv.ai> +Upstream-Status: Submitted [https://github.com/opencv/opencv_3rdparty/pull/94] + +--- + 3rdparty/fastcv/fastcv.cmake | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/3rdparty/fastcv/fastcv.cmake b/3rdparty/fastcv/fastcv.cmake +index 5c81c11300..6fee4ce4ce 100644 +--- a/3rdparty/fastcv/fastcv.cmake ++++ b/3rdparty/fastcv/fastcv.cmake +@@ -1,23 +1,23 @@ + function(download_fastcv root_dir) + + # Commit SHA in the opencv_3rdparty repo +- set(FASTCV_COMMIT "f4413cc2ab7233fdfc383a4cded402c072677fb0") ++ set(FASTCV_COMMIT "8d86e68dad8b80b8575a8d3cf401d3ee96c24148") + + # Define actual FastCV versions + if(ANDROID) + if(AARCH64) + message(STATUS "Download FastCV for Android aarch64") +- set(FCV_PACKAGE_NAME "fastcv_android_aarch64_2024_12_11.tgz") +- set(FCV_PACKAGE_HASH "9dac41e86597305f846212dae31a4a88") ++ set(FCV_PACKAGE_NAME "fastcv_android_aarch64_2025_04_08.tgz") ++ set(FCV_PACKAGE_HASH "e028966a1d1b2f3f0bc5967d316e8b64") + else() + message(STATUS "Download FastCV for Android armv7") +- set(FCV_PACKAGE_NAME "fastcv_android_arm32_2024_12_11.tgz") +- set(FCV_PACKAGE_HASH "fe2d30334180b17e3031eee92aac43b6") ++ set(FCV_PACKAGE_NAME "fastcv_android_arm32_2025_04_08.tgz") ++ set(FCV_PACKAGE_HASH "6fc1e812a4b3ef392469d2283e037ffe") + endif() + elseif(UNIX AND NOT APPLE AND NOT IOS AND NOT XROS) + if(AARCH64) +- set(FCV_PACKAGE_NAME "fastcv_linux_aarch64_2025_02_12.tgz") +- set(FCV_PACKAGE_HASH "33ac2a59cf3e7d6402eee2e010de1202") ++ set(FCV_PACKAGE_NAME "fastcv_linux_aarch64_2025_04_08.tgz") ++ set(FCV_PACKAGE_HASH "062a26639cd2788beee2e0dd8743d680") + else() + message("FastCV: fastcv lib for 32-bit Linux is not supported for now!") + endif() +-- +2.34.1 + 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..8a5821e2f1 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" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252" -SRCREV_fastcv = "f4413cc2ab7233fdfc383a4cded402c072677fb0" +SRCREV_fastcv = "8d86e68dad8b80b8575a8d3cf401d3ee96c24148" 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 git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \ git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \ - git://github.com/opencv/opencv_3rdparty.git;branch=fastcv/4.x_20250212;destsuffix=git/fastcv;name=fastcv;protocol=https \ + git://github.com/opencv/opencv_3rdparty.git;branch=fastcv/4.x_20250410;destsuffix=git/fastcv;name=fastcv;protocol=https \ file://0003-To-fix-errors-as-following.patch \ file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ 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 file://0008-Do-not-embed-build-directory-in-binaries.patch \ file://0001-core-fixed-VSX-intrinsics-implementation.patch \ file://0001-FROMLIST-Switch-to-static-instance-of-FastCV-on-Linux.patch \ + file://0001-FROMLIST-FastCV-latest-libs-hash-update.patch \ \ " SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib"