[nifi-minifi-cpp] 01/03: MINIFICPP-2116 upgrade OpenCV and RocksDB, add missing includes in libminifi

[lordgamez]

This is an automated email from the ASF dual-hosted git repository.

lordgamez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git

commit 2e69ca2b3ccf2d1dba93501dc477e08e66f20610
Author: Marton Szasz <sza...@apache.org>
AuthorDate: Thu Jul 6 10:44:59 2023 +0200

    MINIFICPP-2116 upgrade OpenCV and RocksDB, add missing <cstdint> includes 
in libminifi
    
    Signed-off-by: Gabor Gyimesi <gamezb...@gmail.com>
    
    This closes #1604
---
 cmake/BundledOpenCV.cmake                       | 5 ++---
 cmake/BundledRocksDB.cmake                      | 4 ++--
 libminifi/include/core/Annotation.h             | 1 +
 libminifi/include/utils/SystemCpuUsageTracker.h | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/cmake/BundledOpenCV.cmake b/cmake/BundledOpenCV.cmake
index b2ede19b2..ccd18ae23 100644
--- a/cmake/BundledOpenCV.cmake
+++ b/cmake/BundledOpenCV.cmake
@@ -98,7 +98,6 @@ function(use_bundled_opencv SOURCE_DIR BINARY_DIR)
             "-DWITH_OPENJPEG=OFF"
             "-DWITH_TIFF=OFF"
             "-DWITH_CAROTENE=OFF"
-            "-DCMAKE_CXX_STANDARD=17"  # OpenCV fails to build in C++20 mode 
on Clang-14
     )
 
     append_third_party_passthrough_args(OPENCV_CMAKE_ARGS 
"${OPENCV_CMAKE_ARGS}")
@@ -106,8 +105,8 @@ function(use_bundled_opencv SOURCE_DIR BINARY_DIR)
     # Build project
     ExternalProject_Add(
             opencv-external
-            GIT_REPOSITORY "https://github.com/opencv/opencv.git";
-            GIT_TAG "4.5.5"
+            URL 
"https://github.com/opencv/opencv/archive/refs/tags/4.7.0.tar.gz";
+            URL_HASH 
"SHA256=8df0079cdbe179748a18d44731af62a245a45ebf5085223dc03133954c662973"
             SOURCE_DIR "${BINARY_DIR}/thirdparty/opencv-src"
             CMAKE_ARGS ${OPENCV_CMAKE_ARGS}
             BUILD_BYPRODUCTS "${BYPRODUCTS}"
diff --git a/cmake/BundledRocksDB.cmake b/cmake/BundledRocksDB.cmake
index b44855ee1..e9a72db93 100644
--- a/cmake/BundledRocksDB.cmake
+++ b/cmake/BundledRocksDB.cmake
@@ -67,8 +67,8 @@ function(use_bundled_rocksdb SOURCE_DIR BINARY_DIR)
     # Build project
     ExternalProject_Add(
             rocksdb-external
-            URL 
"https://github.com/facebook/rocksdb/archive/refs/tags/v7.7.3.tar.gz";
-            URL_HASH 
"SHA256=b8ac9784a342b2e314c821f6d701148912215666ac5e9bdbccd93cf3767cb611"
+            URL 
"https://github.com/facebook/rocksdb/archive/refs/tags/v8.1.1.tar.gz";
+            URL_HASH 
"SHA256=9102704e169cfb53e7724a30750eeeb3e71307663852f01fa08d5a320e6155a8"
             SOURCE_DIR "${BINARY_DIR}/thirdparty/rocksdb-src"
             CMAKE_ARGS ${ROCKSDB_CMAKE_ARGS}
             BUILD_BYPRODUCTS 
"${BINARY_DIR}/thirdparty/rocksdb-install/${BYPRODUCT}"
diff --git a/libminifi/include/core/Annotation.h 
b/libminifi/include/core/Annotation.h
index f43bc9963..e61117715 100644
--- a/libminifi/include/core/Annotation.h
+++ b/libminifi/include/core/Annotation.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <string>
 
 namespace org {
diff --git a/libminifi/include/utils/SystemCpuUsageTracker.h 
b/libminifi/include/utils/SystemCpuUsageTracker.h
index b9c177068..42b556955 100644
--- a/libminifi/include/utils/SystemCpuUsageTracker.h
+++ b/libminifi/include/utils/SystemCpuUsageTracker.h
@@ -16,6 +16,8 @@
  */
 #pragma once
 
+#include <cstdint>
+
 #ifdef __linux__
 #include <stdlib.h>
 #include <stdio.h>
@@ -24,7 +26,6 @@
 #endif
 
 #ifdef WIN32
-#include <cstdint>
 #include "TCHAR.h"
 #include "windows.h"
 #endif