aboutsummaryrefslogtreecommitdiff
path: root/package/opencv3/0002-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-growth-on-gcc-10.patch
diff options
context:
space:
mode:
authorGravatar Fabrice Fontaine <fontaine.fabrice@gmail.com>2020-10-16 23:43:39 +0200
committerGravatar Yann E. MORIN <yann.morin.1998@free.fr>2020-10-17 15:04:46 +0200
commit7163eb6e739ce62a89104336970335b158878037 (patch)
treef4c5351b1c8178e65cbc4483c23c1670058c3a60 /package/opencv3/0002-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-growth-on-gcc-10.patch
parent19ee46b1dcb117398f1e6d773c5b8b434d73595a (diff)
downloadbuildroot-7163eb6e739ce62a89104336970335b158878037.tar.gz
buildroot-7163eb6e739ce62a89104336970335b158878037.tar.bz2
package/opencv3: bump to version 3.4.12
- Drop patches (already in version) - Update LICENSE hash, update in year: https://github.com/opencv/opencv/commit/039f5ca42e32dd11605d81e909c3bdad16c4cdbc - Update indentation in hash file (two spaces) https://github.com/opencv/opencv/wiki/ChangeLog#version3412 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Diffstat (limited to 'package/opencv3/0002-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-growth-on-gcc-10.patch')
-rw-r--r--package/opencv3/0002-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-growth-on-gcc-10.patch53
1 files changed, 0 insertions, 53 deletions
diff --git a/package/opencv3/0002-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-growth-on-gcc-10.patch b/package/opencv3/0002-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-growth-on-gcc-10.patch
deleted file mode 100644
index 321c2e51f9..0000000000
--- a/package/opencv3/0002-carotene-Replace-ipcp-unit-growth-with-ipa-cp-unit-growth-on-gcc-10.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2bd94884752b9840d434f80b1c4b83176f7063e3 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 16 Jan 2020 08:52:00 -0800
-Subject: [PATCH] carotene: Replace ipcp-unit-growth with ipa-cp-unit-growth on
- gcc >= 10
-
-gcc 10+ has renamed this option, therefore check for gcc version before
-deciding which name to use for opt parameter
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-[Retrieved from:
-https://github.com/opencv/opencv/commit/2bd94884752b9840d434f80b1c4b83176f7063e3]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- 3rdparty/carotene/CMakeLists.txt | 7 +++++--
- 3rdparty/carotene/hal/CMakeLists.txt | 6 +++++-
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/3rdparty/carotene/CMakeLists.txt b/3rdparty/carotene/CMakeLists.txt
-index bfa9368d79d..528fcf62e15 100644
---- a/3rdparty/carotene/CMakeLists.txt
-+++ b/3rdparty/carotene/CMakeLists.txt
-@@ -20,8 +20,11 @@ if(CMAKE_COMPILER_IS_GNUCC)
- # - matchTemplate about 5-10%
- # - goodFeaturesToTrack 10-20%
- # - cornerHarris 30% for some cases
--
-- set_source_files_properties(${carotene_sources} COMPILE_FLAGS "--param ipcp-unit-growth=100000 --param inline-unit-growth=100000 --param large-stack-frame-growth=5000")
-+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10.0.0")
-+ set_source_files_properties(${carotene_sources} COMPILE_FLAGS "--param ipcp-unit-growth=100000 --param inline-unit-growth=100000 --param large-stack-frame-growth=5000")
-+ else()
-+ set_source_files_properties(${carotene_sources} COMPILE_FLAGS "--param ipa-cp-unit-growth=100000 --param inline-unit-growth=100000 --param large-stack-frame-growth=5000")
-+ endif()
- endif()
-
- add_library(carotene_objs OBJECT
-diff --git a/3rdparty/carotene/hal/CMakeLists.txt b/3rdparty/carotene/hal/CMakeLists.txt
-index 819954de137..b94d8511e8a 100644
---- a/3rdparty/carotene/hal/CMakeLists.txt
-+++ b/3rdparty/carotene/hal/CMakeLists.txt
-@@ -88,7 +88,11 @@ set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS ${carotene_defs})
- # matchTemplate about 5-10%
- # goodFeaturesToTrack 10-20%
- # cornerHarris 30% for some cases
-- set_source_files_properties(impl.cpp $<TARGET_OBJECTS:carotene_objs> COMPILE_FLAGS "--param ipcp-unit-growth=100000 --param inline-unit-growth=100000 --param large-stack-frame-growth=5000")
-+ if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10.0.0")
-+ set_source_files_properties(impl.cpp $<TARGET_OBJECTS:carotene_objs> COMPILE_FLAGS "--param ipcp-unit-growth=100000 --param inline-unit-growth=100000 --param large-stack-frame-growth=5000")
-+ else()
-+ set_source_files_properties(impl.cpp $<TARGET_OBJECTS:carotene_objs> COMPILE_FLAGS "--param ipa-cp-unit-growth=100000 --param inline-unit-growth=100000 --param large-stack-frame-growth=5000")
-+ endif()
- # set_source_files_properties(impl.cpp $<TARGET_OBJECTS:carotene_objs> COMPILE_FLAGS "--param ipcp-unit-growth=100000 --param inline-unit-growth=100000 --param large-stack-frame-growth=5000")
- endif()
-