summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaewon Lee <jaewon.lee@xilinx.com>2020-04-03 14:35:43 -0700
committerJaewon Lee <jaewon.lee@xilinx.com>2020-04-03 15:05:22 -0700
commite7dd46d48af54811edfdb0a68c4006b87eaeea52 (patch)
treeb67f288f716787c6bbfb85d5670ec0cdc84acf23
parentc424bf4e7e1cbb27facc542befd4194d9d2a6da0 (diff)
downloadmeta-xilinx-e7dd46d48af54811edfdb0a68c4006b87eaeea52.tar.gz
opencv_3.4.3.bb: Removing tiny-dnn from SRC_URI
Removing tiny-dnn from SRC_URI as it is not picked up by opencv cmake build system. This also fixes a QA warning about using ustable github archive in sources Signed-off-by: Jaewon Lee <jaewon.lee@xilinx.com>
-rw-r--r--meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3.bb6
1 files changed, 0 insertions, 6 deletions
diff --git a/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3.bb b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3.bb
index 72a9c8b3..e5d83706 100644
--- a/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3.bb
+++ b/meta-xilinx-bsp/recipes-support/opencv/opencv_3.4.3.bb
@@ -17,8 +17,6 @@ SRCREV_contrib = "1f6d6f06266e1ef336437ae5404bee1c65d42cda"
17SRCREV_ipp = "bdb7bb85f34a8cb0d35e40a81f58da431aa1557a" 17SRCREV_ipp = "bdb7bb85f34a8cb0d35e40a81f58da431aa1557a"
18SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" 18SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
19SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" 19SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
20SRC_URI[tinydnn.md5sum] = "adb1c512e09ca2c7a6faef36f9c53e59"
21SRC_URI[tinydnn.sha256sum] = "e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5175846505aa18b"
22 20
23def ipp_filename(d): 21def ipp_filename(d):
24 import re 22 import re
@@ -45,7 +43,6 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
45 git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180518;destsuffix=ipp;name=ipp \ 43 git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180518;destsuffix=ipp;name=ipp \
46 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 \
47 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 \
48 https://github.com/tiny-dnn/tiny-dnn/archive/v1.0.0a3.tar.gz;destsuffix=git/3rdparty/tinydnn/tiny-dnn-1.0.0a3;name=tinydnn;unpack=false \
49 file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ 46 file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \
50 file://uselocalxfeatures.patch;patchdir=../contrib/ \ 47 file://uselocalxfeatures.patch;patchdir=../contrib/ \
51 file://0001-Add-missing-multi-line-separator.patch;patchdir=../contrib/ \ 48 file://0001-Add-missing-multi-line-separator.patch;patchdir=../contrib/ \
@@ -61,8 +58,6 @@ PV = "3.4.3+git${SRCPV}"
61S = "${WORKDIR}/git" 58S = "${WORKDIR}/git"
62 59
63do_unpack_extra() { 60do_unpack_extra() {
64 mkdir -p ${S}/3rdparty/tinydnn/
65 tar xzf ${WORKDIR}/v1.0.0a3.tar.gz -C ${S}/3rdparty/tinydnn/
66 tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} 61 tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR}
67 cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src 62 cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
68 cp ${WORKDIR}/boostdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src 63 cp ${WORKDIR}/boostdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src
@@ -89,7 +84,6 @@ PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb
89 84
90PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," 85PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas,"
91PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," 86PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft,"
92PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native,"
93PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog," 87PACKAGECONFIG[eigen] = "-DWITH_EIGEN=ON,-DWITH_EIGEN=OFF,libeigen gflags glog,"
94PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype," 88PACKAGECONFIG[freetype] = "-DBUILD_opencv_freetype=ON,-DBUILD_opencv_freetype=OFF,freetype,"
95PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2," 89PACKAGECONFIG[gphoto2] = "-DWITH_GPHOTO2=ON,-DWITH_GPHOTO2=OFF,libgphoto2,"