Skip to content

Commit

Permalink
OpenCV and dependencies update to v4.10.0-p0 (#764)
Browse files Browse the repository at this point in the history
* OpenCV and dependencies update to v4.10.0-p0

Update OpenCV, OpenCV-Extra and ippicv to `v4.10.0-p0`.
Those packages belong together and should be updated at once.

- OpenCV: update to 4.10.0-p0, but riegl branch
- OpenCV-Extra: update to 4.10.0 release
- ippicv: update to 20240201 for OpenCV 4.10.0

But only update the version for MSVC as the other compiler
have an error with TIFF headers.
See: #765
  • Loading branch information
NeroBurner authored Nov 15, 2024
1 parent 3545220 commit 870c38c
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 3 deletions.
17 changes: 14 additions & 3 deletions cmake/configs/default.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,14 @@ hunter_default_version(OpenBLAS VERSION 0.3.27)
hunter_default_version(OpenCL VERSION 2022.01.04-p1)
hunter_default_version(OpenCL-Headers VERSION 2022.01.04)
hunter_default_version(OpenCL-cpp VERSION 2.0.16-61a5c9a-p0)
hunter_default_version(OpenCV VERSION 4.8.1-p0)
hunter_default_version(OpenCV-Extra VERSION 4.8.1)
if(MSVC)
hunter_default_version(OpenCV VERSION 4.10.0-p0)
hunter_default_version(OpenCV-Extra VERSION 4.10.0)
else()
# 4.10.0 has a build problem with TIFF header defines
hunter_default_version(OpenCV VERSION 4.8.1-p0)
hunter_default_version(OpenCV-Extra VERSION 4.8.1)
endif()
hunter_default_version(OpenEXR VERSION 3.1.5-p0)
hunter_default_version(OpenGL-Registry VERSION 0.0.0-d15191e-p0)
hunter_default_version(OpenNMTTokenizer VERSION 1.11.0-p1)
Expand Down Expand Up @@ -342,7 +348,12 @@ hunter_default_version(intltool VERSION 0.51.0)
hunter_default_version(intsizeof VERSION 2.0.2)
hunter_default_version(intx VERSION 0.9.0)
hunter_default_version(ios_sim VERSION 3.1.1)
hunter_default_version(ippicv VERSION 20230330)
if(MSVC)
hunter_default_version(ippicv VERSION 20240201)
else()
# see OpenCV for more info
hunter_default_version(ippicv VERSION 20230330)
endif()
hunter_default_version(iroha-ed25519 VERSION 2.0.0)
hunter_default_version(irrXML VERSION 1.2-p0)
hunter_default_version(ittapi VERSION 3.21.2-p0)
Expand Down
11 changes: 11 additions & 0 deletions cmake/projects/OpenCV-Extra/hunter.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,17 @@ hunter_add_version(
111cca75f8f3dd7d840755d6fc3c488c2fe980ed
)

hunter_add_version(
PACKAGE_NAME
OpenCV-Extra
VERSION
"4.10.0"
URL
"https://github.com/opencv/opencv_contrib/archive/4.10.0.tar.gz"
SHA1
164afbd29e2ac741b1159e572d6f13abd66b6064
)


hunter_pick_scheme(DEFAULT url_sha1_unpack)
hunter_download(PACKAGE_NAME OpenCV-Extra)
11 changes: 11 additions & 0 deletions cmake/projects/OpenCV/hunter.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@ include(hunter_pick_scheme)

# List of versions here...

hunter_add_version(
PACKAGE_NAME
OpenCV
VERSION
"4.10.0-p0"
URL
"https://github.com/cpp-pm/opencv/archive/refs/tags/v4.10.0-p0.tar.gz"
SHA1
a1c036469148b5c9e2d29861612a7cbb2ed75a9d
)

hunter_add_version(
PACKAGE_NAME
OpenCV
Expand Down
37 changes: 37 additions & 0 deletions cmake/projects/ippicv/hunter.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,43 @@ elseif(WIN32)
)
endif()

# Version: 20240201
# added for OpenCV 4.10.0
if(APPLE)
hunter_add_version(
PACKAGE_NAME
ippicv
VERSION
"20240201"
URL
"https://raw.githubusercontent.com/opencv/opencv_3rdparty/0cc4aa06bf2bef4b05d237c69a5a96b9cd0cb85a/ippicv/ippicv_2021.9.1_mac_intel64_20230919_general.tgz"
SHA1
b9b3e0775a1599d32cd8fed14e670c153ece4722
)
elseif(UNIX)
hunter_add_version(
PACKAGE_NAME
ippicv
VERSION
"20240201"
URL
"https://raw.githubusercontent.com/opencv/opencv_3rdparty/fd27188235d85e552de31425e7ea0f53ba73ba53/ippicv/ippicv_2021.11.0_lnx_intel64_20240201_general.tgz"
SHA1
d4da464d3b5796bdcaafac85bddece601c708f41
)
elseif(WIN32)
hunter_add_version(
PACKAGE_NAME
ippicv
VERSION
"20240201"
URL
"https://raw.githubusercontent.com/opencv/opencv_3rdparty/fd27188235d85e552de31425e7ea0f53ba73ba53/ippicv/ippicv_2021.11.0_win_intel64_20240201_general.zip"
SHA1
a15f378ccd01ebceb84ddd5fc0128f87a962fed6
)
endif()


hunter_pick_scheme(DEFAULT url_sha1_download)
hunter_download(PACKAGE_NAME ippicv)

0 comments on commit 870c38c

Please sign in to comment.