summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2020-03-01 08:33:00 +0800
committerArmin Kuster <akuster808@gmail.com>2020-03-15 13:30:34 -0700
commitcb24464d4547601bd3a844bf1f2610a2e1018149 (patch)
tree305b1b9d6b8da8e805e762b0962fc3595d898b99
parent18933cb8d81950adc04e3839f541dbef22bd0a5f (diff)
downloadmeta-openembedded-cb24464d4547601bd3a844bf1f2610a2e1018149.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> Signed-off-by: Yeoh Ee Peng <ee.peng.yeoh@intel.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/opencv/opencv_4.1.0.bb3
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 cfc7854e1..487393f38 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"
15SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4" 15SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4"
16SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" 16SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
17SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" 17SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
18SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"
18 19
19def ipp_filename(d): 20def 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}
77addtask unpack_extra after do_unpack before do_patch 80addtask unpack_extra after do_unpack before do_patch
78 81