From 96dd3f4c82f38b2ebde284b43cdce15d7bdf04dd Mon Sep 17 00:00:00 2001 From: Herb Kuta Date: Wed, 12 Jun 2019 18:23:08 -0700 Subject: [PATCH] DRAFT opencv_3.2: Fix patch not to update cvdef.h with bogus #if --- ...evert-check-FP16-build-condition-correctly.patch | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/recipes-support/opencv/opencv/0002-Revert-check-FP16-build-condition-correctly.patch b/recipes-support/opencv/opencv/0002-Revert-check-FP16-build-condition-correctly.patch index d1950a9..33598bd 100644 --- a/recipes-support/opencv/opencv/0002-Revert-check-FP16-build-condition-correctly.patch +++ b/recipes-support/opencv/opencv/0002-Revert-check-FP16-build-condition-correctly.patch @@ -83,19 +83,6 @@ index 5bb0479..4b19fdb 100644 if(APPLE AND NOT CMAKE_CROSSCOMPILING AND NOT DEFINED ENV{LDFLAGS} AND EXISTS "/usr/local/lib") link_directories("/usr/local/lib") endif() -diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h -index efc24ca..a10936b 100644 ---- a/modules/core/include/opencv2/core/cvdef.h -+++ b/modules/core/include/opencv2/core/cvdef.h -@@ -312,7 +312,7 @@ enum CpuFeatures { - typedef union Cv16suf - { - short i; --#if CV_FP16_TYPE -+#if ( defined (__arm__) || defined (__aarch64__) ) && !defined (__CUDACC__) && ( defined (__GNUC__) && ( ( ( 4 <= __GNUC__ ) && ( 7 <= __GNUC__ ) ) || ( 5 <= __GNUC__ ) ) ) - __fp16 h; - #endif - struct _fp16Format diff --git a/modules/core/src/convert.cpp b/modules/core/src/convert.cpp index e04d89e..46db26f 100644 --- a/modules/core/src/convert.cpp