Atri Bhattacharya
3cfcde3d9a
* Bugfixes, see
https://github.com/opencv/opencv/wiki/ChangeLog#version3420
* Various bugfixes backported from 4.7 branch see
https://github.com/opencv/opencv/compare/3.4.19...3.4.20
- Drop opencv3-pr19384-tbb2021.patch: Fixed upstream.
- Rebase/refresh opencv-build-compare.patch with quilt.
OBS-URL: https://build.opensuse.org/package/show/science/opencv3?expand=0&rev=34
42 lines
1.9 KiB
Diff
42 lines
1.9 KiB
Diff
Index: opencv-3.4.20/CMakeLists.txt
|
|
===================================================================
|
|
--- opencv-3.4.20.orig/CMakeLists.txt
|
|
+++ opencv-3.4.20/CMakeLists.txt
|
|
@@ -1053,11 +1053,11 @@ endif()
|
|
if(OPENCV_TIMESTAMP)
|
|
status(" Timestamp:" ${OPENCV_TIMESTAMP})
|
|
endif()
|
|
-status(" Host:" ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_HOST_SYSTEM_VERSION} ${CMAKE_HOST_SYSTEM_PROCESSOR})
|
|
+status(" Host:" "Linux")
|
|
if(CMAKE_CROSSCOMPILING)
|
|
status(" Target:" ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION} ${CMAKE_SYSTEM_PROCESSOR})
|
|
endif()
|
|
-status(" CMake:" ${CMAKE_VERSION})
|
|
+status(" CMake:" "YES")
|
|
status(" CMake generator:" ${CMAKE_GENERATOR})
|
|
status(" CMake build tool:" ${CMAKE_BUILD_TOOL})
|
|
if(MSVC)
|
|
Index: opencv-3.4.20/cmake/OpenCVUtils.cmake
|
|
===================================================================
|
|
--- opencv-3.4.20.orig/cmake/OpenCVUtils.cmake
|
|
+++ opencv-3.4.20/cmake/OpenCVUtils.cmake
|
|
@@ -1023,15 +1023,18 @@ function(status text)
|
|
if(${status_cond})
|
|
string(REPLACE ";" " " status_then "${status_then}")
|
|
string(REGEX REPLACE "^[ \t]+" "" status_then "${status_then}")
|
|
+ string(REGEX REPLACE "\\(ver [^\\)]+\\)" "" status_then "${status_then}")
|
|
ocv_output_status("${status_text} ${status_then}")
|
|
else()
|
|
string(REPLACE ";" " " status_else "${status_else}")
|
|
string(REGEX REPLACE "^[ \t]+" "" status_else "${status_else}")
|
|
+ string(REGEX REPLACE "\\(ver [^\\)]+\\)" "" status_else "${status_else}")
|
|
ocv_output_status("${status_text} ${status_else}")
|
|
endif()
|
|
else()
|
|
string(REPLACE ";" " " status_cond "${status_cond}")
|
|
string(REGEX REPLACE "^[ \t]+" "" status_cond "${status_cond}")
|
|
+ string(REGEX REPLACE "\\(ver [^\\)]+\\)" "" status_cond "${status_cond}")
|
|
ocv_output_status("${status_text} ${status_cond}")
|
|
endif()
|
|
else()
|