From 0c72ab92e825b94e6d16f382eab7a2913e3e6886 Mon Sep 17 00:00:00 2001 From: Stefano Sinigardi Date: Tue, 12 Nov 2024 08:08:28 +0100 Subject: [PATCH] [opencv] update to 4.10 (#41985) --- ports/opencv/vcpkg.json | 2 +- ports/opencv4/0002-install-options.patch | 4 +- .../0003-force-package-requirements.patch | 24 +++--- ports/opencv4/0008-devendor-quirc.patch | 2 +- ports/opencv4/0012-fix-zlib.patch | 16 ++-- ports/opencv4/0013-contrib-fix-ogre.patch | 5 +- ...ist.patch => 0014-fix-cmake-in-list.patch} | 2 +- ports/opencv4/0014-fix-supportqnx.patch | 21 ----- ports/opencv4/0019-opencl-kernel.patch | 10 +++ ports/opencv4/portfile.cmake | 82 ++++--------------- ports/opencv4/vcpkg.json | 3 +- versions/baseline.json | 6 +- versions/o-/opencv.json | 5 ++ versions/o-/opencv4.json | 5 ++ 14 files changed, 67 insertions(+), 120 deletions(-) rename ports/opencv4/{0019-fix-cmake-in-list.patch => 0014-fix-cmake-in-list.patch} (89%) delete mode 100644 ports/opencv4/0014-fix-supportqnx.patch create mode 100644 ports/opencv4/0019-opencl-kernel.patch diff --git a/ports/opencv/vcpkg.json b/ports/opencv/vcpkg.json index 4bfdedffbb..5e7a227c08 100644 --- a/ports/opencv/vcpkg.json +++ b/ports/opencv/vcpkg.json @@ -1,6 +1,6 @@ { "name": "opencv", - "version": "4.9.0", + "version": "4.10.0", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/ports/opencv4/0002-install-options.patch b/ports/opencv4/0002-install-options.patch index 40517c7757..d9514e0b44 100644 --- a/ports/opencv4/0002-install-options.patch +++ b/ports/opencv4/0002-install-options.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -656,7 +656,7 @@ endif() +@@ -674,7 +674,7 @@ endif() ocv_cmake_hook(POST_CMAKE_BUILD_OPTIONS) # --- Python Support --- @@ -11,7 +11,7 @@ --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake -@@ -307,7 +307,6 @@ if(MSVC) +@@ -300,7 +300,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 293f75d974..b8f8f9e9c8 100644 --- a/ports/opencv4/0003-force-package-requirements.patch +++ b/ports/opencv4/0003-force-package-requirements.patch @@ -1,6 +1,6 @@ --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake -@@ -11,7 +11,7 @@ else() +@@ -24,7 +24,7 @@ else() set(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) set(CMAKE_FIND_LIBRARY_SUFFIXES .so) endif() @@ -9,7 +9,7 @@ if(ANDROID) set(CMAKE_FIND_LIBRARY_SUFFIXES ${_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES}) unset(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES) -@@ -41,7 +41,7 @@ endif() +@@ -55,7 +55,7 @@ endif() if(WITH_AVIF) ocv_clear_internal_cache_vars(AVIF_LIBRARY AVIF_INCLUDE_DIR) @@ -18,7 +18,7 @@ if(AVIF_FOUND) set(HAVE_AVIF 1) endif() -@@ -53,7 +53,7 @@ if(WITH_JPEG) +@@ -67,7 +67,7 @@ if(WITH_JPEG) ocv_clear_vars(JPEG_FOUND) else() ocv_clear_internal_cache_vars(JPEG_LIBRARY JPEG_INCLUDE_DIR) @@ -27,7 +27,7 @@ endif() if(NOT JPEG_FOUND) -@@ -99,7 +99,7 @@ if(WITH_TIFF) +@@ -113,7 +113,7 @@ if(WITH_TIFF) ocv_clear_vars(TIFF_FOUND) else() ocv_clear_internal_cache_vars(TIFF_LIBRARY TIFF_INCLUDE_DIR) @@ -36,7 +36,7 @@ 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() -@@ -143,7 +143,7 @@ if(WITH_WEBP) +@@ -157,7 +157,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) @@ -45,7 +45,7 @@ if(WEBP_FOUND) set(HAVE_WEBP 1) endif() -@@ -184,7 +184,7 @@ if(WITH_OPENJPEG) +@@ -198,7 +198,7 @@ if(WITH_OPENJPEG) if(BUILD_OPENJPEG) ocv_clear_vars(OpenJPEG_FOUND) else() @@ -54,7 +54,7 @@ endif() if(NOT OpenJPEG_FOUND OR OPENJPEG_MAJOR_VERSION LESS 2) -@@ -213,7 +213,7 @@ if(WITH_JASPER AND NOT HAVE_OPENJPEG) +@@ -227,7 +227,7 @@ if(WITH_JASPER AND NOT HAVE_OPENJPEG) if(BUILD_JASPER) ocv_clear_vars(JASPER_FOUND) else() @@ -63,7 +63,7 @@ endif() if(NOT JASPER_FOUND) -@@ -239,7 +239,7 @@ if(WITH_SPNG) +@@ -253,7 +253,7 @@ if(WITH_SPNG) # CMakeConfig bug in SPNG, include is missing there in version 0.7.4 and older # See https://github.com/randy408/libspng/pull/264 include(CMakeFindDependencyMacro) @@ -72,7 +72,7 @@ if(SPNG_FOUND) set(SPNG_LIBRARY "spng::spng" CACHE INTERNAL "") set(SPNG_LIBRARIES ${SPNG_LIBRARY}) -@@ -273,7 +273,7 @@ if(NOT HAVE_SPNG AND WITH_PNG) +@@ -287,7 +287,7 @@ if(NOT HAVE_SPNG AND WITH_PNG) ocv_clear_vars(PNG_FOUND) else() ocv_clear_internal_cache_vars(PNG_LIBRARY PNG_INCLUDE_DIR) @@ -81,7 +81,7 @@ endif() if(NOT PNG_FOUND) -@@ -296,7 +296,8 @@ if(WITH_OPENEXR) +@@ -310,7 +310,8 @@ 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) @@ -91,7 +91,7 @@ endif() if(OPENEXR_FOUND) -@@ -316,7 +316,7 @@ endif() +@@ -330,7 +331,7 @@ endif() # --- GDAL (optional) --- if(WITH_GDAL) @@ -100,7 +100,7 @@ if(NOT GDAL_FOUND) set(HAVE_GDAL NO) -@@ -328,7 +328,7 @@ if(WITH_GDAL) +@@ -342,7 +343,7 @@ if(WITH_GDAL) endif() if(WITH_GDCM) diff --git a/ports/opencv4/0008-devendor-quirc.patch b/ports/opencv4/0008-devendor-quirc.patch index b82c562365..88b18db4ea 100644 --- a/ports/opencv4/0008-devendor-quirc.patch +++ b/ports/opencv4/0008-devendor-quirc.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -917,7 +917,7 @@ if(WITH_OPENVX) +@@ -935,7 +935,7 @@ if(WITH_OPENVX) endif() if(WITH_QUIRC) diff --git a/ports/opencv4/0012-fix-zlib.patch b/ports/opencv4/0012-fix-zlib.patch index b82b9b00eb..d975c989c7 100644 --- a/ports/opencv4/0012-fix-zlib.patch +++ b/ports/opencv4/0012-fix-zlib.patch @@ -1,12 +1,10 @@ --- a/cmake/OpenCVFindLibsGrfmt.cmake +++ b/cmake/OpenCVFindLibsGrfmt.cmake -@@ -5,6 +5,9 @@ - # --- zlib (required) --- - if(BUILD_ZLIB) - ocv_clear_vars(ZLIB_FOUND) -+elseif(1) -+ ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) -+ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED) - else() - ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) +@@ -20,6 +20,7 @@ else() + ocv_clear_vars(ZLIB_FOUND) + else() + ocv_clear_internal_cache_vars(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) ++ find_package(ZLIB "${MIN_VER_ZLIB}" REQUIRED) if(ANDROID) + set(_zlib_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) + set(CMAKE_FIND_LIBRARY_SUFFIXES .so) diff --git a/ports/opencv4/0013-contrib-fix-ogre.patch b/ports/opencv4/0013-contrib-fix-ogre.patch index 314ea821e7..3e3e6c7d84 100644 --- a/ports/opencv4/0013-contrib-fix-ogre.patch +++ b/ports/opencv4/0013-contrib-fix-ogre.patch @@ -1,9 +1,8 @@ --- a/modules/ovis/CMakeLists.txt +++ b/modules/ovis/CMakeLists.txt -@@ -27,4 +27,6 @@ ocv_create_module() - ocv_add_samples(opencv_aruco) +@@ -27,4 +27,5 @@ ocv_create_module() + ocv_add_samples(opencv_objdetect opencv_aruco) ocv_warnings_disable(CMAKE_CXX_FLAGS -Wunused-parameter) -+# The target always has the name OgreGLSupport +string(REPLACE "OgreGLSupportStatic" "OgreGLSupport" OGRE_LIBRARIES "${OGRE_LIBRARIES}") ocv_target_link_libraries(${the_module} ${OGRE_LIBRARIES}) diff --git a/ports/opencv4/0019-fix-cmake-in-list.patch b/ports/opencv4/0014-fix-cmake-in-list.patch similarity index 89% rename from ports/opencv4/0019-fix-cmake-in-list.patch rename to ports/opencv4/0014-fix-cmake-in-list.patch index 25ff0a096c..174de4aa96 100644 --- a/ports/opencv4/0019-fix-cmake-in-list.patch +++ b/ports/opencv4/0014-fix-cmake-in-list.patch @@ -1,6 +1,6 @@ --- a/cmake/OpenCVUtils.cmake +++ b/cmake/OpenCVUtils.cmake -@@ -1663,7 +1663,7 @@ function(ocv_install_used_external_targets) +@@ -1663,8 +1663,8 @@ function(ocv_install_used_external_targets) if(NOT BUILD_SHARED_LIBS AND NOT (CMAKE_VERSION VERSION_LESS "3.13.0") # upgrade CMake: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/2152 ) diff --git a/ports/opencv4/0014-fix-supportqnx.patch b/ports/opencv4/0014-fix-supportqnx.patch deleted file mode 100644 index 91d145f003..0000000000 --- a/ports/opencv4/0014-fix-supportqnx.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp -index 7811ab7..8f00891 100644 ---- a/modules/core/src/system.cpp -+++ b/modules/core/src/system.cpp -@@ -120,11 +120,15 @@ void* allocSingletonNewBuffer(size_t size) { return malloc(size); } - #include // std::abort - #endif - --#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__ || defined __Fuchsia__ -+#if defined __ANDROID__ || defined __unix__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __HAIKU__ || defined __Fuchsia__ || defined __QNX__ - # include - # include - #if defined __QNX__ - # include -+# include -+using Elf64_auxv_t = auxv64_t; -+# include -+constexpr decltype(auto) AT_HWCAP = NT_GNU_HWCAP; - #else - # include - #endif diff --git a/ports/opencv4/0019-opencl-kernel.patch b/ports/opencv4/0019-opencl-kernel.patch new file mode 100644 index 0000000000..61a402803e --- /dev/null +++ b/ports/opencv4/0019-opencl-kernel.patch @@ -0,0 +1,10 @@ +--- a/cmake/OpenCVModule.cmake ++++ b/cmake/OpenCVModule.cmake +@@ -869,6 +869,7 @@ macro(ocv_glob_module_sources) + set(OCL_NAME opencl_kernels_${name}) + add_custom_command( + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${OCL_NAME}.cpp" # don't add .hpp file here to optimize build process ++ "${CMAKE_CURRENT_BINARY_DIR}/${OCL_NAME}.hpp" # in reality vcpkg needs them + COMMAND ${CMAKE_COMMAND} "-DMODULE_NAME=${name}" "-DCL_DIR=${CMAKE_CURRENT_LIST_DIR}/src/opencl" "-DOUTPUT=${CMAKE_CURRENT_BINARY_DIR}/${OCL_NAME}.cpp" -P "${OpenCV_SOURCE_DIR}/cmake/cl2cpp.cmake" + DEPENDS ${cl_kernels} "${OpenCV_SOURCE_DIR}/cmake/cl2cpp.cmake" + COMMENT "Processing OpenCL kernels (${name})" diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 3799483e7e..5dc61200e8 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -1,52 +1,10 @@ set(USE_QT_VERSION "6") -vcpkg_download_distfile(CUDA_124_DNN_PATCH - URLS "https://patch-diff.githubusercontent.com/raw/opencv/opencv/pull/25412.patch" - FILENAME "opencv-opencv4-25412.patch" - SHA512 0b8fcb19d81feeb506cdf596d317b137cc1d71d29c16ff1657c7744b389e9184e20e197a7f7398964c7c71e9950659814d9fbd2387f8d4a5875c2db252dd3f76 -) - -vcpkg_download_distfile(CUDA_124_TUPLE_PATCH - URLS "https://patch-diff.githubusercontent.com/raw/opencv/opencv/pull/25658.patch" - FILENAME "opencv-opencv4-25658.patch" - SHA512 ca5661ff2e3761b7f7ba9314539fffb7f1a3e9e6ff07ce0942ef4b88a342110a873d1c14081fbf57f3413af5542643089ee88b92ff3430cdd9e7d82dea2c40fd -) - -vcpkg_download_distfile(CONTRIB_CUDA_124_NPP_PATCH - URLS "https://patch-diff.githubusercontent.com/raw/opencv/opencv_contrib/pull/3726.patch" - FILENAME "opencv-opencv4-contrib-3726.patch" - SHA512 948811a6121e00009812c44c1fbd859cca10f80b447c2d0a69dec2e453eafddd15ece0b96a7f238f6e92f77d249f8f750f020d7913728ed21aba55ecaf07c2d3 -) - -vcpkg_download_distfile(CONTRIB_CUDA_124_PATCH - URLS "https://patch-diff.githubusercontent.com/raw/opencv/opencv_contrib/pull/3742.patch" - FILENAME "opencv-opencv4-contrib-3742.patch" - SHA512 de3b428fe342cd2607bb53cf8c77e066925fd9d59d5b8600a60117f7a0f536424cadcbca7e60c1161a64794e785cceb806dc6d4e244c2c05a59678d2b61d8610 -) - -vcpkg_download_distfile(CONTRIB_CUDA_124_TUPLE_PATCH - URLS "https://patch-diff.githubusercontent.com/raw/opencv/opencv_contrib/pull/3744.patch" - FILENAME "opencv-opencv4-contrib-3744.patch" - SHA512 4b40aa81d708b184afcbd92da29b886139dead5d9b964a3906715864a393ce56737f2bfc3fc67aec18792f2d55932c32d3c18b1b238078949721247bbe985d5f -) - -vcpkg_download_distfile(CONTRIB_CUDA_124_INCLUDE_PATCH - URLS "https://patch-diff.githubusercontent.com/raw/opencv/opencv_contrib/pull/3751.patch" - FILENAME "opencv-opencv4-contrib-3751.patch" - SHA512 3ba5d6e0a1f13c6513f5967d49f5941204eb39a064a402d54fe3a4fa5dbb2cfd8a8bebec99e06da9991098c95acfc816e367d27757f4a4f4d9fed1452debfd8a -) - -vcpkg_download_distfile(ARM64_WINDOWS_PATCH - URLS "https://patch-diff.githubusercontent.com/raw/opencv/opencv/pull/25069.patch" - FILENAME "opencv-opencv4-25069.patch" - SHA512 2842f32ced73beb89850f7dc0c55d501e32b616276557489ccba90959f63d8955dae3395a882e690fdd7db7b38569c06f0141c8a5b9debdeb3670d2d43a4e34b -) - vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO opencv/opencv REF "${VERSION}" - SHA512 1598ae59849e7805b3cbec5260bb501006f26edff452343b366b9262a0f48a6e09f4b2e760209cb677f2a64a7b22f4e70bc6195c104bcea74cc9fe04031d0292 + SHA512 b4f7248f89f1cd146dbbae7860a17131cd29bd3cb81db1e678abfcfbf2d8fa4a7633bfd0edbf50afae7b838c8700e8c0d0bb05828139d5cb5662df6bbf3eb92c HEAD_REF master PATCHES 0001-disable-downloading.patch @@ -60,13 +18,10 @@ vcpkg_from_github( 0010-fix-uwp-tiff-imgcodecs.patch 0011-remove-python2.patch 0012-fix-zlib.patch - 0014-fix-supportqnx.patch + 0014-fix-cmake-in-list.patch 0015-fix-freetype.patch 0017-fix-flatbuffers.patch - 0019-fix-cmake-in-list.patch - ${CUDA_124_DNN_PATCH} - ${CUDA_124_TUPLE_PATCH} - ${ARM64_WINDOWS_PATCH} + 0019-opencl-kernel.patch ) # Disallow accidental build of vendored copies file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr") @@ -214,17 +169,13 @@ if("contrib" IN_LIST FEATURES) OUT_SOURCE_PATH CONTRIB_SOURCE_PATH REPO opencv/opencv_contrib REF "${VERSION}" - SHA512 ebaee3b88bd7ae246727e65a98d9fbc1d9772a4181a1926f3af742410b78dc87d2386bcd96ac67d7fb1a3020c3717a2cdebdcf9304d6dfd9ea494004791cf043 + SHA512 480df862250692a97ce6431cba00dbecb70332307a19c1c04aa9d7444e6e74ab4f8c798548dce76d2319a9877624b82e361fb22a71df14b996087ade448be501 HEAD_REF master PATCHES 0007-contrib-fix-hdf5.patch 0013-contrib-fix-ogre.patch 0016-contrib-fix-freetype.patch 0018-contrib-fix-tesseract.patch - ${CONTRIB_CUDA_124_NPP_PATCH} - ${CONTRIB_CUDA_124_PATCH} - ${CONTRIB_CUDA_124_TUPLE_PATCH} - ${CONTRIB_CUDA_124_INCLUDE_PATCH} ) set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules") @@ -323,29 +274,29 @@ if("ipp" IN_LIST FEATURES) elseif(VCPKG_TARGET_IS_LINUX) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") vcpkg_download_distfile(OCV_DOWNLOAD - URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/0cc4aa06bf2bef4b05d237c69a5a96b9cd0cb85a/ippicv/ippicv_2021.10.0_lnx_intel64_20230919_general.tgz" - FILENAME "opencv-cache/ippicv/606a19b207ebedfe42d59fd916cc4850-ippicv_2021.10.0_lnx_intel64_20230919_general.tgz" - SHA512 ce4a2fbcf77d435cabecd9b414950db4bd34f88dde385e4a9139586a9c6d31f09e32d13d7ae36ca64418d5511777b5ba212c06422fe5ae1508342846613ca26d + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/fd27188235d85e552de31425e7ea0f53ba73ba53/ippicv/ippicv_2021.11.0_lnx_intel64_20240201_general.tgz" + FILENAME "opencv-cache/ippicv/0f2745ff705ecae31176dad437608f6f-ippicv_2021.11.0_lnx_intel64_20240201_general.tgz" + SHA512 74cba99a1d2c40a125b23d42de555548fecd22c8fea5ed68ab7f887b1f208bd7f2906a64d40bac71ea82190e5389fb92d3c72b6d47c8c05a2e9b9b909a82ce47 ) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") vcpkg_download_distfile(OCV_DOWNLOAD - URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/0cc4aa06bf2bef4b05d237c69a5a96b9cd0cb85a/ippicv/ippicv_2021.10.0_lnx_ia32_20230919_general.tgz" - FILENAME "opencv-cache/ippicv/606a19b207ebedfe42d59fd916cc4850-ippicv_2021.10.0_lnx_ia32_20230919_general.tgz" - SHA512 534fdd08b6f669665cf6a3f719f54505cf53e800f90ba93d96e77b1e149b260738cb59c685c424788c06d924a88756c3038d27bd0e33acdb51e0051f9aac421c + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/fd27188235d85e552de31425e7ea0f53ba73ba53/ippicv/ippicv_2021.11.0_lnx_ia32_20240201_general.tgz" + FILENAME "opencv-cache/ippicv/63e381bf08076ca34fd5264203043a45-ippicv_2021.11.0_lnx_ia32_20240201_general.tgz" + SHA512 37484704754f9553b04c8da23864af3217919a11a9dbc92427e6326d6104bab7f1983c98c78ec52cda2d3eb93dc1fd98d0b780e3b7a98e703010c5ee1b421426 ) endif() elseif(VCPKG_TARGET_IS_WINDOWS) if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") vcpkg_download_distfile(OCV_DOWNLOAD - URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/0cc4aa06bf2bef4b05d237c69a5a96b9cd0cb85a/ippicv/ippicv_2021.10.0_win_intel64_20230919_general.zip" - FILENAME "opencv-cache/ippicv/538a819ec84193a9c9f3c0f8df0be8b7-ippicv_2021.10.0_win_intel64_20230919_general.zip" - SHA512 5aff6d9c8474e9f13e54d849a3e9b03de1e82590437d90cbde8e6c1d3be3a2b0f4263b5171796e8dab41181f8d7f8fd7c6d46e6f4aedacc98213aa5270bd1720 + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/fd27188235d85e552de31425e7ea0f53ba73ba53/ippicv/ippicv_2021.11.0_win_intel64_20240201_general.zip" + FILENAME "opencv-cache/ippicv/59d154bf54a1e3eea20d7248f81a2a8e-ippicv_2021.11.0_win_intel64_20240201_general.zip" + SHA512 686ddbafa3f24c598d94589fca6937f90a4fb25e3dabea3b276709e55cbc2636aba8d73fadd336775f8514ff8e2e1b20e749264a7f11243190d54467f9a3f895 ) elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") vcpkg_download_distfile(OCV_DOWNLOAD - URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/0cc4aa06bf2bef4b05d237c69a5a96b9cd0cb85a/ippicv/ippicv_2021.10.0_win_ia32_20230919_general.zip" - FILENAME "opencv-cache/ippicv/8ff93c69415ab0835cc1e94dc5660f5d-ippicv_2021.10.0_win_ia32_20230919_general.zip" - SHA512 bd63e8edf52e561154953217d26ca64cc500b529e55b8e3abb927d69766fff979fed2b16d51e453f75e61679d3569abbc5c1bbb2652a93f3f178fbf27354d624 + URLS "https://raw.githubusercontent.com/opencv/opencv_3rdparty/fd27188235d85e552de31425e7ea0f53ba73ba53/ippicv/ippicv_2021.11.0_win_ia32_20240201_general.zip" + FILENAME "opencv-cache/ippicv/7a6d8ac5825c02fea6cbfc1201b521b5-ippicv_2021.11.0_win_ia32_20240201_general.zip" + SHA512 0e151e34cee01a3684d3be3c2c75b0fac5f303bfd8c08685981a3d4a25a19a9bb454da26d2965aab915adc209accca17b6a4b6d7726c004cd7841daf180bbd3a ) endif() endif() @@ -465,6 +416,7 @@ vcpkg_cmake_configure( -DWITH_AVIF=OFF -DWITH_VA=OFF -DWITH_VA_INTEL=OFF + -DWITH_OBSENSOR=OFF ###### modules which require special treatment -DBUILD_opencv_quality=${BUILD_opencv_quality} -DBUILD_opencv_rgbd=${BUILD_opencv_rgbd} diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 63561da207..dcf16388ef 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,6 @@ { "name": "opencv4", - "version": "4.9.0", - "port-version": 1, + "version": "4.10.0", "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index c72f8183b7..48f05a66f6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6633,7 +6633,7 @@ "port-version": 0 }, "opencv": { - "baseline": "4.9.0", + "baseline": "4.10.0", "port-version": 0 }, "opencv2": { @@ -6645,8 +6645,8 @@ "port-version": 17 }, "opencv4": { - "baseline": "4.9.0", - "port-version": 1 + "baseline": "4.10.0", + "port-version": 0 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv.json b/versions/o-/opencv.json index 7f111597e9..8c04bfe368 100644 --- a/versions/o-/opencv.json +++ b/versions/o-/opencv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9d9cbb0bf2f2f7c07006342621932ce4928cb8e6", + "version": "4.10.0", + "port-version": 0 + }, { "git-tree": "be681746481dc0fb9c03863f988388ba6dc4a642", "version": "4.9.0", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 99eecfc650..16e5c8c791 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "89c7baedc6a4590a76c9a04cfe65b5a23c53800c", + "version": "4.10.0", + "port-version": 0 + }, { "git-tree": "c02907180d6ea45984d37d41a6850ac5f76a34d6", "version": "4.9.0",