Deprecate apt-key in distribution_linux.md to align with Debian policy

.github/workflows/buildsCI.yaml

@@ -277,11 +277,10 @@ jobs:
           cmake --build . --config ${{env.LRS_BUILD_CONFIG}} -- -j4
 
 
-  Linux_python_nodejs:
+  Linux_python:
       runs-on: ubuntu-18.04     
       timeout-minutes: 60
-      env: 
-        LRS_BUILD_NODEJS: true
+
       steps:
       - uses: actions/checkout@v2   
 
@@ -296,42 +295,23 @@ jobs:
       - name: Prebuild
         shell: bash
         run: |
-          set -x
-          # Workaround for nvm failure: https://github.com/appleboy/ssh-action/issues/70
-          export NVM_DIR="$HOME/.nvm"
-          [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-          nvm install 10.15.3;
-          nvm use 10.15.3;
-          npm install -g node-gyp;
-          npm install -g mocha;
-          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git;
-          export OLDPATH=$PATH  
-          echo OLDPATH=$OLDPATH
-          export PATH=$PATH:$(pwd)/depot_tools;
-          echo PATH=$PATH
-          cd wrappers/nodejs/tools && npm install && cd ..;
-          node ./tools/linter.js;
-          python ./tools/enums.py -i ../../include/librealsense2 -a ./src -v
-          export PATH=$OLDPATH && unset OLDPATH && cd ../../;
-          mkdir build
-          sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test;
-          sudo apt-get update;
-          sudo apt-get install -qq build-essential xorg-dev libgl1-mesa-dev libglu1-mesa-dev libglew-dev libglm-dev;
-          sudo apt-get install -qq libusb-1.0-0-dev;
-          sudo apt-get install -qq libgtk-3-dev;
-          sudo apt-get install gcc-5 g++-5;
-          sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5;
-          sudo apt-get install libglfw3-dev libglfw3;
+            set -x
+            mkdir build
+            sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test;
+            sudo apt-get update;
+            sudo apt-get install -qq build-essential xorg-dev libgl1-mesa-dev libglu1-mesa-dev libglew-dev libglm-dev;
+            sudo apt-get install -qq libusb-1.0-0-dev;
+            sudo apt-get install -qq libgtk-3-dev;
+            sudo apt-get install gcc-5 g++-5;
+            sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5;
+            sudo apt-get install libglfw3-dev libglfw3;
 
       - name: Build
         shell: bash
         run: | 
-          python ./wrappers/nodejs/tools/enums.py -i ./include/librealsense2 -a ./wrappers/nodejs/src -v
           cd build
-          cmake .. -DBUILD_PYTHON_BINDINGS=true -DBUILD_NODEJS_BINDINGS=true -DPYBIND11_PYTHON_VERSION=2.7 -DCHECK_FOR_UPDATES=true
+          cmake .. -DBUILD_PYTHON_BINDINGS=true -DPYBIND11_PYTHON_VERSION=2.7 -DCHECK_FOR_UPDATES=true
           cmake --build . --config $LRS_BUILD_CONFIG -- -j4
-          cd ../wrappers/nodejs/ && npm install && cd -
-
 
   Mac_cpp:
     runs-on: macos-10.15

CMake/lrs_options.cmake

@@ -25,7 +25,6 @@ option(BUILD_MATLAB_BINDINGS "Build Matlab bindings" OFF)
 option(BUILD_UNITY_BINDINGS "Copy the unity project to the build folder with the required dependencies" OFF)
 option(BUILD_OPENVINO_EXAMPLES "Build Intel OpenVINO Toolkit examples - requires INTEL_OPENVINO_DIR" OFF)
 option(BUILD_OPEN3D_EXAMPLES "Build Open3D examples" OFF)
-option(BUILD_NODEJS_BINDINGS "Build Node.js bindings" OFF)
 option(BUILD_OPENNI2_BINDINGS "Build OpenNI bindings" OFF)
 option(IMPORT_DEPTH_CAM_FW "Download the latest firmware for the depth cameras" ON)
 option(BUILD_CV_KINFU_EXAMPLE "Build OpenCV KinectFusion example" OFF)

CONTRIBUTING.md

@@ -64,10 +64,9 @@ The pull request will be automatically updated
 
 For example, when adding new value to [`rs2_option`](https://github.com/IntelRealSense/librealsense/blob/master/include/librealsense2/h/rs_option.h) enum, please also add it to:
 1. The list of Matlab options under [`wrappers/matlab/option.m`](https://github.com/IntelRealSense/librealsense/blob/master/wrappers/matlab/option.m#L3-L46)
-2. The list of Node.js options [here](https://github.com/IntelRealSense/librealsense/blob/v2.32.1/wrappers/nodejs/index.js#L4661), [here](https://github.com/IntelRealSense/librealsense/blob/v2.32.1/wrappers/nodejs/index.js#L4927) and [here](https://github.com/IntelRealSense/librealsense/blob/v2.32.1/wrappers/nodejs/src/addon.cpp#L4629-L4692)
-3. The list of options for [Unreal Engine](https://github.com/IntelRealSense/librealsense/blob/v2.32.1/wrappers/unrealengine4/Plugins/RealSense/Source/RealSense/Public/RealSenseTypes.h#L56-L118) integration
-4. The list of options in the C# wrapper - [`wrappers/csharp/Intel.RealSense/Types/Enums/Option.cs`](https://github.com/IntelRealSense/librealsense/blob/v2.32.1/wrappers/csharp/Intel.RealSense/Types/Enums/Option.cs)
-5. The list of Java options used for Android integration - [`wrappers/android/librealsense/src/main/java/com/intel/realsense/librealsense/Option.java`](https://github.com/IntelRealSense/librealsense/blob/v2.32.1/wrappers/android/librealsense/src/main/java/com/intel/realsense/librealsense/Option.java#L4-L64)
-6. The list of options in the [python](https://github.com/IntelRealSense/librealsense/blob/v2.32.1/wrappers/python/pybackend.cpp#L102-L165) wrapper
+2. The list of options for [Unreal Engine](https://github.com/IntelRealSense/librealsense/blob/v2.32.1/wrappers/unrealengine4/Plugins/RealSense/Source/RealSense/Public/RealSenseTypes.h#L56-L118) integration
+3. The list of options in the C# wrapper - [`wrappers/csharp/Intel.RealSense/Types/Enums/Option.cs`](https://github.com/IntelRealSense/librealsense/blob/v2.32.1/wrappers/csharp/Intel.RealSense/Types/Enums/Option.cs)
+4. The list of Java options used for Android integration - [`wrappers/android/librealsense/src/main/java/com/intel/realsense/librealsense/Option.java`](https://github.com/IntelRealSense/librealsense/blob/v2.32.1/wrappers/android/librealsense/src/main/java/com/intel/realsense/librealsense/Option.java#L4-L64)
+5. The list of options in the [python](https://github.com/IntelRealSense/librealsense/blob/v2.32.1/wrappers/python/pybackend.cpp#L102-L165) wrapper
 
 Once all are updated [travis-ci](https://travis-ci.org/IntelRealSense/librealsense) will give clear indication that each of the wrappers is still passing compilation. 

doc/distribution_linux.md

@@ -14,13 +14,21 @@ The steps are described in [Linux manual installation guide](./installation.md)
 
 
 ## Installing the packages:
-- Register the server's public key:  
-`sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE || sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key F6E65AC044F831AC80A06380C8B3A55A6F3EFCDE`
-In case the public key still cannot be retrieved, check and specify proxy settings: `export http_proxy="http://<proxy>:<port>"`  
-, and rerun the command. See additional methods in the following [link](https://unix.stackexchange.com/questions/361213/unable-to-add-gpg-key-with-apt-key-behind-a-proxy).  
-
-- Add the server to the list of repositories:  
-`sudo add-apt-repository "deb https://librealsense.intel.com/Debian/apt-repo $(lsb_release -cs) main" -u`  
+- Register the server's public key:
+```
+sudo mkdir -p /etc/apt/keyrings
+curl -sSf https://librealsense.intel.com/Debian/librealsense.pgp | sudo tee /etc/apt/keyrings/librealsense.pgp > /dev/null
+```
+
+- Make sure apt HTTPS support is installed:
+`sudo apt-get install apt-transport-https`
+
+- Add the server to the list of repositories:
+```
+echo "deb [signed-by=/etc/apt/keyrings/librealsense.pgp] https://librealsense.intel.com/Debian/apt-repo `lsb_release -cs` main" | \
+sudo tee /etc/apt/sources.list.d/librealsense.list
+sudo apt-get update
+```
 
 - Install the libraries (see section below if upgrading packages):  
   `sudo apt-get install librealsense2-dkms`  

doc/distribution_windows.md

@@ -23,26 +23,33 @@ After plugging the camera into a USB3 port, you should be able to see the newly
 * Click through several simple steps of the installer:
 1. Intel® RealSense™ SDK 2.0 is distributed under the [Apache 2.0](../LICENSE) permissive open-source license:
 
-![Step 1](./img/win_step1.PNG)
+    ![Step 1](./img/win_step1.PNG)
 
 2.  The SDK includes the RealSense Viewer, as well as development packages for various programming languages:
 
-![Step 2](./img/win_step2.PNG)
+    ![Step 2](./img/win_step2.PNG)
 
 3. Approve adding two shortcuts to your desktop:
 
- ![Step 3](./img/win_step3.PNG)
+    ![Step 3](./img/win_step3.PNG)
 
 4. Review before installing:
 
-![Step 4](./img/win_step4.PNG)
+    ![Step 4](./img/win_step4.PNG)
+
+5. Open the `Intel® RealSense™ Samples` solution:
 
-5. Open the `Intel® RealSense™ Samples`solution:
+    Note: Visual Studio 2022 uses the 64-bit `Program Files` folder rather than the 32-bit `Program Files (x86)` where librealsense is located. </br>
+    To fix this, open `Program Files (x86)/Intel RealSense SDK 2.0/intel.realsense.prop` (elevated permissions may be needed) and change librealsenseSDK macro: </br>
 
-![Step 5](./img/win_shortcuts.PNG)
+    * `<librealsenseSDK>$(ProgramFiles)\Intel RealSense SDK 2.0</librealsenseSDK>` </br>
+    to </br>
+    * `<librealsenseSDK>$(MSBuildProgramFiles32)\Intel RealSense SDK 2.0</librealsenseSDK>`  </br>
+
+    ![Step 5](./img/win_shortcuts.PNG)
 
 6. Press `F5` to compile and run the demos:
 
-![Step 6](./img/win_samples.PNG)
+    ![Step 6](./img/win_samples.PNG)
 
 7. Success!

readme.md

@@ -52,7 +52,7 @@ The librealsense port in vcpkg is kept up to date by Microsoft team members and
 | **[Depth Quality Tool](./tools/depth-quality)** | This application allows you to test the camera’s depth quality, including: standard deviation from plane fit, normalized RMS – the subpixel accuracy, distance accuracy and fill rate. You should be able to easily get and interpret several of the depth quality metrics and record and save the data for offline analysis. |[**Depth.Quality.Tool.exe**](https://github.com/IntelRealSense/librealsense/releases) |
 | **[Debug Tools](./tools/)** | Device enumeration, FW logger, etc as can be seen at the tools directory | Included in [**Intel.RealSense.SDK.exe**](https://github.com/IntelRealSense/librealsense/releases)|
 | **[Code Samples](./examples)** |These simple examples demonstrate how to easily use the SDK to include code snippets that access the camera into your applications. Check some of the [**C++ examples**](./examples) including capture, pointcloud and more and basic [**C examples**](./examples/C) | Included in [**Intel.RealSense.SDK.exe**](https://github.com/IntelRealSense/librealsense/releases) |
-| **[Wrappers](https://github.com/IntelRealSense/librealsense/tree/development/wrappers)** | [Python](./wrappers/python), [C#/.NET](./wrappers/csharp), [Node.js](./wrappers/nodejs) API, as well as integration with the following 3rd-party technologies: [ROS1](https://github.com/IntelRealSense/realsense-ros/tree/ros1-legacy), [ROS2](https://github.com/IntelRealSense/realsense-ros/tree/ros2-development), [LabVIEW](./wrappers/labview), [OpenCV](./wrappers/opencv), [PCL](./wrappers/pcl), [Unity](./wrappers/unity), [Matlab](./wrappers/matlab), [OpenNI](./wrappers/openni2), [UnrealEngine4](./wrappers/unrealengine4) and more to come. | |
+| **[Wrappers](https://github.com/IntelRealSense/librealsense/tree/development/wrappers)** | [Python](./wrappers/python), [C#/.NET](./wrappers/csharp) API, as well as integration with the following 3rd-party technologies: [ROS1](https://github.com/IntelRealSense/realsense-ros/tree/ros1-legacy), [ROS2](https://github.com/IntelRealSense/realsense-ros/tree/ros2-development), [LabVIEW](./wrappers/labview), [OpenCV](./wrappers/opencv), [PCL](./wrappers/pcl), [Unity](./wrappers/unity), [Matlab](./wrappers/matlab), [OpenNI](./wrappers/openni2), [UnrealEngine4](./wrappers/unrealengine4) and more to come. | |
 
 
 ## Ready to Hack!

wrappers/CMakeLists.txt

@@ -13,9 +13,6 @@ if (BUILD_PYTHON_BINDINGS OR BUILD_PYTHON_DOCS)
 
 endif()
 
-if (BUILD_NODEJS_BINDINGS)
-  add_subdirectory(nodejs)
-endif()
 
 if (BUILD_CV_EXAMPLES)
   add_subdirectory(opencv)