diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-08-25 03:53:16 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-08-25 03:53:16 +0100 |
| commit | fad7c346bcf147b6a580ccc1d0a9b35dbe194ecc (patch) | |
| tree | ad2e2924d725873f214407741185a257944d8ed9 /media-libs/opencv/files | |
| parent | 27ddeb821d437a2d848d9fa85a30f88f48fb52a6 (diff) | |
gentoo auto-resync : 25:08:2023 - 03:53:16
Diffstat (limited to 'media-libs/opencv/files')
| -rw-r--r-- | media-libs/opencv/files/opencv-4.8.0-fix-flatbuffer.patch | 31 | ||||
| -rw-r--r-- | media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch | 20 |
2 files changed, 51 insertions, 0 deletions
diff --git a/media-libs/opencv/files/opencv-4.8.0-fix-flatbuffer.patch b/media-libs/opencv/files/opencv-4.8.0-fix-flatbuffer.patch new file mode 100644 index 000000000000..395f0998a3b9 --- /dev/null +++ b/media-libs/opencv/files/opencv-4.8.0-fix-flatbuffer.patch @@ -0,0 +1,31 @@ +--- a/modules/dnn/misc/tflite/schema_generated.h 2023-06-28 19:53:33.000000000 +0800 ++++ b/modules/dnn/misc/tflite/schema_generated.h 2023-08-24 15:17:19.594480034 +0800 +@@ -8,9 +8,9 @@ + + // Ensure the included flatbuffers.h is the same version as when this file was + // generated, otherwise it may not be compatible. +-static_assert(FLATBUFFERS_VERSION_MAJOR == 23 && +- FLATBUFFERS_VERSION_MINOR == 5 && +- FLATBUFFERS_VERSION_REVISION == 9, ++static_assert(FLATBUFFERS_VERSION_MAJOR == FLATBUFFERS_VERSION_MAJOR && ++ FLATBUFFERS_VERSION_MINOR == FLATBUFFERS_VERSION_MINOR && ++ FLATBUFFERS_VERSION_REVISION == FLATBUFFERS_VERSION_REVISION, + "Non-compatible flatbuffers version included"); + + namespace opencv_tflite { +--- a/cmake/OpenCVDetectFlatbuffers.cmake 2023-08-24 15:31:50.129947159 +0800 ++++ b/cmake/OpenCVDetectFlatbuffers.cmake 2023-08-24 15:36:15.176705845 +0800 +@@ -1,9 +1,9 @@ + if(WITH_FLATBUFFERS) + set(HAVE_FLATBUFFERS 1) +- set(flatbuffers_VERSION "23.5.9") +- ocv_install_3rdparty_licenses(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/LICENSE.txt") +- ocv_add_external_target(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/include" "" "HAVE_FLATBUFFERS=1") +- set(CUSTOM_STATUS_flatbuffers " Flatbuffers:" "builtin/3rdparty (${flatbuffers_VERSION})") ++ #set(flatbuffers_VERSION "23.5.9") ++ #ocv_install_3rdparty_licenses(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/LICENSE.txt") ++ #ocv_add_external_target(flatbuffers "${OpenCV_SOURCE_DIR}/3rdparty/flatbuffers/include" "" "HAVE_FLATBUFFERS=1") ++ #set(CUSTOM_STATUS_flatbuffers " Flatbuffers:" "builtin/3rdparty (${flatbuffers_VERSION})") + endif() + + if(WITH_FLATBUFFERS OR HAVE_FLATBUFFERS) diff --git a/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch b/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch new file mode 100644 index 000000000000..937e00e0c024 --- /dev/null +++ b/media-libs/opencv/files/opencv-4.8.0-fix-protobuf.patch @@ -0,0 +1,20 @@ +--- a/cmake/OpenCVFindProtobuf.cmake ++++ b/cmake/OpenCVFindProtobuf.cmake +@@ -31,7 +31,7 @@ if(BUILD_PROTOBUF) + set(HAVE_PROTOBUF TRUE) + else() + unset(Protobuf_VERSION CACHE) +- find_package(Protobuf QUIET) ++ find_package(protobuf) + + # Backwards compatibility + # Define camel case versions of input variables +@@ -50,7 +50,7 @@ else() + endforeach() + # end of compatibility block + +- if(Protobuf_FOUND) ++ if(protobuf_FOUND) + if(TARGET protobuf::libprotobuf) + set(Protobuf_LIBRARIES "protobuf::libprotobuf") + else() |