From a5f76d9f5414e8bcfdf31e7e83c4d5d5e0f0daa8 Mon Sep 17 00:00:00 2001 From: Sameer Sheorey Date: Thu, 6 Jun 2024 15:30:44 -0700 Subject: [PATCH] Remove macOS ARM64 patch after updating librealrealsense to 2.54 --- 3rdparty/librealsense/fix-macos-arm64.patch | 22 --------------------- 3rdparty/librealsense/librealsense.cmake | 3 --- 2 files changed, 25 deletions(-) delete mode 100644 3rdparty/librealsense/fix-macos-arm64.patch diff --git a/3rdparty/librealsense/fix-macos-arm64.patch b/3rdparty/librealsense/fix-macos-arm64.patch deleted file mode 100644 index 0de73a574a1..00000000000 --- a/3rdparty/librealsense/fix-macos-arm64.patch +++ /dev/null @@ -1,22 +0,0 @@ -From beb4c44debc8336de991c983274cad841eb5c323 Mon Sep 17 00:00:00 2001 -From: Pavol Rusnak -Date: Sun, 20 Jun 2021 12:26:58 +0200 -Subject: [PATCH] Fix build on macOS arm64 - ---- - src/proc/color-formats-converter.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/proc/color-formats-converter.cpp b/src/proc/color-formats-converter.cpp -index 564a23d9c4..6c6c8c97d8 100644 ---- a/src/proc/color-formats-converter.cpp -+++ b/src/proc/color-formats-converter.cpp -@@ -18,7 +18,7 @@ - #include // For SSSE3 intrinsics - #endif - --#if defined (ANDROID) || (defined (__linux__) && !defined (__x86_64__)) -+#if defined (ANDROID) || (defined (__linux__) && !defined (__x86_64__)) || (defined (__APPLE__) && !defined (__x86_64__)) - - bool has_avx() { return false; } - diff --git a/3rdparty/librealsense/librealsense.cmake b/3rdparty/librealsense/librealsense.cmake index e197f453531..1b999fcdabf 100644 --- a/3rdparty/librealsense/librealsense.cmake +++ b/3rdparty/librealsense/librealsense.cmake @@ -17,9 +17,6 @@ ExternalProject_Add( COMMAND ${GIT_EXECUTABLE} init COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --ignore-whitespace ${CMAKE_CURRENT_LIST_DIR}/fix-cudacrt.patch - # Patch for macOS ARM64 support for versions < 2.50.0 - COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --ignore-whitespace - ${CMAKE_CURRENT_LIST_DIR}/fix-macos-arm64.patch CMAKE_ARGS -DCMAKE_INSTALL_PREFIX= -DBUILD_SHARED_LIBS=OFF