diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-04-14 02:38:39 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2021-04-15 09:28:43 -0700 |
commit | 9a3040040f3df84c0d564af3707c29335ea06c68 (patch) | |
tree | 9060075f2849629ad304d3c57ddfdff29a77fbe7 /meta-oe/recipes-support/opencv | |
parent | f0d923503a6636b3186365cdb4e8fc7d66149b3f (diff) | |
download | meta-openembedded-9a3040040f3df84c0d564af3707c29335ea06c68.tar.gz |
opencv: fetch wechat_qrcode files used by dnn PACKAGECONFIG
* otherwise build fails when dnn is enabled:
| -- wechat_qrcode: Download: detect.caffemodel
| CMake Error at /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/git/cmake/OpenCVDownload.cmake:161 (message):
| Not going to download detect.caffemodel
| Call Stack (most recent call first):
| /OE/build/oe-core/tmp-glibc/work/core2-64-oe-linux/opencv/4.5.2-r0/contrib/modules/wechat_qrcode/CMakeLists.txt:16 (ocv_download)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/opencv')
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_4.5.2.bb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb b/meta-oe/recipes-support/opencv/opencv_4.5.2.bb index 553fb4e08..04ab80754 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.5.2.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.5.2.bb | |||
@@ -16,6 +16,7 @@ SRCREV_ipp = "a56b6ac6f030c312b2dce17430eef13aed9af274" | |||
16 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" | 16 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" |
17 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" | 17 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" |
18 | SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" | 18 | SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" |
19 | SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252" | ||
19 | 20 | ||
20 | def ipp_filename(d): | 21 | def ipp_filename(d): |
21 | import re | 22 | import re |
@@ -43,6 +44,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ | |||
43 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ | 44 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ |
44 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ | 45 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ |
45 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ | 46 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ |
47 | git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=wechat_qrcode;name=wechat-qrcode \ | ||
46 | file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ | 48 | file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ |
47 | file://0003-To-fix-errors-as-following.patch \ | 49 | file://0003-To-fix-errors-as-following.patch \ |
48 | file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ | 50 | file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ |
@@ -77,6 +79,8 @@ do_unpack_extra() { | |||
77 | cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i | 79 | cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i |
78 | cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i | 80 | cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i |
79 | cache data ${WORKDIR}/face/*.dat | 81 | cache data ${WORKDIR}/face/*.dat |
82 | cache wechat_qrcode ${WORKDIR}/wechat_qrcode/*.caffemodel | ||
83 | cache wechat_qrcode ${WORKDIR}/wechat_qrcode/*.prototxt | ||
80 | } | 84 | } |
81 | addtask unpack_extra after do_unpack before do_patch | 85 | addtask unpack_extra after do_unpack before do_patch |
82 | 86 | ||