diff --git a/opencv/opencv.patch b/opencv/opencv.patch index ab250ef9c2..e0acdae5fa 100644 --- a/opencv/opencv.patch +++ b/opencv/opencv.patch @@ -1,10 +1,11 @@ Index: cmake/OpenCVCompilerOptions.cmake ---- cmake/OpenCVCompilerOptions.cmake.orig 2018-11-17 11:22:17.000000000 +0100 -+++ cmake/OpenCVCompilerOptions.cmake 2018-11-17 20:45:46.262950000 +0100 -@@ -85,43 +85,12 @@ +--- cmake/OpenCVCompilerOptions.cmake.orig 2018-11-19 07:21:32.292476000 +0100 ++++ cmake/OpenCVCompilerOptions.cmake 2018-11-19 07:22:48.095203000 +0100 +@@ -84,39 +84,6 @@ + endif() if(CV_GCC OR CV_CLANG) - # High level of warnings. +- # High level of warnings. - add_extra_compiler_option(-W) - if (NOT MSVC) - # clang-cl interprets -Wall as MSVC would: -Weverything, which is more than @@ -23,7 +24,9 @@ Index: cmake/OpenCVCompilerOptions.cmake - add_extra_compiler_option(-Wundef) - add_extra_compiler_option(-Winit-self) - add_extra_compiler_option(-Wpointer-arith) -- add_extra_compiler_option(-Wshadow) +- if(NOT (CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0")) +- add_extra_compiler_option(-Wshadow) # old GCC emits warnings for variables + methods combination +- endif() - add_extra_compiler_option(-Wsign-promo) - add_extra_compiler_option(-Wuninitialized) - add_extra_compiler_option(-Winit-self) @@ -38,16 +41,9 @@ Index: cmake/OpenCVCompilerOptions.cmake if(ENABLE_NOISY_WARNINGS) add_extra_compiler_option(-Wcast-align) add_extra_compiler_option(-Wstrict-aliasing=2) - else() - add_extra_compiler_option(-Wno-narrowing) - add_extra_compiler_option(-Wno-delete-non-virtual-dtor) -- add_extra_compiler_option(-Wno-unnamed-type-template-args) - add_extra_compiler_option(-Wno-comment) - if(NOT OPENCV_SKIP_IMPLICIT_FALLTHROUGH - AND NOT " ${CMAKE_CXX_FLAGS} ${OPENCV_EXTRA_FLAGS} ${OPENCV_EXTRA_CXX_FLAGS}" MATCHES "implicit-fallthrough" Index: modules/core/src/utils/filesystem.cpp ---- modules/core/src/utils/filesystem.cpp.orig 2018-11-17 11:22:17.000000000 +0100 -+++ modules/core/src/utils/filesystem.cpp 2018-11-17 20:44:47.076508000 +0100 +--- modules/core/src/utils/filesystem.cpp.orig 2018-11-18 10:19:28.000000000 +0100 ++++ modules/core/src/utils/filesystem.cpp 2018-11-19 07:21:32.292768000 +0100 @@ -34,7 +34,7 @@ #include #include @@ -85,8 +81,8 @@ Index: modules/core/src/utils/filesystem.cpp struct FileLock::Impl { Index: modules/dnn/src/torch/THGeneral.cpp ---- modules/dnn/src/torch/THGeneral.cpp.orig 2018-11-17 11:22:17.000000000 +0100 -+++ modules/dnn/src/torch/THGeneral.cpp 2018-11-17 20:44:47.076690000 +0100 +--- modules/dnn/src/torch/THGeneral.cpp.orig 2018-11-18 10:19:28.000000000 +0100 ++++ modules/dnn/src/torch/THGeneral.cpp 2018-11-19 07:21:32.292893000 +0100 @@ -2,7 +2,7 @@ #if defined(TH_DISABLE_HEAP_TRACKING) diff --git a/opencv/opencv.spec b/opencv/opencv.spec index 326153a140..d5b4439b97 100644 --- a/opencv/opencv.spec +++ b/opencv/opencv.spec @@ -22,8 +22,8 @@ ## # package version -%define V_opkg 3.4.4 -%define V_dist 3.4.4 +%define V_opkg 4.0.0 +%define V_dist 4.0.0 # package information Name: opencv @@ -36,7 +36,7 @@ Class: PLUS Group: Graphics License: BSD Version: %{V_opkg} -Release: 20181118 +Release: 20181119 # package options %option with_contrib no