opencv/opencv-build-compare.patch
Dominique Leuenberger 96e8562f65 Accepting request 612803 from KDE:Extra
- Add patch to fix use of headers from C:
  * build-workaround-issues-with-c.patch

- Update to 3.4.1:
  * Added support for quantized TensorFlow networks
  * OpenCV is now able to use Intel DL inference engine as DNN
    acceleration backend
  * Added AVX-512 acceleration to the performance-critical kernels
  * For more information, read
    https://github.com/opencv/opencv/wiki/ChangeLog#version341
- Update contrib modules to 3.4.1:
  * No changelog available
- Change mechanism the contrib modules are built
- Include LICENSE of contrib tarball as well
- Build with python3 on >= 15
- Add patch to fix build on i386 without SSE:
  * fix-build-i386-nosse.patch
- Refresh patches:
  * fix_processor_detection_for_32bit_on_64bit.patch
  * opencv-build-compare.patch
- Mention all libs explicitly
- Rebase 3.4.0 update from i@marguerite.su
- update to 3.4.0
  * Added faster R-CNN support
  * Javascript bindings have been extended to
    cover DNN module
  * DNN has been further accelerated for iGPU
    using OpenCL
  * On-disk caching of precompiled OpenCL
    kernels has been finally implemented

OBS-URL: https://build.opensuse.org/request/show/612803
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/opencv?expand=0&rev=71
2018-06-02 09:53:10 +00:00

42 lines
1.9 KiB
Diff

Index: opencv-3.4.1/CMakeLists.txt
===================================================================
--- opencv-3.4.1.orig/CMakeLists.txt
+++ opencv-3.4.1/CMakeLists.txt
@@ -966,11 +966,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.1/cmake/OpenCVUtils.cmake
===================================================================
--- opencv-3.4.1.orig/cmake/OpenCVUtils.cmake
+++ opencv-3.4.1/cmake/OpenCVUtils.cmake
@@ -730,15 +730,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()