[opencv4] Fix feature openexr compilation error (#42230)

2024-11-24 00:29:08 +08:00 · 2024-11-22 22:50:39 +00:00 · 2024-11-22 22:50:39 +00:00 · b171e5156a
commit b171e5156a
parent b112a65db5
5 changed files with 22 additions and 1 deletions
--- a/ports/opencv4/0020-miss-openexr.patch
+++ b/ports/opencv4/0020-miss-openexr.patch
@ -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()
--- a/ports/opencv4/portfile.cmake
+++ b/ports/opencv4/portfile.cmake
@ -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")
--- a/ports/opencv4/vcpkg.json
+++ b/ports/opencv4/vcpkg.json
@ -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",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -6666,7 +6666,7 @@
    },
    "opencv4": {
      "baseline": "4.10.0",
-      "port-version": 0
+      "port-version": 1
    },
    "opendnp3": {
      "baseline": "3.1.1",
--- a/versions/o-/opencv4.json
+++ b/versions/o-/opencv4.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "6ba67264448ce7a60b8e109db62270331e657e38",
+      "version": "4.10.0",
+      "port-version": 1
+    },
    {
      "git-tree": "89c7baedc6a4590a76c9a04cfe65b5a23c53800c",
      "version": "4.10.0",