From aa0f860f06ae2758bc013d9ceb49cff33be8cc61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Thu, 27 Sep 2018 02:15:35 +0100
Subject: [PATCH] Fix build on arm and s390x

---
 ...e96ce795ed003cf83a777ba65d6dd2d8afce.patch | 30 +++++++++++++++++++
 opencv.spec                                   |  9 ++++--
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 6a01e96ce795ed003cf83a777ba65d6dd2d8afce.patch

diff --git a/6a01e96ce795ed003cf83a777ba65d6dd2d8afce.patch b/6a01e96ce795ed003cf83a777ba65d6dd2d8afce.patch
new file mode 100644
index 0000000..311232b
--- /dev/null
+++ b/6a01e96ce795ed003cf83a777ba65d6dd2d8afce.patch
@@ -0,0 +1,30 @@
+From 6a01e96ce795ed003cf83a777ba65d6dd2d8afce 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))
+               ^
+---
+ 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 1edf6bf421..0477d37edb 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
diff --git a/opencv.spec b/opencv.spec
index 687a0a7..abed7ab 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -47,7 +47,7 @@
 
 Name:           opencv
 Version:        3.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Collection of algorithms for computer vision
 # This is normal three clause BSD.
 License:        BSD
@@ -63,6 +63,7 @@ Source1:        %{name}_contrib-clean-%{version}.tar.gz
 # https://bugzilla.redhat.com/1031312
 Patch1:         opencv-3.4.1-cmake_paths.patch
 Patch10:        https://github.com/opencv/opencv/commit/4910f16f16a0a0c2b456b14cbc3429c86f96a5f5.patch
+Patch11:        https://github.com/opencv/opencv_contrib/commit/6a01e96ce795ed003cf83a777ba65d6dd2d8afce.patch
 
 BuildRequires:  libtool
 BuildRequires:  cmake >= 2.6.3
@@ -228,13 +229,14 @@ rm -r 3rdparty/
 rm -r modules/dnn/
 
 %patch1 -p1 -b .cmake_paths
-%ifarch %{ix86}
+%ifarch %{ix86} %{arm}
 %patch10 -p1 -R -b .revert_support_YV12_too
 %endif
 
 pushd %{name}_contrib-%{version}
 # missing dependecies for dnn_modern module in Fedora (tiny-dnn)
 #rm -r modules/dnn_modern/
+%patch11 -p1 -b .Add_missing_multi-line_separator
 popd
 
 # fix dos end of lines
@@ -397,6 +399,9 @@ popd
 %{_libdir}/libopencv_xphoto.so.%{abiver}*
 
 %changelog
+* Thu Sep 27 2018 Sérgio Basto <sergio@serjux.com> - 3.4.3-2
+- Fix build on arm and s390x
+
 * Wed Sep 26 2018 Sérgio Basto <sergio@serjux.com> - 3.4.3-1
 - Update to 3.4.3