diff options
| author | Ross Burton <ross.burton@intel.com> | 2020-01-09 16:21:39 +0000 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-01-10 00:50:59 -0800 |
| commit | 288367cfe170dc44b47412c376c771621647c484 (patch) | |
| tree | 66d51a68523202ec3dcc5370abc43c560c243cf0 | |
| parent | 74a54d5eda05d9f0d488dfe32b5973815a29e931 (diff) | |
| download | meta-openembedded-288367cfe170dc44b47412c376c771621647c484.tar.gz | |
opencv: also download face alignment data in do_fetch()
The face alignment data is downloaded in do_configure, so download it in
do_fetch and add it to the cache.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb index cfc7854e1d..487393f388 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb | |||
| @@ -15,6 +15,7 @@ SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7" | |||
| 15 | SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4" | 15 | SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4" |
| 16 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" | 16 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" |
| 17 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" | 17 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" |
| 18 | SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" | ||
| 18 | 19 | ||
| 19 | def ipp_filename(d): | 20 | def ipp_filename(d): |
| 20 | import re | 21 | import re |
| @@ -41,6 +42,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ | |||
| 41 | git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180723;destsuffix=ipp;name=ipp \ | 42 | git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180723;destsuffix=ipp;name=ipp \ |
| 42 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ | 43 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ |
| 43 | git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ | 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_face_alignment_20170818;destsuffix=face;name=face \ | ||
| 44 | file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ | 46 | file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ |
| 45 | file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \ | 47 | file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \ |
| 46 | file://0003-To-fix-errors-as-following.patch \ | 48 | file://0003-To-fix-errors-as-following.patch \ |
| @@ -73,6 +75,7 @@ do_unpack_extra() { | |||
| 73 | } | 75 | } |
| 74 | cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i | 76 | cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i |
| 75 | cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i | 77 | cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i |
| 78 | cache data ${WORKDIR}/face/*.dat | ||
| 76 | } | 79 | } |
| 77 | addtask unpack_extra after do_unpack before do_patch | 80 | addtask unpack_extra after do_unpack before do_patch |
| 78 | 81 | ||
