mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-04 14:39:54 +00:00
Code Issues Projects Releases Wiki Activity

opencv: Fix build on big-endian systems

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2018-09-09 23:01:26 -07:00
parent 77922f115a
commit d5ed5b9ccf
2 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-support/opencv/opencv/0001-Add-missing-multi-line-separator.patch
+36
View File
@@ -0,0 +1,36 @@
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
meta-oe/recipes-support/opencv/opencv_3.4.3.bb
+1
View File
@@ -46,6 +46,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
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 \