diff options
author | Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> | 2017-11-08 13:10:26 +0100 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-11-19 13:41:58 -0800 |
commit | f888426e9039111c6626c31415c00adfe5af7a9c (patch) | |
tree | fc3c3775c36f0c61be019eb8babc88f3c188f538 /meta-oe/recipes-support | |
parent | f4da4b7ceb6845fccf28879b411f04dd8a93079c (diff) | |
download | meta-openembedded-f888426e9039111c6626c31415c00adfe5af7a9c.tar.gz |
opencv: Download tinydnn manually
OpenCV was downloading tinydnn during configuration via a script. This
patch downloads and unpacks tinydnn manually.
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv/tinydnn.patch | 34 | ||||
-rw-r--r-- | meta-oe/recipes-support/opencv/opencv_3.3.bb | 6 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/opencv/opencv/tinydnn.patch b/meta-oe/recipes-support/opencv/opencv/tinydnn.patch new file mode 100644 index 000000000..c433fc312 --- /dev/null +++ b/meta-oe/recipes-support/opencv/opencv/tinydnn.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | Upstream-status: Inappropriate [OE specific] | ||
2 | |||
3 | Signed-off-by: Ricardo Ribalda <ricardo.ribalda@gmail.com> | ||
4 | diff --git a/modules/dnn_modern/CMakeLists.txt b/modules/dnn_modern/CMakeLists.txt | ||
5 | index 79b64b12160b..ba06a0a163e4 100644 | ||
6 | --- a/modules/dnn_modern/CMakeLists.txt | ||
7 | +++ b/modules/dnn_modern/CMakeLists.txt | ||
8 | @@ -15,24 +15,8 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) | ||
9 | # MODULE REQUIREMENTS | ||
10 | # ---------------------------------------------------------------------------- | ||
11 | |||
12 | -set(TINY_DNN_CPP_PATH "${OpenCV_BINARY_DIR}/3rdparty/tinydnn") | ||
13 | -set(TINY_DNN_CPP_ROOT "${TINY_DNN_CPP_PATH}/tiny-dnn-1.0.0a3") | ||
14 | -ocv_download(FILENAME "v1.0.0a3.tar.gz" | ||
15 | - HASH "adb1c512e09ca2c7a6faef36f9c53e59" | ||
16 | - URL | ||
17 | - "${OPENCV_TINY_DNN_URL}" | ||
18 | - "$ENV{OPENCV_TINY_DNN_URL}" | ||
19 | - "https://github.com/tiny-dnn/tiny-dnn/archive/" | ||
20 | - DESTINATION_DIR "${TINY_DNN_CPP_PATH}" | ||
21 | - STATUS TINY_DNN_DOWNLOAD_SUCCESS | ||
22 | - ID "tiny-dnn" | ||
23 | - UNPACK RELATIVE_URL) | ||
24 | - | ||
25 | -if(NOT TINY_DNN_DOWNLOAD_SUCCESS) | ||
26 | - message(STATUS "Failed to download tiny-dnn sources") | ||
27 | -endif() | ||
28 | - | ||
29 | -find_package(TinyDNN QUIET) | ||
30 | +set(TINYDNN_INCLUDE_DIRS "${OpenCV_SOURCE_DIR}/3rdparty/tinydnn/tiny-dnn-1.0.0a3") | ||
31 | +set(TinyDNN_FOUND TRUE) | ||
32 | |||
33 | include(CheckCXXCompilerFlag) | ||
34 | CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) | ||
diff --git a/meta-oe/recipes-support/opencv/opencv_3.3.bb b/meta-oe/recipes-support/opencv/opencv_3.3.bb index 1c398aacc..8f0aa7f54 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.3.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.3.bb | |||
@@ -15,6 +15,8 @@ SRCREV_contrib = "2a9d1b22ed76eb22fad1a5edf6faf4d05f207b13" | |||
15 | SRCREV_ipp = "a62e20676a60ee0ad6581e217fe7e4bada3b95db" | 15 | SRCREV_ipp = "a62e20676a60ee0ad6581e217fe7e4bada3b95db" |
16 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" | 16 | SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" |
17 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" | 17 | SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" |
18 | SRC_URI[tinydnn.md5sum] = "adb1c512e09ca2c7a6faef36f9c53e59" | ||
19 | SRC_URI[tinydnn.sha256sum] = "e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5175846505aa18b" | ||
18 | 20 | ||
19 | def ipp_filename(d): | 21 | def ipp_filename(d): |
20 | import re | 22 | import re |
@@ -41,9 +43,11 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ | |||
41 | git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20170418;destsuffix=ipp;name=ipp \ | 43 | git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20170418;destsuffix=ipp;name=ipp \ |
42 | 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 \ |
43 | 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 \ |
46 | 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 \ | ||
44 | file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ | 47 | file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ |
45 | file://fixpkgconfig.patch \ | 48 | file://fixpkgconfig.patch \ |
46 | file://uselocalxfeatures.patch;patchdir=../contrib/ \ | 49 | file://uselocalxfeatures.patch;patchdir=../contrib/ \ |
50 | file://tinydnn.patch;patchdir=../contrib/ \ | ||
47 | file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \ | 51 | file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \ |
48 | file://0003-To-fix-errors-as-following.patch \ | 52 | file://0003-To-fix-errors-as-following.patch \ |
49 | file://0001-build-workaround-GCC-7.1.1-compilation-issue-with-sa.patch \ | 53 | file://0001-build-workaround-GCC-7.1.1-compilation-issue-with-sa.patch \ |
@@ -60,6 +64,8 @@ PV = "3.3+git${SRCPV}" | |||
60 | S = "${WORKDIR}/git" | 64 | S = "${WORKDIR}/git" |
61 | 65 | ||
62 | do_unpack_extra() { | 66 | do_unpack_extra() { |
67 | mkdir -p ${S}/3rdparty/tinydnn/ | ||
68 | tar xzf ${WORKDIR}/v1.0.0a3.tar.gz -C ${S}/3rdparty/tinydnn/ | ||
63 | tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} | 69 | tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} |
64 | cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src | 70 | cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src |
65 | cp ${WORKDIR}/boostdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src | 71 | cp ${WORKDIR}/boostdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src |