Skip to content
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

Jump to bottom

[opencv4] Fix feature openexr compilation error #42230

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
+22 −1
Draft

[opencv4] Fix feature openexr compilation error #42230

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
64c4f80
add find openexr
jimwang118 Nov 19, 2024
488cbfd
update version
jimwang118 Nov 19, 2024
c4a1512
format
jimwang118 Nov 19, 2024
c737b63
update version
jimwang118 Nov 19, 2024
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
14 changes: 14 additions & 0 deletions ports/opencv4/0020-miss-openexr.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6bc6de..61b7a02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -831,6 +831,9 @@ include(cmake/OpenCVFindLibsPerf.cmake)
include(cmake/OpenCVFindLAPACK.cmake)
include(cmake/OpenCVFindProtobuf.cmake)
include(cmake/OpenCVDetectFlatbuffers.cmake)
+if(WITH_OPENEXR)
+ include(cmake/OpenCVFindOpenEXR.cmake)
+endif()
if(WITH_TIMVX)
include(cmake/OpenCVFindTIMVX.cmake)
endif()
1 change: 1 addition & 0 deletions ports/opencv4/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ vcpkg_from_github(
0015-fix-freetype.patch
0017-fix-flatbuffers.patch
0019-opencl-kernel.patch
0020-miss-openexr.patch
)
# Disallow accidental build of vendored copies
file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr")
Expand Down
1 change: 1 addition & 0 deletions ports/opencv4/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "opencv4",
"version": "4.10.0",
"port-version": 1,
"description": "computer vision library",
"homepage": "https://github.com/opencv/opencv",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6666,7 +6666,7 @@
},
"opencv4": {
"baseline": "4.10.0",
"port-version": 0
"port-version": 1
},
"opendnp3": {
"baseline": "3.1.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/opencv4.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6ba67264448ce7a60b8e109db62270331e657e38",
"version": "4.10.0",
"port-version": 1
},
{
"git-tree": "89c7baedc6a4590a76c9a04cfe65b5a23c53800c",
"version": "4.10.0",
Expand Down