Skip to content

Update OpenCV to v4.5.3-p0 #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rbsheth merged 4 commits into from
Jul 26, 2021
Merged

Update OpenCV to v4.5.3-p0 #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
964a59f
Update OpenCV to v4.5.3-p0
rbsheth Jul 15, 2021
440baad
Merge remote-tracking branch 'origin/master' into pr.OpenCV
rbsheth Jul 26, 2021
81fa86c
Update SHA1
rbsheth Jul 26, 2021
18bd423
Update SHA1
rbsheth Jul 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmake/configs/default.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ hunter_default_version(OpenAL VERSION 1.19.1)
hunter_default_version(OpenBLAS VERSION 0.3.7)
hunter_default_version(OpenCL VERSION 2.1-p3)
hunter_default_version(OpenCL-cpp VERSION 2.0.10-p0)
hunter_default_version(OpenCV VERSION 4.1.1-p0)
hunter_default_version(OpenCV-Extra VERSION 4.1.1)
hunter_default_version(OpenCV VERSION 4.5.3-p0)
hunter_default_version(OpenCV-Extra VERSION 4.5.3)
hunter_default_version(OpenEXR VERSION 3.1.0-p0)
hunter_default_version(OpenGL-Registry VERSION 0.0.0-d15191e-p0)
hunter_default_version(OpenNMTTokenizer VERSION 1.11.0-p1)
Expand Down
11 changes: 11 additions & 0 deletions cmake/projects/OpenCV-Extra/hunter.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ include(hunter_add_version)
include(hunter_download)
include(hunter_pick_scheme)

hunter_add_version(
PACKAGE_NAME
OpenCV-Extra
VERSION
"4.5.3"
URL
"https://github.com/opencv/opencv_contrib/archive/4.5.3.tar.gz"
SHA1
879a5e4390b220d1112b68c3dcb0fd7dbdd67cbd
)

hunter_add_version(
PACKAGE_NAME
OpenCV-Extra
Expand Down
16 changes: 13 additions & 3 deletions cmake/projects/OpenCV/hunter.cmake
View file
Open in desktop
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.5.3-p0"
URL
"https://github.com/cpp-pm/opencv/archive/refs/tags/v4.5.3-p0.tar.gz"
SHA1
6a6cace284822117a5c3f48f2faa5bd0f6123759
)

hunter_add_version(
PACKAGE_NAME
OpenCV
Expand All @@ -24,7 +35,6 @@ hunter_add_version(
9df096bd5afd6fa7dc02651491a1de04b46b4556
)


hunter_add_version(
PACKAGE_NAME
OpenCV
Expand Down Expand Up @@ -481,6 +491,7 @@ hunter_cmake_args(
BUILD_JPEG=OFF
BUILD_JASPER=OFF
BUILD_WEBP=OFF
BUILD_OPENEXR=OFF
# This stuff will build shared libraries. Build with PIC required for dependencies.
BUILD_opencv_java=OFF
BUILD_opencv_python2=OFF
Expand All @@ -491,9 +502,8 @@ hunter_cmake_args(
WITH_CUFFT=OFF
# Fix for https://travis-ci.org/xsacha/hunter/jobs/347083573
BUILD_opencv_dnn=OFF
# Fix for https://travis-ci.org/ingenue/hunter/builds/452039597
WITH_OPENEXR=OFF
WITH_FFMPEG=OFF
WITH_OPENJPEG=OFF
)

# Pick a download scheme
Expand Down