[vcpkg baseline][realsense2] Fix config issue on osx (#18202)

* [vcpkg baseline][realsense2] Fix config issue on osx * Update the baseline version
microsoft · Jun 3, 2021 · 668f048 · 668f048
1 parent 64c07e5
commit 668f048
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 18 deletions.
diff --git a/ports/realsense2/CONTROL b/ports/realsense2/CONTROL
diff --git a/ports/realsense2/fix_config_osx.patch b/ports/realsense2/fix_config_osx.patch
@@ -0,0 +1,12 @@
+diff --git a/CMake/unix_config.cmake b/CMake/unix_config.cmake
+index 3e5929b..57dbe76 100644
+--- a/CMake/unix_config.cmake
++++ b/CMake/unix_config.cmake
+@@ -35,7 +35,6 @@ macro(os_set_flags)
+
+     if(APPLE)
+         set(FORCE_RSUSB_BACKEND ON)
+-        set(BUILD_WITH_TM2 ON)
+     endif()
+
+     if(FORCE_RSUSB_BACKEND)
diff --git a/ports/realsense2/portfile.cmake b/ports/realsense2/portfile.cmake
@@ -7,13 +7,15 @@ vcpkg_from_github(
     PATCHES
         fix_openni2.patch
         fix-dependency-glfw3.patch
+        fix_config_osx.patch
 )
 
 file(COPY ${SOURCE_PATH}/src/win7/drivers/IntelRealSense_D400_series_win7.inf DESTINATION ${SOURCE_PATH})
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" BUILD_CRT_LINKAGE)
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    tm2   BUILD_WITH_TM2
+    FEATURES
+        tm2   BUILD_WITH_TM2
 )
 
 set(BUILD_TOOLS OFF)

diff --git a/ports/realsense2/vcpkg.json b/ports/realsense2/vcpkg.json
@@ -0,0 +1,31 @@
+{
+  "name": "realsense2",
+  "version": "2.42.0",
+  "port-version": 1,
+  "description": "Intel® RealSense™ SDK 2.0 is a cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300).",
+  "homepage": "https://github.com/IntelRealSense/librealsense",
+  "dependencies": [
+    {
+      "name": "libusb",
+      "platform": "linux"
+    }
+  ],
+  "features": {
+    "openni2": {
+      "description": "Build Intel® RealSense™ OpenNI2 driver",
+      "dependencies": [
+        "openni2"
+      ]
+    },
+    "tm2": {
+      "description": "Build Intel® RealSense™ T265 device"
+    },
+    "tools": {
+      "description": "Build Intel® RealSense™ examples and tools",
+      "dependencies": [
+        "glfw3",
+        "opengl"
+      ]
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5434,7 +5434,7 @@
     },
     "realsense2": {
       "baseline": "2.42.0",
-      "port-version": 0
+      "port-version": 1
     },
     "recast": {
       "baseline": "1.5.1-3",

diff --git a/versions/r-/realsense2.json b/versions/r-/realsense2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7126a8b0d6dffc469da9a7aeccca58d48f05b1d2",
+      "version": "2.42.0",
+      "port-version": 1
+    },
     {
       "git-tree": "4d8620f1907de79152086b5f98a2fce0cb24c438",
       "version-string": "2.42.0",