diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-support/opencv')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-multi-line-separator.patch | 36 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Check-for-clang-before-using-isystem.patch | 32 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.4.5.bb (renamed from meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.4.3.bb) | 28 |
3 files changed, 13 insertions, 83 deletions
diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-multi-line-separator.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-multi-line-separator.patch deleted file mode 100644 index 513597b8c..000000000 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Add-missing-multi-line-separator.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 60857229aab13ccc426572a43ab891409bb76ea4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 9 Sep 2018 22:52:55 -0700 -Subject: [PATCH] Add missing multi-line separator - -Otherwise this fails to build ( found on mips ) - -Fixes -contrib/modules/surface_matching/src/hash_murmur86.hpp:97:15: error: -expected constructor, destructor, or type conversion before '(' token - && defined(__GNUC__) && (__GNUC__>4 || (__GNUC__==4 && -__GNUC_MINOR__>=3)) - ^ - -Upstream-Status: Submitted [https://github.com/opencv/opencv_contrib/pull/1764] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - modules/surface_matching/src/hash_murmur86.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/surface_matching/src/hash_murmur86.hpp b/modules/surface_matching/src/hash_murmur86.hpp -index 1edf6bf4..0477d37e 100644 ---- a/modules/surface_matching/src/hash_murmur86.hpp -+++ b/modules/surface_matching/src/hash_murmur86.hpp -@@ -93,7 +93,7 @@ void hashMurmurx86 ( const void * key, const int len, const uint seed, void * ou - /* Now find best way we can to READ_UINT32 */ - #ifndef WORDS_BIGENDIAN - # define READ_UINT32(ptr) (*((uint32_t*)(ptr))) --#elif defined(WORDS_BIGENDIAN) -+#elif defined(WORDS_BIGENDIAN) \ - && defined(__GNUC__) && (__GNUC__>4 || (__GNUC__==4 && __GNUC_MINOR__>=3)) - # define READ_UINT32(ptr) (__builtin_bswap32(*((uint32_t*)(ptr)))) - #endif --- -2.18.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Check-for-clang-before-using-isystem.patch b/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Check-for-clang-before-using-isystem.patch deleted file mode 100644 index 319071a31..000000000 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv/0001-Check-for-clang-before-using-isystem.patch +++ /dev/null @@ -1,32 +0,0 @@ -From fa76d8646bb2b9b514728eeef41afed7c43a36f2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 11 Sep 2018 18:18:33 -0700 -Subject: [PATCH] Check for clang before using -isystem - -When cross compiling with clang, the internal C++ headers are not found -when adding sysroot to -isystem, that is redundant anyway because it -will look for headers insider --sysroot path with same quality as it -would do with -isystem otherwise - -Upstream-Status: Submitted [https://github.com/opencv/opencv/pull/12504] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - cmake/OpenCVUtils.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake -index fae91c165f..60c20192dc 100644 ---- a/cmake/OpenCVUtils.cmake -+++ b/cmake/OpenCVUtils.cmake -@@ -259,7 +259,7 @@ function(ocv_include_directories) - ocv_is_opencv_directory(__is_opencv_dir "${dir}") - if(__is_opencv_dir) - list(APPEND __add_before "${dir}") -- elseif(CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0" AND -+ elseif(((CV_GCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.0") OR CV_CLANG) AND - dir MATCHES "/usr/include$") - # workaround for GCC 6.x bug - else() --- -2.18.0 - diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.4.3.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.4.5.bb index 0a99700b4..fa6e06a25 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.4.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_3.4.5.bb @@ -10,9 +10,9 @@ ARM_INSTRUCTION_SET_armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "b38c50b3d0c31e82294315ec44b54b7ef559ef12" -SRCREV_contrib = "1f6d6f06266e1ef336437ae5404bee1c65d42cda" -SRCREV_ipp = "bdb7bb85f34a8cb0d35e40a81f58da431aa1557a" +SRCREV_opencv = "8f1356c3c5b16721349582db461a2051653059e8" +SRCREV_contrib = "7292df62624ded8af8035231435dfd17c93e1a80" +SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" SRC_URI[tinydnn.md5sum] = "adb1c512e09ca2c7a6faef36f9c53e59" @@ -20,19 +20,19 @@ SRC_URI[tinydnn.sha256sum] = "e2c61ce8c5debaa644121179e9dbdcf83f497f39de853f8dd5 def ipp_filename(d): import re - arch = d.getVar('TARGET_ARCH', True) + arch = d.getVar('TARGET_ARCH') if re.match("i.86$", arch): - return "ippicv_2017u3_lnx_ia32_general_20180518.tgz" + return "ippicv_2019_lnx_ia32_general_20180723.tgz" else: - return "ippicv_2017u3_lnx_intel64_general_20180518.tgz" + return "ippicv_2019_lnx_intel64_general_20180723.tgz" def ipp_md5sum(d): import re - arch = d.getVar('TARGET_ARCH', True) + arch = d.getVar('TARGET_ARCH') if re.match("i.86$", arch): - return "ea72de74dae3c604eb6348395366e78e" + return "4f38432c30bfd6423164b7a24bbc98a0" else: - return "b7cc351267db2d34b9efa1cd22ff0572" + return "c0bd78adb4156bbf552c1dfe90599607" IPP_FILENAME = "${@ipp_filename(d)}" IPP_MD5 = "${@ipp_md5sum(d)}" @@ -40,21 +40,19 @@ IPP_MD5 = "${@ipp_md5sum(d)}" SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \ - git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180518;destsuffix=ipp;name=ipp \ + git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180723;destsuffix=ipp;name=ipp \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ 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 \ file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ file://uselocalxfeatures.patch;patchdir=../contrib/ \ - file://0001-Add-missing-multi-line-separator.patch;patchdir=../contrib/ \ file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \ file://0003-To-fix-errors-as-following.patch \ file://fixpkgconfig.patch \ file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ file://0001-Dont-use-isystem.patch \ - file://0001-Check-for-clang-before-using-isystem.patch \ " -PV = "3.4.3+git${SRCPV}" +PV = "3.4.5" S = "${WORKDIR}/git" @@ -76,8 +74,6 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ - ${@oe.utils.conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ - ${@oe.utils.conditional("libdir", "/usr/lib32", "-DLIB_SUFFIX=32", "", d)} \ " EXTRA_OECMAKE_append_x86 = " -DX86=ON" @@ -180,6 +176,8 @@ SUMMARY_python3-opencv = "Python bindings to opencv" FILES_python3-opencv = "${PYTHON_SITEPACKAGES_DIR}/*" RDEPENDS_python3-opencv = "python3-core python3-numpy" +RDEPENDS_opencv-apps = "bash" + do_install_append() { cp ${S}/include/opencv/*.h ${D}${includedir}/opencv/ sed -i '/blobtrack/d' ${D}${includedir}/opencv/cvaux.h |