Skip to content

Commit 870c38c

Browse files
authored
OpenCV and dependencies update to v4.10.0-p0 (#764)
* 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
1 parent 3545220 commit 870c38c

File tree

4 files changed

+73
-3
lines changed

4 files changed

+73
-3
lines changed

cmake/configs/default.cmake

+14-3
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,14 @@ hunter_default_version(OpenBLAS VERSION 0.3.27)
110110
hunter_default_version(OpenCL VERSION 2022.01.04-p1)
111111
hunter_default_version(OpenCL-Headers VERSION 2022.01.04)
112112
hunter_default_version(OpenCL-cpp VERSION 2.0.16-61a5c9a-p0)
113-
hunter_default_version(OpenCV VERSION 4.8.1-p0)
114-
hunter_default_version(OpenCV-Extra VERSION 4.8.1)
113+
if(MSVC)
114+
hunter_default_version(OpenCV VERSION 4.10.0-p0)
115+
hunter_default_version(OpenCV-Extra VERSION 4.10.0)
116+
else()
117+
# 4.10.0 has a build problem with TIFF header defines
118+
hunter_default_version(OpenCV VERSION 4.8.1-p0)
119+
hunter_default_version(OpenCV-Extra VERSION 4.8.1)
120+
endif()
115121
hunter_default_version(OpenEXR VERSION 3.1.5-p0)
116122
hunter_default_version(OpenGL-Registry VERSION 0.0.0-d15191e-p0)
117123
hunter_default_version(OpenNMTTokenizer VERSION 1.11.0-p1)
@@ -342,7 +348,12 @@ hunter_default_version(intltool VERSION 0.51.0)
342348
hunter_default_version(intsizeof VERSION 2.0.2)
343349
hunter_default_version(intx VERSION 0.9.0)
344350
hunter_default_version(ios_sim VERSION 3.1.1)
345-
hunter_default_version(ippicv VERSION 20230330)
351+
if(MSVC)
352+
hunter_default_version(ippicv VERSION 20240201)
353+
else()
354+
# see OpenCV for more info
355+
hunter_default_version(ippicv VERSION 20230330)
356+
endif()
346357
hunter_default_version(iroha-ed25519 VERSION 2.0.0)
347358
hunter_default_version(irrXML VERSION 1.2-p0)
348359
hunter_default_version(ittapi VERSION 3.21.2-p0)

cmake/projects/OpenCV-Extra/hunter.cmake

+11
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,17 @@ hunter_add_version(
161161
111cca75f8f3dd7d840755d6fc3c488c2fe980ed
162162
)
163163

164+
hunter_add_version(
165+
PACKAGE_NAME
166+
OpenCV-Extra
167+
VERSION
168+
"4.10.0"
169+
URL
170+
"https://github.com/opencv/opencv_contrib/archive/4.10.0.tar.gz"
171+
SHA1
172+
164afbd29e2ac741b1159e572d6f13abd66b6064
173+
)
174+
164175

165176
hunter_pick_scheme(DEFAULT url_sha1_unpack)
166177
hunter_download(PACKAGE_NAME OpenCV-Extra)

cmake/projects/OpenCV/hunter.cmake

+11
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,17 @@ include(hunter_pick_scheme)
1313

1414
# List of versions here...
1515

16+
hunter_add_version(
17+
PACKAGE_NAME
18+
OpenCV
19+
VERSION
20+
"4.10.0-p0"
21+
URL
22+
"https://github.com/cpp-pm/opencv/archive/refs/tags/v4.10.0-p0.tar.gz"
23+
SHA1
24+
a1c036469148b5c9e2d29861612a7cbb2ed75a9d
25+
)
26+
1627
hunter_add_version(
1728
PACKAGE_NAME
1829
OpenCV

cmake/projects/ippicv/hunter.cmake

+37
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,43 @@ elseif(WIN32)
116116
)
117117
endif()
118118

119+
# Version: 20240201
120+
# added for OpenCV 4.10.0
121+
if(APPLE)
122+
hunter_add_version(
123+
PACKAGE_NAME
124+
ippicv
125+
VERSION
126+
"20240201"
127+
URL
128+
"https://raw.githubusercontent.com/opencv/opencv_3rdparty/0cc4aa06bf2bef4b05d237c69a5a96b9cd0cb85a/ippicv/ippicv_2021.9.1_mac_intel64_20230919_general.tgz"
129+
SHA1
130+
b9b3e0775a1599d32cd8fed14e670c153ece4722
131+
)
132+
elseif(UNIX)
133+
hunter_add_version(
134+
PACKAGE_NAME
135+
ippicv
136+
VERSION
137+
"20240201"
138+
URL
139+
"https://raw.githubusercontent.com/opencv/opencv_3rdparty/fd27188235d85e552de31425e7ea0f53ba73ba53/ippicv/ippicv_2021.11.0_lnx_intel64_20240201_general.tgz"
140+
SHA1
141+
d4da464d3b5796bdcaafac85bddece601c708f41
142+
)
143+
elseif(WIN32)
144+
hunter_add_version(
145+
PACKAGE_NAME
146+
ippicv
147+
VERSION
148+
"20240201"
149+
URL
150+
"https://raw.githubusercontent.com/opencv/opencv_3rdparty/fd27188235d85e552de31425e7ea0f53ba73ba53/ippicv/ippicv_2021.11.0_win_intel64_20240201_general.zip"
151+
SHA1
152+
a15f378ccd01ebceb84ddd5fc0128f87a962fed6
153+
)
154+
endif()
155+
119156

120157
hunter_pick_scheme(DEFAULT url_sha1_download)
121158
hunter_download(PACKAGE_NAME ippicv)

0 commit comments

Comments
 (0)