From ab65a8ee27451d3a63375ec389ed050bc075db16 Mon Sep 17 00:00:00 2001
From: Toyohisa Kameyama <kameyama@riken.jp>
Date: Thu, 28 May 2020 18:23:15 +0900
Subject: opencv: fix to build version 3.2.0 with Fujitsu compiler (#16840)
---
.../repos/builtin/packages/opencv/opencv3.2_fj.patch | 20 ++++++++++++++++++++
var/spack/repos/builtin/packages/opencv/package.py | 1 +
2 files changed, 21 insertions(+)
create mode 100644 var/spack/repos/builtin/packages/opencv/opencv3.2_fj.patch
(limited to 'var')
diff --git a/var/spack/repos/builtin/packages/opencv/opencv3.2_fj.patch b/var/spack/repos/builtin/packages/opencv/opencv3.2_fj.patch
new file mode 100644
index 0000000000..dae8af256b
--- /dev/null
+++ b/var/spack/repos/builtin/packages/opencv/opencv3.2_fj.patch
@@ -0,0 +1,20 @@
+diff -ru opencv-3.2.0.org/modules/core/include/opencv2/core/hal/intrin_neon.hpp opencv-3.2.0/modules/core/include/opencv2/core/hal/intrin_neon.hpp
+--- opencv-3.2.0.org/modules/core/include/opencv2/core/hal/intrin_neon.hpp 2016-12-23 21:54:44.000000000 +0900
++++ opencv-3.2.0/modules/core/include/opencv2/core/hal/intrin_neon.hpp 2020-05-27 14:39:11.288700481 +0900
+@@ -282,10 +282,16 @@
+ { return (int16x4_t)a; }
+ template <typename T> static inline float16x4_t vreinterpret_f16_s16(T a)
+ { return (float16x4_t)a; }
++#ifdef vld1_f16
++#undef vld1_f16
++#endif
+ template <typename T> static inline float16x4_t vld1_f16(const T* ptr)
+ { return vreinterpret_f16_s16(vld1_s16((const short*)ptr)); }
++#ifdef vst1_f16
++#undef vst1_f16
++#endif
+ template <typename T> static inline void vst1_f16(T* ptr, float16x4_t a)
+ { vst1_s16((short*)ptr, vreinterpret_s16_f16(a)); }
+
+ struct v_float16x4
+ {
diff --git a/var/spack/repos/builtin/packages/opencv/package.py b/var/spack/repos/builtin/packages/opencv/package.py
index c589e7fdd2..52f59263b8 100644
--- a/var/spack/repos/builtin/packages/opencv/package.py
+++ b/var/spack/repos/builtin/packages/opencv/package.py
@@ -126,6 +126,7 @@ class Opencv(CMakePackage, CudaPackage):
patch('opencv3.2_regacyvtk.patch', when='@3.2+vtk')
patch('opencv3.2_ffmpeg.patch', when='@3.2+videoio')
patch('opencv3.2_python3.7.patch', when='@3.2+python')
+ patch('opencv3.2_fj.patch', when='@3.2 %fj')
depends_on('eigen', when='+eigen')
depends_on('zlib', when='+zlib')
--
cgit v1.2.3-70-g09d2