diff --git a/ports/opencv4/0023-fix-no-flatbuffers.patch b/ports/opencv4/0023-fix-no-flatbuffers.patch deleted file mode 100644 index 53ee3645dc..0000000000 --- a/ports/opencv4/0023-fix-no-flatbuffers.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5b6e382..29a81f0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -756,7 +756,7 @@ include(cmake/OpenCVFindLibsVideo.cmake) - include(cmake/OpenCVFindLibsPerf.cmake) - include(cmake/OpenCVFindLAPACK.cmake) - include(cmake/OpenCVFindProtobuf.cmake) --include(cmake/OpenCVDetectFlatbuffers.cmake) -+find_package(flatbuffers CONFIG REQUIRED) - if(WITH_TENGINE) - include(cmake/OpenCVFindTengine.cmake) - endif() -diff --git a/modules/dnn/CMakeLists.txt b/modules/dnn/CMakeLists.txt -index 804b78e..86d9d45 100644 ---- a/modules/dnn/CMakeLists.txt -+++ b/modules/dnn/CMakeLists.txt -@@ -133,7 +133,7 @@ if(TARGET ocv.3rdparty.flatbuffers AND OPENCV_DNN_TFLITE) - if(NOT HAVE_FLATBUFFERS) - message(FATAL_ERROR "DNN: TFLite is not supported without enabled 'flatbuffers'. Check build configuration.") - endif() -- list(APPEND libs ocv.3rdparty.flatbuffers) -+ list(APPEND libs flatbuffers::flatbuffers) - list(APPEND fw_hdrs "${CMAKE_CURRENT_LIST_DIR}/misc/tflite/schema_generated.h") - list(APPEND fw_inc "${CMAKE_CURRENT_LIST_DIR}/misc/tflite") - diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 1c0f4550da..125a396588 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -32,7 +32,6 @@ vcpkg_from_github( 0021-static-openvino.patch # https://github.com/opencv/opencv/pull/23963 "${ARM64_WINDOWS_FIX}" 0022-fix-supportqnx.patch - 0023-fix-no-flatbuffers.patch ) # Disallow accidental build of vendored copies file(REMOVE_RECURSE "${SOURCE_PATH}/3rdparty/openexr") diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index d46e172f13..e73bcce3e8 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.8.0", - "port-version": 18, + "port-version": 19, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index b1f7347bdf..495fc64b27 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6438,7 +6438,7 @@ }, "opencv4": { "baseline": "4.8.0", - "port-version": 18 + "port-version": 19 }, "opendnp3": { "baseline": "3.1.1", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index c84a6f88d9..91eb8a0198 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85685a5e45ef916a21769da98c8346462ef179d0", + "version": "4.8.0", + "port-version": 19 + }, { "git-tree": "b69ea5e7ef839490d21d1ef5aed614d19d54e203", "version": "4.8.0",