[realsense2] Update to v2.10.4

Update realsense2 port to librealsense v2.10.4.

4 files changed, 7 insertions, 104 deletions

diff --git a/ports/realsense2/CONTROL b/ports/realsense2/CONTROL
index 2465fd1a4..f87152bc6 100644
--- a/ports/realsense2/CONTROL
+++ b/ports/realsense2/CONTROL
@@ -1,10 +1,7 @@
 Source: realsense2
-Version: 2.10.1-1
+Version: 2.10.4
 Description: Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).
 
-Feature: avx2
-Description: rgb image decode using avx2
-
 Feature: tools
 Build-Depends: opengl
 Description: Build Intel® RealSense™ examples and tools
diff --git a/ports/realsense2/build_with_static_crt.patch b/ports/realsense2/build_with_static_crt.patch
deleted file mode 100644
index ab8ec426d..000000000
--- a/ports/realsense2/build_with_static_crt.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt

-index 9425b92d..21232504 100644

---- a/CMakeLists.txt

-+++ b/CMakeLists.txt

-@@ -299,6 +299,8 @@ if(BUILD_EASYLOGGINGPP)

-     list(APPEND REALSENSE_HPP third-party/easyloggingpp/src/easylogging++.h)

- endif()

- 

-+option(BUILD_WITH_STATIC_CRT "Build with static link CRT" ON)

-+

- if(WIN32)

-     source_group("Source Files\\Backend" FILES

-         src/win/win-helpers.cpp

-@@ -484,15 +486,17 @@ if(WIN32)

-         src/proc/disparity-transform.h

-         )

- 

--    foreach(flag_var

--            CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE

--            CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO

--            CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE

--            CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)

--        if(${flag_var} MATCHES "/MD")

--            string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")

--        endif(${flag_var} MATCHES "/MD")

--    endforeach(flag_var)

-+    if(BUILD_WITH_STATIC_CRT)

-+        foreach(flag_var

-+                CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE

-+                CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO

-+                CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE

-+                CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)

-+            if(${flag_var} MATCHES "/MD")

-+                string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")

-+            endif(${flag_var} MATCHES "/MD")

-+        endforeach(flag_var)

-+    endif()

- else()

- 

- endif()

-@@ -652,15 +656,17 @@ if (BUILD_WITH_TM2)

-     list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake)

-     find_package(libtm REQUIRED)

- 

--    foreach(flag_var

--            CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE

--            CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO

--            CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE

--            CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)

--        if(${flag_var} MATCHES "/MD")

--            string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")

--        endif(${flag_var} MATCHES "/MD")

--    endforeach(flag_var)

-+    if(BUILD_WITH_STATIC_CRT)

-+        foreach(flag_var

-+                CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE

-+                CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO

-+                CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE

-+                CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO)

-+            if(${flag_var} MATCHES "/MD")

-+                string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")

-+            endif(${flag_var} MATCHES "/MD")

-+        endforeach(flag_var)

-+    endif()

- 

-     list(APPEND REALSENSE_HPP

-     src/tm2/tm-context.h

diff --git a/ports/realsense2/fix_rgb_using_avx2.patch b/ports/realsense2/fix_rgb_using_avx2.patch
deleted file mode 100644
index 38ae33a7c..000000000
--- a/ports/realsense2/fix_rgb_using_avx2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/image.cpp b/src/image.cpp

-index 47cc68d8..04a8afd3 100644

---- a/src/image.cpp

-+++ b/src/image.cpp

-@@ -8,6 +8,7 @@

- 

- #ifdef __SSSE3__

- #include <tmmintrin.h> // For SSE3 intrinsic used in unpack_yuy2_sse

-+#include <immintrin.h>

- #endif

- 

- #pragma pack(push, 1) // All structs in this file are assumed to be byte-packed

diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake
index 8e6b57392..ed9e88ea2 100644
--- a/ports/realsense2/portfile.cmake
+++ b/ports/realsense2/portfile.cmake
@@ -3,28 +3,14 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO IntelRealSense/librealsense
-    REF v2.10.1
-    SHA512 fb00a424a5bd7335cc661261e76cf623e27a89af1033692d4cb6ed523af1295359929c235e82253911e61323cb7b82551a9223862174cb0e2363ac944b2db923
+    REF v2.10.4
+    SHA512 35580cd4ab65b85eb7fcebac3be629960993223437e3c44b0bcc2f7572d85231e822a922b2f5e22480fcc1edb9295ab2c5893794d638c2ab6faf49a9eea57603
     HEAD_REF development
 )
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/build_with_static_crt.patch # https://github.com/IntelRealSense/librealsense/pull/1262
-        ${CMAKE_CURRENT_LIST_DIR}/fix_rgb_using_avx2.patch # https://github.com/IntelRealSense/librealsense/pull/1245
-)
-
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_LIBRARY_LINKAGE)
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_CRT_LINKAGE)
 
-# This option will be deprecated in the later versions.
-# Please see Pull Request #1245. https://github.com/IntelRealSense/librealsense/pull/1245
-set(RGB_USING_AVX2 OFF)
-if("avx2" IN_LIST FEATURES)
-    set(RGB_USING_AVX2 ON)
-endif()
-
 set(BUILD_EXAMPLES OFF)
 set(BUILD_GRAPHICAL_EXAMPLES OFF)
 if("tools" IN_LIST FEATURES)
@@ -36,18 +22,17 @@ endif()
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
+        #Ungrouped Entries
         -DENFORCE_METADATA=ON
+        # BUILD
         -DBUILD_EXAMPLES=${BUILD_EXAMPLES}
         -DBUILD_GRAPHICAL_EXAMPLES=${BUILD_GRAPHICAL_EXAMPLES}
-        -DBUILD_CV_EXAMPLES=OFF
-        -DBUILD_PCL_EXAMPLES=OFF
-        -DBUILD_PYTHON_BINDINGS=OFF
+        -DBUILD_SHARED_LIBS=${BUILD_LIBRARY_LINKAGE}
         -DBUILD_UNIT_TESTS=OFF
         -DBUILD_WITH_OPENMP=OFF
-        -DBUILD_SHARED_LIBS=${BUILD_LIBRARY_LINKAGE}
         -DBUILD_WITH_STATIC_CRT=${BUILD_CRT_LINKAGE}
-        -DRGB_USING_AVX2=${RGB_USING_AVX2}
     OPTIONS_DEBUG
+        # CMAKE
         "-DCMAKE_PDB_OUTPUT_DIRECTORY=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg"
         -DCMAKE_DEBUG_POSTFIX="_d"
 )