-
Notifications
You must be signed in to change notification settings - Fork 6.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[OpenCV] update to v4.5 and to v3.4.12 (#15162)
* [tesseract] add missing reference for downstream projects * [tesseract] restore ci, fix many regressions that are uncovered by that * Update ports/opencv2/CONTROL Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [opencv] fix regressions on uwp, accept failure on arm64 for now * Apply suggestions from code review Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * [opencv4] allow failures on all arm windows targets, both win32 and uwp * [OpenCV] update to v4.5, draft * Restore CI tests on arm architectures, they will have to work! * adopts hints from #15180 * [libarchive] bump control version * [libarchive] use vcpkg-cmake-wrapper instead of a custom libarchiveConfig, since it is vcpkg-provided and not port-provided * enable features to be visible in parent scope * apply documentation fix from CI * [libarchive] remove unnecessary lines in portfile * update patches * restore ci tests for all opencv4 configs * add port versions to baseline * [OpenCV contrib] fix glog integration * [OpenCV4] fix target processor detection * update version refs * [OpenCV3] fix target processor detection * fix also ocv3 * remove vtk feature from opencv-ci testing * remove qt5-tools from baseline, it works locally Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
- Loading branch information
1 parent
42bb41f
commit 450de5f
Showing
21 changed files
with
185 additions
and
686 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,65 +1,65 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 614baa2..1e930a3 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -601,7 +601,7 @@ endif() | ||
| ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) | ||
|
|
||
| # --- Python Support --- | ||
| -if(NOT IOS) | ||
| +if(0) | ||
| include(cmake/OpenCVDetectPython.cmake) | ||
| endif() | ||
|
|
||
| diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake | ||
| index 476156f..4b27b6a 100644 | ||
| --- a/cmake/OpenCVCompilerOptions.cmake | ||
| +++ b/cmake/OpenCVCompilerOptions.cmake | ||
| @@ -261,7 +261,6 @@ if(MSVC) | ||
| #endif() | ||
|
|
||
| if(BUILD_WITH_DEBUG_INFO) | ||
| - set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi") | ||
| set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug") | ||
| set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug") | ||
| endif() | ||
| diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake | ||
| index c7f9fc2..84bd302 100644 | ||
| --- a/cmake/OpenCVGenConfig.cmake | ||
| +++ b/cmake/OpenCVGenConfig.cmake | ||
| @@ -109,11 +109,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME) | ||
| endif() | ||
| endfunction() | ||
|
|
||
| -if((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID) | ||
| +if(TRUE) | ||
| ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "") | ||
| endif() | ||
|
|
||
| -if(ANDROID) | ||
| +if(FALSE) | ||
| ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "abi-${ANDROID_NDK_ABI_NAME}" "OpenCVConfig.root-ANDROID.cmake.in") | ||
| install(FILES "${OpenCV_SOURCE_DIR}/platforms/android/android.toolchain.cmake" DESTINATION "${OPENCV_CONFIG_INSTALL_PATH}" COMPONENT dev) | ||
| endif() | ||
| @@ -121,7 +121,7 @@ endif() | ||
| # -------------------------------------------------------------------------------------------- | ||
| # Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages | ||
| # -------------------------------------------------------------------------------------------- | ||
| -if(WIN32) | ||
| +if(0) | ||
| if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG) | ||
| ocv_gen_config("${CMAKE_BINARY_DIR}/win-install" | ||
| "${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}" | ||
| diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt | ||
| index 1f0d720..0bb1ff7 100644 | ||
| --- a/data/CMakeLists.txt | ||
| +++ b/data/CMakeLists.txt | ||
| @@ -1,8 +1,6 @@ | ||
| file(GLOB HAAR_CASCADES haarcascades/*.xml) | ||
| file(GLOB LBP_CASCADES lbpcascades/*.xml) | ||
|
|
||
| -install(FILES ${HAAR_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/haarcascades COMPONENT libs) | ||
| -install(FILES ${LBP_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/lbpcascades COMPONENT libs) | ||
|
|
||
| if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH) | ||
| install(DIRECTORY "${OPENCV_TEST_DATA_PATH}/" DESTINATION "${OPENCV_TEST_DATA_INSTALL_PATH}" COMPONENT "tests") | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index d143a7a..15eb053 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -602,7 +602,7 @@ endif() | ||
| ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) | ||
|
|
||
| # --- Python Support --- | ||
| -if(NOT IOS) | ||
| +if(FALSE) | ||
| include(cmake/OpenCVDetectPython.cmake) | ||
| endif() | ||
|
|
||
| diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake | ||
| index 9ac671d..b14ce09 100644 | ||
| --- a/cmake/OpenCVCompilerOptions.cmake | ||
| +++ b/cmake/OpenCVCompilerOptions.cmake | ||
| @@ -263,7 +263,6 @@ if(MSVC) | ||
| #endif() | ||
|
|
||
| if(BUILD_WITH_DEBUG_INFO) | ||
| - set(OPENCV_EXTRA_FLAGS_RELEASE "${OPENCV_EXTRA_FLAGS_RELEASE} /Zi") | ||
| set(OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_EXE_LINKER_FLAGS_RELEASE} /debug") | ||
| set(OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE "${OPENCV_EXTRA_SHARED_LINKER_FLAGS_RELEASE} /debug") | ||
| endif() | ||
| diff --git a/cmake/OpenCVGenConfig.cmake b/cmake/OpenCVGenConfig.cmake | ||
| index c7f9fc2..a1f657b 100644 | ||
| --- a/cmake/OpenCVGenConfig.cmake | ||
| +++ b/cmake/OpenCVGenConfig.cmake | ||
| @@ -109,11 +109,11 @@ function(ocv_gen_config TMP_DIR NESTED_PATH ROOT_NAME) | ||
| endif() | ||
| endfunction() | ||
|
|
||
| -if((CMAKE_HOST_SYSTEM_NAME MATCHES "Linux" OR UNIX) AND NOT ANDROID) | ||
| +if(TRUE) | ||
| ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "" "") | ||
| endif() | ||
|
|
||
| -if(ANDROID) | ||
| +if(FALSE) | ||
| ocv_gen_config("${CMAKE_BINARY_DIR}/unix-install" "abi-${ANDROID_NDK_ABI_NAME}" "OpenCVConfig.root-ANDROID.cmake.in") | ||
| install(FILES "${OpenCV_SOURCE_DIR}/platforms/android/android.toolchain.cmake" DESTINATION "${OPENCV_CONFIG_INSTALL_PATH}" COMPONENT dev) | ||
| endif() | ||
| @@ -121,7 +121,7 @@ endif() | ||
| # -------------------------------------------------------------------------------------------- | ||
| # Part 3/3: ${BIN_DIR}/win-install/OpenCVConfig.cmake -> For use within binary installers/packages | ||
| # -------------------------------------------------------------------------------------------- | ||
| -if(WIN32) | ||
| +if(FALSE) | ||
| if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows AND NOT OPENCV_SKIP_CMAKE_ROOT_CONFIG) | ||
| ocv_gen_config("${CMAKE_BINARY_DIR}/win-install" | ||
| "${OPENCV_INSTALL_BINARIES_PREFIX}${OPENCV_INSTALL_BINARIES_SUFFIX}" | ||
| diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt | ||
| index 1f0d720..0bb1ff7 100644 | ||
| --- a/data/CMakeLists.txt | ||
| +++ b/data/CMakeLists.txt | ||
| @@ -1,8 +1,6 @@ | ||
| file(GLOB HAAR_CASCADES haarcascades/*.xml) | ||
| file(GLOB LBP_CASCADES lbpcascades/*.xml) | ||
|
|
||
| -install(FILES ${HAAR_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/haarcascades COMPONENT libs) | ||
| -install(FILES ${LBP_CASCADES} DESTINATION ${OPENCV_OTHER_INSTALL_PATH}/lbpcascades COMPONENT libs) | ||
|
|
||
| if(INSTALL_TESTS AND OPENCV_TEST_DATA_PATH) | ||
| install(DIRECTORY "${OPENCV_TEST_DATA_PATH}/" DESTINATION "${OPENCV_TEST_DATA_INSTALL_PATH}" COMPONENT "tests") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| diff --git a/modules/cvv/src/util/observer_ptr.hpp b/modules/cvv/src/util/observer_ptr.hpp | ||
| index fef3fea..68d1a80 100644 | ||
| --- a/modules/cvv/src/util/observer_ptr.hpp | ||
| +++ b/modules/cvv/src/util/observer_ptr.hpp | ||
| @@ -11,6 +11,7 @@ | ||
| #include <cstddef> //size_t | ||
| #include <cstdint> // [u]intXX_t | ||
| #include <algorithm> // since some people like to forget that one | ||
| +#include <stdexcept> | ||
|
|
||
| namespace cvv | ||
| { | ||
| diff --git a/modules/cvv/src/util/observer_ptr.hpp b/modules/cvv/src/util/observer_ptr.hpp | ||
| index fef3fea..68d1a80 100644 | ||
| --- a/modules/cvv/src/util/observer_ptr.hpp | ||
| +++ b/modules/cvv/src/util/observer_ptr.hpp | ||
| @@ -11,6 +11,7 @@ | ||
| #include <cstddef> //size_t | ||
| #include <cstdint> // [u]intXX_t | ||
| #include <algorithm> // since some people like to forget that one | ||
| +#include <stdexcept> | ||
|
|
||
| namespace cvv | ||
| { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt | ||
| index c1c6754..360aa6b 100644 | ||
| index 12ff992..afd56eb 100644 | ||
| --- a/modules/videoio/CMakeLists.txt | ||
| +++ b/modules/videoio/CMakeLists.txt | ||
| @@ -1,3 +1,4 @@ | ||
| +cmake_minimum_required(VERSION 3.3) | ||
| set(VIDEOIO_PLUGIN_LIST "" CACHE STRING "List of videoio backends to be compiled as plugins (ffmpeg, gstreamer)") | ||
| set(VIDEOIO_PLUGIN_LIST "" CACHE STRING "List of videoio backends to be compiled as plugins (ffmpeg, gstreamer, mfx, msmf or special value 'all')") | ||
| set(VIDEOIO_ENABLE_PLUGINS "ON" CACHE BOOL "Allow building videoio plugin support") | ||
| set(VIDEOIO_ENABLE_STRICT_PLUGIN_CHECK "ON" CACHE BOOL "Make sure OpenCV version is the same in plugin and host code") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,12 @@ | ||
| diff --git a/modules/cvv/src/util/observer_ptr.hpp b/modules/cvv/src/util/observer_ptr.hpp | ||
| index fef3fea..68d1a80 100644 | ||
| --- a/modules/cvv/src/util/observer_ptr.hpp | ||
| +++ b/modules/cvv/src/util/observer_ptr.hpp | ||
| @@ -11,6 +11,7 @@ | ||
| #include <cstddef> //size_t | ||
| #include <cstdint> // [u]intXX_t | ||
| #include <algorithm> // since some people like to forget that one | ||
| +#include <stdexcept> | ||
|
|
||
| namespace cvv | ||
| { | ||
| diff --git a/modules/cvv/src/util/observer_ptr.hpp b/modules/cvv/src/util/observer_ptr.hpp | ||
| index fef3fea..68d1a80 100644 | ||
| --- a/modules/cvv/src/util/observer_ptr.hpp | ||
| +++ b/modules/cvv/src/util/observer_ptr.hpp | ||
| @@ -11,6 +11,7 @@ | ||
| #include <cstddef> //size_t | ||
| #include <cstdint> // [u]intXX_t | ||
| #include <algorithm> // since some people like to forget that one | ||
| +#include <stdexcept> | ||
|
|
||
| namespace cvv | ||
| { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff --git a/modules/sfm/CMakeLists.txt b/modules/sfm/CMakeLists.txt | ||
| index 53a8d43..8809c88 100644 | ||
| --- a/modules/sfm/CMakeLists.txt | ||
| +++ b/modules/sfm/CMakeLists.txt | ||
| @@ -20,6 +20,7 @@ if((gflags_FOUND OR GFLAGS_FOUND OR GFLAGS_INCLUDE_DIRS) AND (glog_FOUND OR GLOG | ||
| ) | ||
| file(REMOVE "${_fname}") | ||
| message(STATUS "Checking SFM deps... ${SFM_DEPS_OK}") | ||
| + add_definitions(-DGLOG_NO_ABBREVIATED_SEVERITIES) | ||
| else() | ||
| set(SFM_DEPS_OK FALSE) | ||
| endif() |
Oops, something went wrong.