Skip to content

Commit 64975e9

Browse files
authored
OpenCV+Extra+ippicv: add version v4.12.0-p0 (#832)
Update OpenCV, OpenCV-Extra and ippicv to `v4.12.0-p0`. Those packages belong together and should be updated at once. - OpenCV: update to 4.12.0-p0 - OpenCV-Extra: update to 4.12.0 release - ippicv: update to 20250130 for OpenCV 4.12.0 - keep APPLE version to ippicv 20240201 from OpenCV 4.10.0 - add `WITH_VTK=OFF` - Unpin OpenCV for all as Linux build is now fixed with fixed TIFF/OpenEXR Fixes: #801
1 parent d3199ed commit 64975e9

File tree

4 files changed

+53
-4
lines changed

4 files changed

+53
-4
lines changed

cmake/configs/default.cmake

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ hunter_default_version(OpenBLAS VERSION 0.3.27)
103103
hunter_default_version(OpenCL VERSION 2022.01.04-p1)
104104
hunter_default_version(OpenCL-Headers VERSION 2022.01.04)
105105
hunter_default_version(OpenCL-cpp VERSION 2.0.16-61a5c9a-p0)
106-
hunter_default_version(OpenCV VERSION 4.10.0-p0)
107-
hunter_default_version(OpenCV-Extra VERSION 4.10.0)
106+
hunter_default_version(OpenCV VERSION 4.12.0-p0)
107+
hunter_default_version(OpenCV-Extra VERSION 4.12.0)
108108
hunter_default_version(OpenEXR VERSION 3.4.0-p0)
109109
hunter_default_version(OpenGL-Registry VERSION 0.0.0-d15191e-p0)
110110
hunter_default_version(OpenJPH VERSION 0.23.0)
@@ -336,11 +336,12 @@ hunter_default_version(intltool VERSION 0.51.0)
336336
hunter_default_version(intsizeof VERSION 2.0.2)
337337
hunter_default_version(intx VERSION 0.9.0)
338338
hunter_default_version(ios_sim VERSION 3.1.1)
339-
if(MSVC)
339+
if(APPLE)
340+
# still using OpenCV 4.10.0 ippicv version
340341
hunter_default_version(ippicv VERSION 20240201)
341342
else()
342343
# see OpenCV for more info
343-
hunter_default_version(ippicv VERSION 20230330)
344+
hunter_default_version(ippicv VERSION 20250130)
344345
endif()
345346
hunter_default_version(iroha-ed25519 VERSION 2.0.0)
346347
hunter_default_version(irrXML VERSION 1.2-p0)

cmake/projects/OpenCV-Extra/hunter.cmake

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,17 @@ hunter_add_version(
172172
164afbd29e2ac741b1159e572d6f13abd66b6064
173173
)
174174

175+
hunter_add_version(
176+
PACKAGE_NAME
177+
OpenCV-Extra
178+
VERSION
179+
"4.12.0"
180+
URL
181+
"https://github.com/opencv/opencv_contrib/archive/4.12.0.tar.gz"
182+
SHA1
183+
2bcf20557c5019119c2307cb879e47b09bd1a4e5
184+
)
185+
175186

176187
hunter_pick_scheme(DEFAULT url_sha1_unpack)
177188
hunter_download(PACKAGE_NAME OpenCV-Extra)

cmake/projects/OpenCV/hunter.cmake

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -497,6 +497,17 @@ hunter_add_version(
497497
a0c2d5944364fc4f26b6160b33c03082b1fa08c1
498498
)
499499

500+
hunter_add_version(
501+
PACKAGE_NAME
502+
OpenCV
503+
VERSION
504+
"4.12.0-p0"
505+
URL
506+
"https://github.com/cpp-pm/opencv/archive/refs/tags/v4.12.0-p0.tar.gz"
507+
SHA1
508+
ad56c2f05c31767b1a665e7f69e61bbd2adadec1
509+
)
510+
500511
if(ANDROID)
501512
# This feature doesn't work with new CMake 3.7+ toolchains
502513
set(_android_args ENABLE_PRECOMPILED_HEADERS=OFF)
@@ -552,6 +563,7 @@ hunter_cmake_args(
552563
WITH_QUIRC=OFF
553564
WITH_LAPACK=OFF
554565
WITH_PROTOBUF=OFF
566+
WITH_VTK=OFF
555567
)
556568

557569
# Pick a download scheme

cmake/projects/ippicv/hunter.cmake

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,31 @@ elseif(WIN32)
153153
)
154154
endif()
155155

156+
# Version: 20250130
157+
# added for OpenCV 4.12.0
158+
if(UNIX)
159+
hunter_add_version(
160+
PACKAGE_NAME
161+
ippicv
162+
VERSION
163+
"20250130"
164+
URL
165+
"https://raw.githubusercontent.com/opencv/opencv_3rdparty/767426b2a40a011eb2fa7f44c677c13e60e205ad/ippicv/ippicv_2022.1.0_lnx_intel64_20250130_general.tgz"
166+
SHA1
167+
b1465c256d32112c69e1104f734edc0b1d68d0db
168+
)
169+
elseif(WIN32)
170+
hunter_add_version(
171+
PACKAGE_NAME
172+
ippicv
173+
VERSION
174+
"20250130"
175+
URL
176+
"https://raw.githubusercontent.com/opencv/opencv_3rdparty/767426b2a40a011eb2fa7f44c677c13e60e205ad/ippicv/ippicv_2022.1.0_win_intel64_20250130_general.zip"
177+
SHA1
178+
3c981e7bcd6fe586caba5915d4aa66f08e1db75e
179+
)
180+
endif()
156181

157182
hunter_pick_scheme(DEFAULT url_sha1_download)
158183
hunter_download(PACKAGE_NAME ippicv)

0 commit comments

Comments
 (0)