diff --git a/ports/opencv/vcpkg.json b/ports/opencv/vcpkg.json index 372977b53c5..9268e4e2c0e 100644 --- a/ports/opencv/vcpkg.json +++ b/ports/opencv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "opencv", - "version": "4.5.0", + "version": "4.5.1", "description": "Computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ @@ -13,6 +13,7 @@ "dnn", "jpeg", "png", + "quirc", "tiff", "webp" ], diff --git a/ports/opencv3/0002-install-options.patch b/ports/opencv3/0002-install-options.patch index 1657579fa76..431e02bf612 100644 --- a/ports/opencv3/0002-install-options.patch +++ b/ports/opencv3/0002-install-options.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index d143a7a..15eb053 100644 +index fcb4a1d..5810b0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -602,7 +602,7 @@ endif() +@@ -607,7 +607,7 @@ endif() ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) # --- Python Support --- @@ -12,10 +12,10 @@ index d143a7a..15eb053 100644 endif() diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index 9ac671d..b14ce09 100644 +index 8a3dcdb..b8b3bae 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake -@@ -263,7 +263,6 @@ if(MSVC) +@@ -262,7 +262,6 @@ if(MSVC) #endif() if(BUILD_WITH_DEBUG_INFO) diff --git a/ports/opencv3/0003-force-package-requirements.patch b/ports/opencv3/0003-force-package-requirements.patch index 7f1b0c906f2..e45ced441be 100644 --- a/ports/opencv3/0003-force-package-requirements.patch +++ b/ports/opencv3/0003-force-package-requirements.patch @@ -1,44 +1,44 @@ diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake -index fcf716b..f3951e3 100644 +index f99bb33..5407f70 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake -@@ -6,7 +6,7 @@ - if(BUILD_ZLIB) +@@ -7,7 +7,7 @@ if(BUILD_ZLIB) ocv_clear_vars(ZLIB_FOUND) else() + ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) - find_package(ZLIB "${MIN_VER_ZLIB}") + find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED) if(ZLIB_FOUND AND ANDROID) if(ZLIB_LIBRARIES MATCHES "/usr/(lib|lib32|lib64)/libz.so$") set(ZLIB_LIBRARIES z) -@@ -30,7 +30,7 @@ if(WITH_JPEG) - if(BUILD_JPEG) +@@ -33,7 +33,7 @@ if(WITH_JPEG) ocv_clear_vars(JPEG_FOUND) else() + ocv_clear_internal_cache_vars(JPEG_LIBRARY JPEG_INCLUDE_DIR) - include(FindJPEG) + find_package(JPEG REQUIRED) endif() if(NOT JPEG_FOUND) -@@ -74,7 +74,7 @@ if(WITH_TIFF) - if(BUILD_TIFF) +@@ -79,7 +79,7 @@ if(WITH_TIFF) ocv_clear_vars(TIFF_FOUND) else() + ocv_clear_internal_cache_vars(TIFF_LIBRARY TIFF_INCLUDE_DIR) - include(FindTIFF) + find_package(TIFF REQUIRED) if(TIFF_FOUND) ocv_parse_header("${TIFF_INCLUDE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION) endif() -@@ -117,7 +117,7 @@ if(WITH_WEBP) - if(BUILD_WEBP) +@@ -123,7 +123,7 @@ if(WITH_WEBP) ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR) else() + ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR) - include(cmake/OpenCVFindWebP.cmake) + find_package(WebP REQUIRED) if(WEBP_FOUND) set(HAVE_WEBP 1) endif() -@@ -158,7 +158,7 @@ if(WITH_JASPER) +@@ -164,7 +164,7 @@ if(WITH_JASPER) if(BUILD_JASPER) ocv_clear_vars(JASPER_FOUND) else() @@ -47,75 +47,39 @@ index fcf716b..f3951e3 100644 endif() if(NOT JASPER_FOUND) -@@ -182,7 +182,7 @@ if(WITH_PNG) - if(BUILD_PNG) +@@ -189,7 +189,7 @@ if(WITH_PNG) ocv_clear_vars(PNG_FOUND) else() + ocv_clear_internal_cache_vars(PNG_LIBRARY PNG_INCLUDE_DIR) - include(FindPNG) + find_package(PNG REQUIRED) if(PNG_FOUND) include(CheckIncludeFile) check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) -@@ -213,7 +213,7 @@ endif() - if(WITH_OPENEXR) +@@ -221,7 +221,7 @@ if(WITH_OPENEXR) ocv_clear_vars(HAVE_OPENEXR) if(NOT BUILD_OPENEXR) + ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) - include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") + find_package(OpenEXR REQUIRED) endif() if(OPENEXR_FOUND) -@@ -231,7 +231,7 @@ endif() +@@ -239,7 +239,7 @@ endif() # --- GDAL (optional) --- if(WITH_GDAL) - find_package(GDAL QUIET) -+ find_package(GDAL REQUIRED) ++ find_package(GDAL REQUIRED) if(NOT GDAL_FOUND) set(HAVE_GDAL NO) -@@ -243,7 +243,7 @@ if(WITH_GDAL) +@@ -251,7 +251,7 @@ if(WITH_GDAL) endif() - if (WITH_GDCM) + if(WITH_GDCM) - find_package(GDCM QUIET) + find_package(GDCM REQUIRED) if(NOT GDCM_FOUND) set(HAVE_GDCM NO) ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES) -diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake -index b9b1a95..596c152 100644 ---- a/cmake/OpenCVFindLibsPerf.cmake -+++ b/cmake/OpenCVFindLibsPerf.cmake -@@ -51,14 +51,9 @@ endif(WITH_CUDA) - - # --- Eigen --- - if(WITH_EIGEN AND NOT HAVE_EIGEN) -- find_package(Eigen3 QUIET) -+ find_package(Eigen3 REQUIRED) - - if(Eigen3_FOUND) -- if(TARGET Eigen3::Eigen) -- # Use Eigen3 imported target if possible -- list(APPEND OPENCV_LINKER_LIBS Eigen3::Eigen) -- set(HAVE_EIGEN 1) -- else() - if(DEFINED EIGEN3_INCLUDE_DIRS) - set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIRS}) - set(HAVE_EIGEN 1) -@@ -66,7 +61,6 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) - set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIR}) - set(HAVE_EIGEN 1) - endif() -- endif() - if(HAVE_EIGEN) - if(DEFINED EIGEN3_WORLD_VERSION) # CMake module - set(EIGEN_WORLD_VERSION ${EIGEN3_WORLD_VERSION}) -@@ -77,6 +71,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) - set(EIGEN_MAJOR_VERSION ${EIGEN3_VERSION_MINOR}) - set(EIGEN_MINOR_VERSION ${EIGEN3_VERSION_PATCH}) - endif() -+ ocv_include_directories(${EIGEN_INCLUDE_PATH}) - endif() - endif() - diff --git a/ports/opencv3/0004-add-missing-stdexcept-include.patch b/ports/opencv3/0004-add-missing-stdexcept-include.patch deleted file mode 100644 index 2a7d90ce071..00000000000 --- a/ports/opencv3/0004-add-missing-stdexcept-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 //size_t - #include // [u]intXX_t - #include // since some people like to forget that one -+#include - - namespace cvv - { diff --git a/ports/opencv3/0004-fix-eigen.patch b/ports/opencv3/0004-fix-eigen.patch new file mode 100644 index 00000000000..ec8f6a489ca --- /dev/null +++ b/ports/opencv3/0004-fix-eigen.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake +index 3753084..0aeb31a 100644 +--- a/cmake/OpenCVFindLibsPerf.cmake ++++ b/cmake/OpenCVFindLibsPerf.cmake +@@ -55,7 +55,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) + OR NOT (CMAKE_VERSION VERSION_LESS "3.0.0") # Eigen3Targets.cmake required CMake 3.0.0+ + ) AND NOT OPENCV_SKIP_EIGEN_FIND_PACKAGE_CONFIG + ) +- find_package(Eigen3 CONFIG QUIET) # Ceres 2.0.0 CMake scripts doesn't work with CMake's FindEigen3.cmake module (due to missing EIGEN3_VERSION_STRING) ++ find_package(Eigen3 CONFIG REQUIRED) # Ceres 2.0.0 CMake scripts doesn't work with CMake's FindEigen3.cmake module (due to missing EIGEN3_VERSION_STRING) + endif() + if(NOT Eigen3_FOUND) + find_package(Eigen3 QUIET) diff --git a/ports/opencv3/0009-fix-uwp.patch b/ports/opencv3/0006-fix-uwp.patch similarity index 85% rename from ports/opencv3/0009-fix-uwp.patch rename to ports/opencv3/0006-fix-uwp.patch index 9968d869170..551372950bd 100644 --- a/ports/opencv3/0009-fix-uwp.patch +++ b/ports/opencv3/0006-fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake -index 10ee406..73f4af2 100644 +index efb6ca8..8ca8609 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake -@@ -1183,7 +1183,7 @@ function(ocv_add_perf_tests) +@@ -1184,7 +1184,7 @@ function(ocv_add_perf_tests) set_target_properties(${the_target} PROPERTIES FOLDER "tests performance") endif() diff --git a/ports/opencv3/0007-fix-hdf5.patch b/ports/opencv3/0007-fix-hdf5.patch new file mode 100644 index 00000000000..de81c79b2ce --- /dev/null +++ b/ports/opencv3/0007-fix-hdf5.patch @@ -0,0 +1,30 @@ +diff --git a/modules/hdf/CMakeLists.txt b/modules/hdf/CMakeLists.txt +index 2a1ae68..e40a192 100644 +--- a/modules/hdf/CMakeLists.txt ++++ b/modules/hdf/CMakeLists.txt +@@ -1,25 +1,8 @@ + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}) + +-if(WIN32) +- # windows cmake internal lookups are broken for now +- # will lookup for headers and shared libs given HDF_DIR env +- find_path(HDF5_INCLUDE_DIRS hdf5.h HINTS "$ENV{HDF5_DIR}\\..\\include") +- find_library(HDF5_C_LIBRARY NAMES hdf5 HINTS "$ENV{HDF5_DIR}\\..\\lib") +- if(HDF5_INCLUDE_DIRS AND HDF5_C_LIBRARY) +- set(HDF5_FOUND "YES") +- set(HDF5_LIBRARIES ${HDF5_C_LIBRARY}) +- mark_as_advanced(HDF5_LIBRARIES) +- mark_as_advanced(HDF5_C_LIBRARY) +- mark_as_advanced(HDF5_INCLUDE_DIRS) +- add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB -D_HDF5USEDLL_) +- else() +- set(HDF5_FOUND "NO") +- endif() +-else() + if(NOT CMAKE_CROSSCOMPILING) # iOS build should not reuse OSX package + find_package(HDF5) + endif() +-endif() + + if(NOT HDF5_FOUND) + ocv_module_disable(hdf) # no return diff --git a/ports/opencv3/0010-devendor-quirc.patch b/ports/opencv3/0008-devendor-quirc.patch similarity index 90% rename from ports/opencv3/0010-devendor-quirc.patch rename to ports/opencv3/0008-devendor-quirc.patch index 1d2d7ccb7de..b77b1780e8d 100644 --- a/ports/opencv3/0010-devendor-quirc.patch +++ b/ports/opencv3/0008-devendor-quirc.patch @@ -1,26 +1,26 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 15eb053..58a9585 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -766,7 +766,7 @@ if(WITH_OPENVX) - endif() - - if(WITH_QUIRC) -- add_subdirectory(3rdparty/quirc) -+ find_package(quirc CONFIG REQUIRED) - set(HAVE_QUIRC TRUE) - endif() - # ---------------------------------------------------------------------------- -diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt -index 414e578..4f26d75 100644 ---- a/modules/objdetect/CMakeLists.txt -+++ b/modules/objdetect/CMakeLists.txt -@@ -2,7 +2,5 @@ set(the_description "Object Detection") - ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java python js) - - if(HAVE_QUIRC) -- get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) -- ocv_include_directories(${QUIRC_INCLUDE}) -- ocv_target_link_libraries(${the_module} quirc) -+ ocv_target_link_libraries(${the_module} quirc::quirc) - endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5810b0c..04315e3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -771,7 +771,7 @@ if(WITH_OPENVX) + endif() + + if(WITH_QUIRC) +- add_subdirectory(3rdparty/quirc) ++ find_package(quirc CONFIG REQUIRED) + set(HAVE_QUIRC TRUE) + endif() + # ---------------------------------------------------------------------------- +diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt +index 414e578..4f26d75 100644 +--- a/modules/objdetect/CMakeLists.txt ++++ b/modules/objdetect/CMakeLists.txt +@@ -2,7 +2,5 @@ set(the_description "Object Detection") + ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java python js) + + if(HAVE_QUIRC) +- get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) +- ocv_include_directories(${QUIRC_INCLUDE}) +- ocv_target_link_libraries(${the_module} quirc) ++ ocv_target_link_libraries(${the_module} quirc::quirc) + endif() diff --git a/ports/opencv3/portfile.cmake b/ports/opencv3/portfile.cmake index 4345a1c2fd6..8b62f7ddc47 100644 --- a/ports/opencv3/portfile.cmake +++ b/ports/opencv3/portfile.cmake @@ -6,21 +6,22 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv4") message(FATAL_ERROR "OpenCV 4 is installed, please uninstall and try again:\n vcpkg remove opencv4") endif() -set(OPENCV_VERSION "3.4.12") +set(OPENCV_VERSION "3.4.13") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 e69ff4869a8128b7d2a0537d198ec7f287fb821a8965df26339bec662da1888860941f50a269db7693309b9861f986c219288bb5856de76a6c7bc4c0a7026bee + SHA512 ec87b10534b9187c5ac2eea498c05c73bceab08afaed93b5a117ed34d1eeeb0ffc45901642bebf8f55126fd49ec78d731fc61debe6b40d8642f1323b5dbbeacf HEAD_REF master PATCHES 0001-disable-downloading.patch 0002-install-options.patch 0003-force-package-requirements.patch + 0004-fix-eigen.patch 0005-fix-vtk9.patch - 0009-fix-uwp.patch - 0010-devendor-quirc.patch + 0006-fix-uwp.patch + 0008-devendor-quirc.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -113,10 +114,10 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 0191b1d49d5a50195ed94951c570da03dc33677b682e61a65b34d40f355c36a58441034730ea7eca78dcb4af4c821983754250f93fdf3adb2b4a20e71806eb03 + SHA512 49f0aed8e07a443f354859a16c8de5ceae26560f141721ae4beb0d5fcc5b24b755ee313519e159b1a5b6ba125dcca8584f2a515e0ac96a8c9c36bb11ac6b3375 HEAD_REF master PATCHES - 0004-add-missing-stdexcept-include.patch + 0007-fix-hdf5.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") diff --git a/ports/opencv3/vcpkg.json b/ports/opencv3/vcpkg.json index c977a01329a..42041c4c12c 100644 --- a/ports/opencv3/vcpkg.json +++ b/ports/opencv3/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencv3", - "version": "3.4.12", - "port-version": 1, + "version": "3.4.13", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ @@ -11,6 +10,7 @@ "dnn", "jpeg", "png", + "quirc", "tiff", "webp" ], diff --git a/ports/opencv4/0002-install-options.patch b/ports/opencv4/0002-install-options.patch index 533dd8354e4..055719ca452 100644 --- a/ports/opencv4/0002-install-options.patch +++ b/ports/opencv4/0002-install-options.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4350b2f..89521b1 100644 +index 45fc6de..9cd2b4e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -603,7 +603,7 @@ endif() +@@ -607,7 +607,7 @@ endif() ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) # --- Python Support --- @@ -12,10 +12,10 @@ index 4350b2f..89521b1 100644 endif() diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake -index 080c78c..616ce64 100644 +index 5e3c056..19f5795 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake -@@ -265,7 +265,6 @@ if(MSVC) +@@ -264,7 +264,6 @@ if(MSVC) #endif() if(BUILD_WITH_DEBUG_INFO) diff --git a/ports/opencv4/0003-force-package-requirements.patch b/ports/opencv4/0003-force-package-requirements.patch index c28dd5d9fe8..cfbd8feb614 100644 --- a/ports/opencv4/0003-force-package-requirements.patch +++ b/ports/opencv4/0003-force-package-requirements.patch @@ -1,44 +1,53 @@ diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake -index 22e20b6..5d1431c 100644 +index 2e4e4af..8cd9c75 100644 --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake -@@ -6,7 +6,7 @@ - if(BUILD_ZLIB) +@@ -7,7 +7,7 @@ if(BUILD_ZLIB) ocv_clear_vars(ZLIB_FOUND) else() + ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) - find_package(ZLIB "${MIN_VER_ZLIB}") + find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED) if(ZLIB_FOUND AND ANDROID) if(ZLIB_LIBRARIES MATCHES "/usr/(lib|lib32|lib64)/libz.so$") set(ZLIB_LIBRARIES z) -@@ -30,7 +30,7 @@ if(WITH_JPEG) - if(BUILD_JPEG) +@@ -33,7 +33,7 @@ if(WITH_JPEG) ocv_clear_vars(JPEG_FOUND) else() + ocv_clear_internal_cache_vars(JPEG_LIBRARY JPEG_INCLUDE_DIR) - include(FindJPEG) + find_package(JPEG REQUIRED) endif() if(NOT JPEG_FOUND) -@@ -74,7 +74,7 @@ if(WITH_TIFF) - if(BUILD_TIFF) +@@ -79,7 +79,7 @@ if(WITH_TIFF) ocv_clear_vars(TIFF_FOUND) else() + ocv_clear_internal_cache_vars(TIFF_LIBRARY TIFF_INCLUDE_DIR) - include(FindTIFF) + find_package(TIFF REQUIRED) if(TIFF_FOUND) ocv_parse_header("${TIFF_INCLUDE_DIR}/tiff.h" TIFF_VERSION_LINES TIFF_VERSION_CLASSIC TIFF_VERSION_BIG TIFF_VERSION TIFF_BIGTIFF_VERSION) endif() -@@ -117,7 +117,7 @@ if(WITH_WEBP) - if(BUILD_WEBP) +@@ -123,7 +123,7 @@ if(WITH_WEBP) ocv_clear_vars(WEBP_FOUND WEBP_LIBRARY WEBP_LIBRARIES WEBP_INCLUDE_DIR) else() + ocv_clear_internal_cache_vars(WEBP_LIBRARY WEBP_INCLUDE_DIR) - include(cmake/OpenCVFindWebP.cmake) + find_package(WebP REQUIRED) if(WEBP_FOUND) set(HAVE_WEBP 1) endif() -@@ -186,7 +186,7 @@ if(WITH_JASPER AND NOT HAVE_OPENJPEG) +@@ -164,7 +164,7 @@ if(WITH_OPENJPEG) + if(BUILD_OPENJPEG) + ocv_clear_vars(OpenJPEG_FOUND) + else() +- find_package(OpenJPEG QUIET) ++ find_package(OpenJPEG REQUIRED) + endif() + + if(NOT OpenJPEG_FOUND OR OPENJPEG_MAJOR_VERSION LESS 2) +@@ -192,7 +192,7 @@ if(WITH_JASPER AND NOT HAVE_OPENJPEG) if(BUILD_JASPER) ocv_clear_vars(JASPER_FOUND) else() @@ -47,75 +56,39 @@ index 22e20b6..5d1431c 100644 endif() if(NOT JASPER_FOUND) -@@ -210,7 +210,7 @@ if(WITH_PNG) - if(BUILD_PNG) +@@ -217,7 +217,7 @@ if(WITH_PNG) ocv_clear_vars(PNG_FOUND) else() + ocv_clear_internal_cache_vars(PNG_LIBRARY PNG_INCLUDE_DIR) - include(FindPNG) + find_package(PNG REQUIRED) if(PNG_FOUND) include(CheckIncludeFile) check_include_file("${PNG_PNG_INCLUDE_DIR}/libpng/png.h" HAVE_LIBPNG_PNG_H) -@@ -241,7 +241,7 @@ endif() - if(WITH_OPENEXR) +@@ -249,7 +249,7 @@ if(WITH_OPENEXR) ocv_clear_vars(HAVE_OPENEXR) if(NOT BUILD_OPENEXR) + ocv_clear_internal_cache_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) - include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") + find_package(OpenEXR REQUIRED) endif() if(OPENEXR_FOUND) -@@ -259,7 +259,7 @@ endif() +@@ -267,7 +267,7 @@ endif() # --- GDAL (optional) --- if(WITH_GDAL) - find_package(GDAL QUIET) -+ find_package(GDAL REQUIRED) ++ find_package(GDAL REQUIRED) if(NOT GDAL_FOUND) set(HAVE_GDAL NO) -@@ -271,7 +271,7 @@ if(WITH_GDAL) +@@ -279,7 +279,7 @@ if(WITH_GDAL) endif() - if (WITH_GDCM) + if(WITH_GDCM) - find_package(GDCM QUIET) + find_package(GDCM REQUIRED) if(NOT GDCM_FOUND) set(HAVE_GDCM NO) ocv_clear_vars(GDCM_VERSION GDCM_LIBRARIES) -diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake -index b9b1a95..596c152 100644 ---- a/cmake/OpenCVFindLibsPerf.cmake -+++ b/cmake/OpenCVFindLibsPerf.cmake -@@ -51,14 +51,9 @@ endif(WITH_CUDA) - - # --- Eigen --- - if(WITH_EIGEN AND NOT HAVE_EIGEN) -- find_package(Eigen3 QUIET) -+ find_package(Eigen3 REQUIRED) - - if(Eigen3_FOUND) -- if(TARGET Eigen3::Eigen) -- # Use Eigen3 imported target if possible -- list(APPEND OPENCV_LINKER_LIBS Eigen3::Eigen) -- set(HAVE_EIGEN 1) -- else() - if(DEFINED EIGEN3_INCLUDE_DIRS) - set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIRS}) - set(HAVE_EIGEN 1) -@@ -66,7 +61,6 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) - set(EIGEN_INCLUDE_PATH ${EIGEN3_INCLUDE_DIR}) - set(HAVE_EIGEN 1) - endif() -- endif() - if(HAVE_EIGEN) - if(DEFINED EIGEN3_WORLD_VERSION) # CMake module - set(EIGEN_WORLD_VERSION ${EIGEN3_WORLD_VERSION}) -@@ -77,6 +71,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) - set(EIGEN_MAJOR_VERSION ${EIGEN3_VERSION_MINOR}) - set(EIGEN_MINOR_VERSION ${EIGEN3_VERSION_PATCH}) - endif() -+ ocv_include_directories(${EIGEN_INCLUDE_PATH}) - endif() - endif() - diff --git a/ports/opencv4/0004-fix-policy-CMP0057.patch b/ports/opencv4/0004-fix-policy-CMP0057.patch index 8bff4f88b7b..b0d8307fc29 100644 --- a/ports/opencv4/0004-fix-policy-CMP0057.patch +++ b/ports/opencv4/0004-fix-policy-CMP0057.patch @@ -1,5 +1,5 @@ diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt -index 12ff992..afd56eb 100644 +index a31d969..fa779e4 100644 --- a/modules/videoio/CMakeLists.txt +++ b/modules/videoio/CMakeLists.txt @@ -1,3 +1,4 @@ diff --git a/ports/opencv4/0005-add-missing-stdexcept-include.patch b/ports/opencv4/0005-add-missing-stdexcept-include.patch deleted file mode 100644 index 2a7d90ce071..00000000000 --- a/ports/opencv4/0005-add-missing-stdexcept-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 //size_t - #include // [u]intXX_t - #include // since some people like to forget that one -+#include - - namespace cvv - { diff --git a/ports/opencv4/0005-fix-eigen.patch b/ports/opencv4/0005-fix-eigen.patch new file mode 100644 index 00000000000..ec8f6a489ca --- /dev/null +++ b/ports/opencv4/0005-fix-eigen.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake +index 3753084..0aeb31a 100644 +--- a/cmake/OpenCVFindLibsPerf.cmake ++++ b/cmake/OpenCVFindLibsPerf.cmake +@@ -55,7 +55,7 @@ if(WITH_EIGEN AND NOT HAVE_EIGEN) + OR NOT (CMAKE_VERSION VERSION_LESS "3.0.0") # Eigen3Targets.cmake required CMake 3.0.0+ + ) AND NOT OPENCV_SKIP_EIGEN_FIND_PACKAGE_CONFIG + ) +- find_package(Eigen3 CONFIG QUIET) # Ceres 2.0.0 CMake scripts doesn't work with CMake's FindEigen3.cmake module (due to missing EIGEN3_VERSION_STRING) ++ find_package(Eigen3 CONFIG REQUIRED) # Ceres 2.0.0 CMake scripts doesn't work with CMake's FindEigen3.cmake module (due to missing EIGEN3_VERSION_STRING) + endif() + if(NOT Eigen3_FOUND) + find_package(Eigen3 QUIET) diff --git a/ports/opencv4/0006-fix-glog-abbreviated-severity.patch b/ports/opencv4/0006-fix-glog-abbreviated-severity.patch deleted file mode 100644 index aafe61b1a5e..00000000000 --- a/ports/opencv4/0006-fix-glog-abbreviated-severity.patch +++ /dev/null @@ -1,12 +0,0 @@ -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() diff --git a/ports/opencv4/0009-fix-uwp.patch b/ports/opencv4/0006-fix-uwp.patch similarity index 85% rename from ports/opencv4/0009-fix-uwp.patch rename to ports/opencv4/0006-fix-uwp.patch index 9ace8e21473..19c6f8d92b2 100644 --- a/ports/opencv4/0009-fix-uwp.patch +++ b/ports/opencv4/0006-fix-uwp.patch @@ -1,8 +1,8 @@ diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake -index bd14aa2..58cd11e 100644 +index a548df3..1799e44 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake -@@ -1197,7 +1197,7 @@ function(ocv_add_perf_tests) +@@ -1198,7 +1198,7 @@ function(ocv_add_perf_tests) set_target_properties(${the_target} PROPERTIES FOLDER "tests performance") endif() diff --git a/ports/opencv4/0007-fix-hdf5.patch b/ports/opencv4/0007-fix-hdf5.patch new file mode 100644 index 00000000000..de81c79b2ce --- /dev/null +++ b/ports/opencv4/0007-fix-hdf5.patch @@ -0,0 +1,30 @@ +diff --git a/modules/hdf/CMakeLists.txt b/modules/hdf/CMakeLists.txt +index 2a1ae68..e40a192 100644 +--- a/modules/hdf/CMakeLists.txt ++++ b/modules/hdf/CMakeLists.txt +@@ -1,25 +1,8 @@ + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}) + +-if(WIN32) +- # windows cmake internal lookups are broken for now +- # will lookup for headers and shared libs given HDF_DIR env +- find_path(HDF5_INCLUDE_DIRS hdf5.h HINTS "$ENV{HDF5_DIR}\\..\\include") +- find_library(HDF5_C_LIBRARY NAMES hdf5 HINTS "$ENV{HDF5_DIR}\\..\\lib") +- if(HDF5_INCLUDE_DIRS AND HDF5_C_LIBRARY) +- set(HDF5_FOUND "YES") +- set(HDF5_LIBRARIES ${HDF5_C_LIBRARY}) +- mark_as_advanced(HDF5_LIBRARIES) +- mark_as_advanced(HDF5_C_LIBRARY) +- mark_as_advanced(HDF5_INCLUDE_DIRS) +- add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB -D_HDF5USEDLL_) +- else() +- set(HDF5_FOUND "NO") +- endif() +-else() + if(NOT CMAKE_CROSSCOMPILING) # iOS build should not reuse OSX package + find_package(HDF5) + endif() +-endif() + + if(NOT HDF5_FOUND) + ocv_module_disable(hdf) # no return diff --git a/ports/opencv4/0011-devendor-quirc.patch b/ports/opencv4/0008-devendor-quirc.patch similarity index 82% rename from ports/opencv4/0011-devendor-quirc.patch rename to ports/opencv4/0008-devendor-quirc.patch index a1f13849e9a..fc03838b28c 100644 --- a/ports/opencv4/0011-devendor-quirc.patch +++ b/ports/opencv4/0008-devendor-quirc.patch @@ -1,26 +1,26 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 89521b1..5ff0f01 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -772,7 +772,7 @@ if(WITH_OPENVX) - endif() - - if(WITH_QUIRC) -- add_subdirectory(3rdparty/quirc) -+ find_package(quirc CONFIG REQUIRED) - set(HAVE_QUIRC TRUE) - endif() - # ---------------------------------------------------------------------------- -diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt -index 3fa0c5d..f4c0ad6 100644 ---- a/modules/objdetect/CMakeLists.txt -+++ b/modules/objdetect/CMakeLists.txt -@@ -2,7 +2,5 @@ set(the_description "Object Detection") - ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java objc python js) - - if(HAVE_QUIRC) -- get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) -- ocv_include_directories(${QUIRC_INCLUDE}) -- ocv_target_link_libraries(${the_module} quirc) -+ ocv_target_link_libraries(${the_module} quirc::quirc) - endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9cd2b4e..b34f20e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -776,7 +776,7 @@ if(WITH_OPENVX) + endif() + + if(WITH_QUIRC) +- add_subdirectory(3rdparty/quirc) ++ find_package(quirc CONFIG REQUIRED) + set(HAVE_QUIRC TRUE) + endif() + +diff --git a/modules/objdetect/CMakeLists.txt b/modules/objdetect/CMakeLists.txt +index 3fa0c5d..f4c0ad6 100644 +--- a/modules/objdetect/CMakeLists.txt ++++ b/modules/objdetect/CMakeLists.txt +@@ -2,7 +2,5 @@ set(the_description "Object Detection") + ocv_define_module(objdetect opencv_core opencv_imgproc opencv_calib3d WRAP java objc python js) + + if(HAVE_QUIRC) +- get_property(QUIRC_INCLUDE GLOBAL PROPERTY QUIRC_INCLUDE_DIR) +- ocv_include_directories(${QUIRC_INCLUDE}) +- ocv_target_link_libraries(${the_module} quirc) ++ ocv_target_link_libraries(${the_module} quirc::quirc) + endif() diff --git a/ports/opencv4/0010-fix-interface_link_libraries.patch b/ports/opencv4/0010-fix-interface_link_libraries.patch deleted file mode 100644 index 64751831309..00000000000 --- a/ports/opencv4/0010-fix-interface_link_libraries.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/modules/videoio/cmake/init.cmake b/modules/videoio/cmake/init.cmake -index 1efef12..81d5d9f 100644 ---- a/modules/videoio/cmake/init.cmake -+++ b/modules/videoio/cmake/init.cmake -@@ -12,8 +12,16 @@ function(ocv_add_external_target name inc link def) - set_target_properties(ocv.3rdparty.${name} PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${inc}" - INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${inc}" -- INTERFACE_LINK_LIBRARIES "${link}" - INTERFACE_COMPILE_DEFINITIONS "${def}") -+ # When cmake version is greater than or equal to 3.11, INTERFACE_LINK_LIBRARIES no longer applies to interface library -+ # See https://github.com/opencv/opencv/pull/18658 -+ if (CMAKE_VERSION VERSION_LESS 3.11) -+ set_target_properties(ocv.3rdparty.${name} PROPERTIES -+ INTERFACE_LINK_LIBRARIES "${link}") -+ else() -+ target_link_libraries(ocv.3rdparty.${name} INTERFACE ${link}) -+ endif() -+ # - if(NOT BUILD_SHARED_LIBS) - install(TARGETS ocv.3rdparty.${name} EXPORT OpenCVModules) - endif() diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index cc7d4d579ea..33982df0e0b 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -6,22 +6,22 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3") message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3") endif() -set(OPENCV_VERSION "4.5.0") +set(OPENCV_VERSION "4.5.1") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF ${OPENCV_VERSION} - SHA512 c34100f3f3fe45f2115975350d23288a3badb32864ba0cbd32512387416d1cf10d16d3ef5f3d089d6a1c2be587d788d33997513fc015dbf7d774a622f2d3811f + SHA512 d74ae3bc340639cbc8b5db41a1fec710acabf8ec828dd28ce3bacf7029d1afd23aeaf47a2273a42995de285daa8aef33a7f90d5c57ef096e2cb872e0845e92b0 HEAD_REF master PATCHES 0001-disable-downloading.patch 0002-install-options.patch 0003-force-package-requirements.patch 0004-fix-policy-CMP0057.patch - 0009-fix-uwp.patch - 0010-fix-interface_link_libraries.patch # Remove this patch when the next update - 0011-devendor-quirc.patch + 0005-fix-eigen.patch + 0006-fix-uwp.patch + 0008-devendor-quirc.patch ) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") @@ -138,11 +138,10 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF ${OPENCV_VERSION} - SHA512 b2ae72e920c78472fd677281b8dd6f25872399d8ade97b0d3b0fc50bbabea8c00ea849d87bfb311ac148cef663481d0c89c0f6875578c052c1cc7ddcd70e6e17 + SHA512 1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7 HEAD_REF master PATCHES - 0005-add-missing-stdexcept-include.patch - 0006-fix-glog-abbreviated-severity.patch + 0007-fix-hdf5.patch ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") @@ -445,7 +444,7 @@ find_dependency(Tesseract)") string(APPEND DEPS_STRING "\nfind_dependency(Ogre)\nfind_dependency(Freetype)") endif() if("quirc" IN_LIST FEATURES) - string(APPEND DEPS_STRING "\nfind_dependency(quirc CONFIG)") + string(APPEND DEPS_STRING "\nfind_dependency(quirc)") endif() if("qt" IN_LIST FEATURES) string(APPEND DEPS_STRING " diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index dc64f6c4dba..71513f260dc 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencv4", - "version": "4.5.0", - "port-version": 1, + "version": "4.5.1", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "dependencies": [ diff --git a/ports/openmvg/CONTROL b/ports/openmvg/CONTROL index 69d67357934..b28081c6056 100644 --- a/ports/openmvg/CONTROL +++ b/ports/openmvg/CONTROL @@ -1,5 +1,6 @@ Source: openmvg Version: 1.6 +Port-Version: 1 Description: open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion. Build-Depends: coinutils, clp, osi, liblemon, flann, eigen3, ceres[suitesparse,cxsparse], cereal, libjpeg-turbo, tiff, libpng, zlib, vlfeat diff --git a/ports/openmvg/build_fixes.patch b/ports/openmvg/build_fixes.patch index fff8846d28e..d87161e674a 100644 --- a/ports/openmvg/build_fixes.patch +++ b/ports/openmvg/build_fixes.patch @@ -525,10 +525,10 @@ index 5fcd972..b21ea7b 100644 endif() set_target_properties(openMVG_matching PROPERTIES SOVERSION ${OPENMVG_VERSION_MAJOR} VERSION "${OPENMVG_VERSION_MAJOR}.${OPENMVG_VERSION_MINOR}") diff --git a/src/openMVG/numeric/CMakeLists.txt b/src/openMVG/numeric/CMakeLists.txt -index 06baee7..47255be 100644 +index 1f3fc30..4097320 100644 --- a/src/openMVG/numeric/CMakeLists.txt +++ b/src/openMVG/numeric/CMakeLists.txt -@@ -24,7 +24,7 @@ target_include_directories(openMVG_numeric +@@ -26,7 +26,7 @@ target_include_directories(openMVG_numeric $ $ ) @@ -649,6 +649,19 @@ index 9a5a482..e804a19 100644 pRecons.wait() - - +diff --git a/src/software/SfM/main_ComputeFeatures_OpenCV.cpp b/src/software/SfM/main_ComputeFeatures_OpenCV.cpp +index 9cc46af..f8bd892 100644 +--- a/src/software/SfM/main_ComputeFeatures_OpenCV.cpp ++++ b/src/software/SfM/main_ComputeFeatures_OpenCV.cpp +@@ -208,7 +208,7 @@ public: + // Create a SIFT detector + std::vector< cv::KeyPoint > v_keypoints; + cv::Mat m_desc; +- cv::Ptr siftdetector = cv::xfeatures2d::SIFT::create(); ++ cv::Ptr siftdetector = cv::SIFT::create(); + + // Process SIFT computation + siftdetector->detectAndCompute(img, m_mask, v_keypoints, m_desc); diff --git a/src/software/SfM/tutorial_demo.py.in b/src/software/SfM/tutorial_demo.py.in index 259e24e..1097062 100644 --- a/src/software/SfM/tutorial_demo.py.in @@ -682,7 +695,7 @@ index aa7dffe..2c4d237 100644 m_detector->detect(current_img, m_nextKeypoints); diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt -index 816a941..f0b7145 100644 +index b71dfab..ad98e51 100644 --- a/src/third_party/CMakeLists.txt +++ b/src/third_party/CMakeLists.txt @@ -18,7 +18,7 @@ add_subdirectory(stlplus3) diff --git a/versions/baseline.json b/versions/baseline.json index 31bcaa0136e..f3a0bff9f58 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4233,7 +4233,7 @@ "port-version": 0 }, "opencv": { - "baseline": "4.5.0", + "baseline": "4.5.1", "port-version": 0 }, "opencv2": { @@ -4241,12 +4241,12 @@ "port-version": 5 }, "opencv3": { - "baseline": "3.4.12", - "port-version": 1 + "baseline": "3.4.13", + "port-version": 0 }, "opencv4": { - "baseline": "4.5.0", - "port-version": 1 + "baseline": "4.5.1", + "port-version": 0 }, "opendnp3": { "baseline": "3.1.0", @@ -4290,7 +4290,7 @@ }, "openmvg": { "baseline": "1.6", - "port-version": 0 + "port-version": 1 }, "openmvs": { "baseline": "1.1", diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index a428c254d47..94d54725048 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5095d4c281b1fa2afc8398bfc61a88dc1e96e7e6", + "version": "4.5.1", + "port-version": 0 + }, { "git-tree": "457db123c6f787763d2bbe056e51caecd8c37464", "version": "4.5.0", diff --git a/versions/o-/opencv3.json b/versions/o-/opencv3.json index b04a8ae268e..9667226d7e3 100644 --- a/versions/o-/opencv3.json +++ b/versions/o-/opencv3.json @@ -1,7 +1,12 @@ { "versions": [ { - "git-tree": "ffd8270ed4798f25f3bd882a6089c72e86803466", + "git-tree": "4b65e217d97307583039d4324cd32488347cc344", + "version": "3.4.13", + "port-version": 0 + }, + { + "git-tree": "859d6618f0ff394cc940ede79ada4bff1b7655dc", "version": "3.4.12", "port-version": 1 }, diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index f6e5d8fe898..631be40cf43 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,7 +1,12 @@ { "versions": [ { - "git-tree": "a0522dbbb44877b9d4618bfe31a376e07e49bc72", + "git-tree": "ba505df8f61764e9b4667b04958c748237d12d23", + "version": "4.5.1", + "port-version": 0 + }, + { + "git-tree": "ba164060f8a9e69ccc4c484a24b5e8085d20b3bd", "version": "4.5.0", "port-version": 1 }, diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json index 57b9407507d..8628d35ee34 100644 --- a/versions/o-/openmvg.json +++ b/versions/o-/openmvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77b221e020b37ab1119a01536d5b4fe6836af4fd", + "version-string": "1.6", + "port-version": 1 + }, { "git-tree": "0bc383c92d6341f46ad2250f956d0731e617d9ee", "version-string": "1.6",