* Upgrade presets for librealsense2 2.44.0 (pull #1031)

bytedeco · Apr 14, 2021 · e149aeb · e149aeb
1 parent 9c21e2a
commit e149aeb
Show file tree

Hide file tree

Showing 79 changed files with 254 additions and 164 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@
  * Map `std::vector<cv::Range>` to `RangeVector` in `opencv_core.Mat` for convenience ([issue bytedeco/javacv#1607](https://github.com/bytedeco/javacv/issues/1607))
  * Include `genericaliasobject.h`, `context.h`, `tracemalloc.h`, and `datetime.h` for CPython ([issue #1017](https://github.com/bytedeco/javacpp-presets/issues/1017))
  * Add samples using LLVM modules to deal with bitcode and object files ([pull #1016](https://github.com/bytedeco/javacpp-presets/pull/1016))
- * Upgrade presets for OpenCV 4.5.2, FFmpeg 4.4 ([pull #1030](https://github.com/bytedeco/javacpp-presets/pull/1030)), MKL 2021.2, OpenBLAS 0.3.14, DNNL 2.2, NumPy 1.20.2, SciPy 1.6.2, CUDA 11.2.2
+ * Upgrade presets for OpenCV 4.5.2, FFmpeg 4.4 ([pull #1030](https://github.com/bytedeco/javacpp-presets/pull/1030)), librealsense2 2.44.0 ([pull #1031](https://github.com/bytedeco/javacpp-presets/pull/1031)), MKL 2021.2, OpenBLAS 0.3.14, DNNL 2.2, NumPy 1.20.2, SciPy 1.6.2, CUDA 11.2.2
 
 ### March 8, 2021 version 1.5.5
  * Bundle LLD executable in presets for LLVM as required by TVM on Windows

diff --git a/README.md b/README.md
@@ -174,7 +174,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * libfreenect 0.5.7  https://github.com/OpenKinect/libfreenect
  * libfreenect2 0.2.0  https://github.com/OpenKinect/libfreenect2
  * librealsense 1.12.x  https://github.com/IntelRealSense/librealsense
- * librealsense2 2.40.x  https://github.com/IntelRealSense/librealsense
+ * librealsense2 2.44.x  https://github.com/IntelRealSense/librealsense
  * videoInput 0.200  https://github.com/ofTheo/videoInput/
  * ARToolKitPlus 2.3.1  https://launchpad.net/artoolkitplus
  * Chilitags  https://github.com/chili-epfl/chilitags

diff --git a/librealsense2/README.md b/librealsense2/README.md
@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * librealsense2 2.40.0  https://github.com/IntelRealSense/librealsense
+ * librealsense2 2.44.0  https://github.com/IntelRealSense/librealsense
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -40,15 +40,15 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.librealsense2</groupId>
     <artifactId>rsdistance</artifactId>
-    <version>1.5.5</version>
+    <version>1.5.6-SNAPSHOT</version>
     <properties>
         <exec.mainClass>RsDistance</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>librealsense2-platform</artifactId>
-            <version>2.40.0-1.5.5</version>
+            <version>2.44.0-1.5.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/librealsense2/cppbuild.sh b/librealsense2/cppbuild.sh
@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-LIBREALSENSE2_VERSION=2.40.0
+LIBREALSENSE2_VERSION=2.44.0
 LIBUSB_VERSION=1.0.22
 download https://github.com/IntelRealSense/librealsense/archive/v$LIBREALSENSE2_VERSION.tar.gz librealsense-$LIBREALSENSE2_VERSION.tar.gz
 download http://sourceforge.net/projects/libusb/files/libusb-1.0/libusb-$LIBUSB_VERSION/libusb-$LIBUSB_VERSION.tar.bz2/download libusb-$LIBUSB_VERSION.tar.bz2
@@ -31,7 +31,7 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../librealsense-$LIBREALSENSE2_VERSION
-        CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++ "$CMAKE" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DLIBUSB_INC=$INSTALL_PATH/include/libusb-1.0/ -DLIBUSB_LIB=$INSTALL_PATH/lib/libusb-1.0.a -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF .
+        CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++ "$CMAKE" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DLIBUSB_INC=$INSTALL_PATH/include/libusb-1.0/ -DLIBUSB_LIB=$INSTALL_PATH/lib/libusb-1.0.a -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF .
         make -j $MAKEJ
         make install/strip
         ;;
@@ -41,7 +41,7 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../librealsense-$LIBREALSENSE2_VERSION
-        CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ "$CMAKE" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DLIBUSB_INC=$INSTALL_PATH/include/libusb-1.0/ -DLIBUSB_LIB=$INSTALL_PATH/lib/libusb-1.0.a -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF .
+        CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ "$CMAKE" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DLIBUSB_INC=$INSTALL_PATH/include/libusb-1.0/ -DLIBUSB_LIB=$INSTALL_PATH/lib/libusb-1.0.a -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF .
         make -j $MAKEJ
         make install/strip
         ;;
@@ -51,7 +51,7 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../librealsense-$LIBREALSENSE2_VERSION
-        CC="gcc -m32" CXX="g++ -m32" "$CMAKE" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DLIBUSB_INC=$INSTALL_PATH/include/libusb-1.0/ -DLIBUSB_LIB=$INSTALL_PATH/lib/libusb-1.0.a -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF .
+        CC="gcc -m32" CXX="g++ -m32" "$CMAKE" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DLIBUSB_INC=$INSTALL_PATH/include/libusb-1.0/ -DLIBUSB_LIB=$INSTALL_PATH/lib/libusb-1.0.a -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF .
         make -j $MAKEJ
         make install/strip
         ;;
@@ -61,12 +61,12 @@ case $PLATFORM in
         make -j $MAKEJ
         make install
         cd ../librealsense-$LIBREALSENSE2_VERSION
-        CC="gcc -m64" CXX="g++ -m64" "$CMAKE" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DLIBUSB_INC=$INSTALL_PATH/include/libusb-1.0/ -DLIBUSB_LIB=$INSTALL_PATH/lib/libusb-1.0.a -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF .
+        CC="gcc -m64" CXX="g++ -m64" "$CMAKE" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DLIBUSB_INC=$INSTALL_PATH/include/libusb-1.0/ -DLIBUSB_LIB=$INSTALL_PATH/lib/libusb-1.0.a -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF .
         make -j $MAKEJ
         make install/strip
         ;;
     macosx-x86_64)
-        "$CMAKE" -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_MACOSX_RPATH=ON -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF .
+        "$CMAKE" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_MACOSX_RPATH=ON -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF .
         make -j $MAKEJ
         make install/strip
         install_name_tool -change /usr/local/opt/libusb/lib/libusb-1.0.0.dylib @rpath/libusb-1.0.0.dylib ../lib/librealsense2.dylib

diff --git a/librealsense2/platform/pom.xml b/librealsense2/platform/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>librealsense2-platform</artifactId>
-  <version>2.40.0-${project.parent.version}</version>
+  <version>2.44.0-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for librealsense2</name>
 
   <properties>

diff --git a/librealsense2/pom.xml b/librealsense2/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>librealsense2</artifactId>
-  <version>2.40.0-${project.parent.version}</version>
+  <version>2.44.0-${project.parent.version}</version>
   <name>JavaCPP Presets for librealsense2</name>
 
   <dependencies>

diff --git a/librealsense2/samples/display/pom.xml b/librealsense2/samples/display/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.opencv</groupId>
     <artifactId>realsense2show</artifactId>
-    <version>1.5.5</version>
+    <version>1.5.6-SNAPSHOT</version>
     <properties>
         <exec.mainClass>RealSense2Show</exec.mainClass>
         <maven.compiler.source>11</maven.compiler.source>
@@ -12,13 +12,13 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>librealsense2-platform</artifactId>
-            <version>2.40.0-1.5.5</version>
+            <version>2.44.0-1.5.6-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>opencv-platform</artifactId>
-            <version>4.5.1-1.5.5</version>
+            <version>4.5.2-1.5.6-SNAPSHOT</version>
         </dependency>
 
         <!-- JavaFX dependencies -->

diff --git a/librealsense2/samples/distance/pom.xml b/librealsense2/samples/distance/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.librealsense2</groupId>
     <artifactId>rsdistance</artifactId>
-    <version>1.5.5</version>
+    <version>1.5.6-SNAPSHOT</version>
     <properties>
         <exec.mainClass>RsDistance</exec.mainClass>
         <maven.compiler.source>1.7</maven.compiler.source>
@@ -12,7 +12,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>librealsense2-platform</artifactId>
-            <version>2.40.0-1.5.5</version>
+            <version>2.44.0-1.5.6-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/librealsense2/src/gen/java/org/bytedeco/librealsense2/STAEControl.java b/librealsense2/src/gen/java/org/bytedeco/librealsense2/STAEControl.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.librealsense2;
 

diff --git a/librealsense2/src/gen/java/org/bytedeco/librealsense2/STAFactor.java b/librealsense2/src/gen/java/org/bytedeco/librealsense2/STAFactor.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.librealsense2;
 

diff --git a/librealsense2/src/gen/java/org/bytedeco/librealsense2/STCensusRadius.java b/librealsense2/src/gen/java/org/bytedeco/librealsense2/STCensusRadius.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.librealsense2;
 

diff --git a/librealsense2/src/gen/java/org/bytedeco/librealsense2/STColorControl.java b/librealsense2/src/gen/java/org/bytedeco/librealsense2/STColorControl.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.librealsense2;
 

diff --git a/librealsense2/src/gen/java/org/bytedeco/librealsense2/STColorCorrection.java b/librealsense2/src/gen/java/org/bytedeco/librealsense2/STColorCorrection.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.librealsense2;
 

diff --git a/librealsense2/src/gen/java/org/bytedeco/librealsense2/STDepthControlGroup.java b/librealsense2/src/gen/java/org/bytedeco/librealsense2/STDepthControlGroup.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.librealsense2;
 

diff --git a/librealsense2/src/gen/java/org/bytedeco/librealsense2/STDepthTableControl.java b/librealsense2/src/gen/java/org/bytedeco/librealsense2/STDepthTableControl.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.librealsense2;
 

diff --git a/librealsense2/src/gen/java/org/bytedeco/librealsense2/STHdad.java b/librealsense2/src/gen/java/org/bytedeco/librealsense2/STHdad.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.librealsense2;
 

diff --git a/librealsense2/src/gen/java/org/bytedeco/librealsense2/STRauColorThresholdsControl.java b/librealsense2/src/gen/java/org/bytedeco/librealsense2/STRauColorThresholdsControl.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.librealsense2;
 

diff --git a/librealsense2/src/gen/java/org/bytedeco/librealsense2/STRauSupportVectorControl.java b/librealsense2/src/gen/java/org/bytedeco/librealsense2/STRauSupportVectorControl.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.librealsense2;
 

diff --git a/librealsense2/src/gen/java/org/bytedeco/librealsense2/STRsm.java b/librealsense2/src/gen/java/org/bytedeco/librealsense2/STRsm.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.librealsense2;
 

diff --git a/librealsense2/src/gen/java/org/bytedeco/librealsense2/STSloColorThresholdsControl.java b/librealsense2/src/gen/java/org/bytedeco/librealsense2/STSloColorThresholdsControl.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.librealsense2;
 

diff --git a/librealsense2/src/gen/java/org/bytedeco/librealsense2/STSloPenaltyControl.java b/librealsense2/src/gen/java/org/bytedeco/librealsense2/STSloPenaltyControl.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.5.5: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.6-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.librealsense2;