Skip to content

[opencv4] update from 4.3.0 to 4.5.1 #15607

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

Closed
ludchieng wants to merge 2 commits into from
Closed

[opencv4] update from 4.3.0 to 4.5.1 #15607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64968bd
[vcpkg] Update opencv 4.3.0 to 4.5.1 (need to check patches)
ludchieng Jan 12, 2021
ba0d64d
[opencv] update CONTROL
ludchieng Jan 12, 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
2 changes: 1 addition & 1 deletion ports/opencv4/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Source: opencv4
Version: 4.3.0
Version: 4.5.1
Port-Version: 4
Build-Depends: zlib
Homepage: https://github.com/opencv/opencv
Expand Down
30 changes: 15 additions & 15 deletions ports/opencv4/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/share/opencv3")
message(FATAL_ERROR "OpenCV 3 is installed, please uninstall and try again:\n vcpkg remove opencv3")
endif()

set(OPENCV_VERSION "4.3.0")
set(OPENCV_VERSION "4.5.1")

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO opencv/opencv
REF ${OPENCV_VERSION}
SHA512 ac22b41fffa3e3138701fa0df0d19900b3ce72e168f4478ecdc593c5c9fd004b4b1b26612d62c25b681db99a8720db7a11b5b224e576e595624965fa79b0f383
SHA512 d74ae3bc340639cbc8b5db41a1fec710acabf8ec828dd28ce3bacf7029d1afd23aeaf47a2273a42995de285daa8aef33a7f90d5c57ef096e2cb872e0845e92b0
HEAD_REF master
PATCHES
0001-disable-downloading.patch
0002-install-options.patch
0003-force-package-requirements.patch
0004-fix-policy-CMP0057.patch
0006-fix-vtk9.patch
0006-jpeg2000_getref.patch
0009-fix-uwp.patch
0010-fix-interface_link_libraries.patch # Remove this patch when the next update
#PATCHES
# 0001-disable-downloading.patch
# 0002-install-options.patch
# 0003-force-package-requirements.patch
# 0004-fix-policy-CMP0057.patch
# 0006-fix-vtk9.patch
# 0006-jpeg2000_getref.patch
# 0009-fix-uwp.patch
# 0010-fix-interface_link_libraries.patch # Remove this patch when the next update
)

file(REMOVE "${SOURCE_PATH}/cmake/FindCUDNN.cmake")
Expand Down Expand Up @@ -121,11 +121,11 @@ if("contrib" IN_LIST FEATURES)
OUT_SOURCE_PATH CONTRIB_SOURCE_PATH
REPO opencv/opencv_contrib
REF ${OPENCV_VERSION}
SHA512 cfeda06a9f86ccaedbca9521c35bf685c3d8d3a182fb943f9378a7ecd1949d6e2e9df1673f0e3e9686840ca4c9e5a8e8cf2ac962a33b6e1f88f8278abd8c37e5
SHA512 1ebb9fec53b74039ffa2dc9f00899ab83af615f01156c0454ea7c53161256b6c9fd4548387fbfd197182c2d03db4de8c7170e2877b4648ce92531f821e81fdd7
HEAD_REF master
PATCHES
0005-add-missing-stdexcept-include.patch
0007-fix-vtk9-contrib.patch
#PATCHES
# 0005-add-missing-stdexcept-include.patch
# 0007-fix-vtk9-contrib.patch
)
set(BUILD_WITH_CONTRIB_FLAG "-DOPENCV_EXTRA_MODULES_PATH=${CONTRIB_SOURCE_PATH}/modules")

Expand Down