* Upgrade presets for librealsense2 2.38.1 (pull #946)

bytedeco · Oct 6, 2020 · 55e0e0f · 55e0e0f
1 parent 19e6f12
commit 55e0e0f
Show file tree

Hide file tree

Showing 78 changed files with 814 additions and 128 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 
  * Add `linux-armhf` and `linux-arm64` builds for librealsense and librealsense2 ([pull #951](https://github.com/bytedeco/javacpp-presets/pull/951))
  * License default builds of FFmpeg under LGPL v3 and move GPL-enabled builds to `-gpl` extension ([pull #950](https://github.com/bytedeco/javacpp-presets/pull/950))
- * Upgrade presets for DNNL 1.6.3, NumPy 1.19.2, Gym 0.17.3, TensorFlow 1.15.4, ONNX Runtime 1.5.1, Qt 5.15.1, cpu_features 0.5.0, and their dependencies
+ * Upgrade presets for librealsense2 2.38.1 ([pull #946](https://github.com/bytedeco/javacpp-presets/pull/946)), DNNL 1.6.3, NumPy 1.19.2, Gym 0.17.3, TensorFlow 1.15.4, ONNX Runtime 1.5.1, Qt 5.15.1, cpu_features 0.5.0, and their dependencies
 
 ### September 9, 2020 version 1.5.4
  * Bundle `libpostal_data` program, executable via `Loader.load()` for convenience ([issue #939](https://github.com/bytedeco/javacpp-presets/issues/939))

diff --git a/README.md b/README.md
@@ -114,7 +114,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.29.x  https://github.com/IntelRealSense/librealsense
+ * librealsense2 2.38.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
@@ -5,7 +5,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * librealsense2 2.29.0  https://github.com/IntelRealSense/librealsense
+ * librealsense2 2.38.1  https://github.com/IntelRealSense/librealsense
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -36,15 +36,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.4</version>
+    <version>1.5.5-SNAPSHOT</version>
     <properties>
         <exec.mainClass>RsDistance</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>librealsense2-platform</artifactId>
-            <version>2.29.0-1.5.4</version>
+            <version>2.38.1-1.5.5-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.29.0
+LIBREALSENSE2_VERSION=2.38.1
 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
@@ -22,7 +22,7 @@ tar --totals -xjf ../libusb-$LIBUSB_VERSION.tar.bz2
 
 cd librealsense-$LIBREALSENSE2_VERSION
 patch -Np1 < ../../../librealsense2.patch || true
-sedinplace 's/float_t/float/g' `find third-party/libtm/ -type f`
+sedinplace 's/float_t/float/g' `find src/tm2/ -type f`
 
 case $PLATFORM in
     linux-armhf)

diff --git a/librealsense2/librealsense2.patch b/librealsense2/librealsense2.patch
@@ -1,6 +1,6 @@
-diff -ruN librealsense-2.25.0/src/linux/backend-v4l2.cpp librealsense-2.25.0-patch/src/linux/backend-v4l2.cpp
---- librealsense-2.25.0/src/linux/backend-v4l2.cpp	2019-08-01 22:36:18.000000000 +0900
-+++ librealsense-2.25.0-patch/src/linux/backend-v4l2.cpp	2019-09-19 13:41:49.373474731 +0900
+diff -ruN librealsense-2.38.1/src/linux/backend-v4l2.cpp librealsense-2.38.1-patch/src/linux/backend-v4l2.cpp
+--- librealsense-2.38.1/src/linux/backend-v4l2.cpp	2020-08-28 18:54:59.000000000 +0900
++++ librealsense-2.38.1-patch/src/linux/backend-v4l2.cpp	2020-10-05 15:03:19.496611859 +0900
 @@ -35,9 +35,9 @@
  #include <sys/mman.h>
  #include <sys/ioctl.h>
@@ -11,12 +11,12 @@ diff -ruN librealsense-2.25.0/src/linux/backend-v4l2.cpp librealsense-2.25.0-pat
 +#include "video.h"
 +#include "uvcvideo.h"
 +#include "videodev2.h"
- #include <fts.h>
  #include <regex>
  #include <list>
-diff -ruN librealsense-2.25.0/src/linux/backend-v4l2.h librealsense-2.25.0-patch/src/linux/backend-v4l2.h
---- librealsense-2.25.0/src/linux/backend-v4l2.h	2019-08-01 22:36:18.000000000 +0900
-+++ librealsense-2.25.0-patch/src/linux/backend-v4l2.h	2019-09-19 13:41:44.901471657 +0900
+
+diff -ruN librealsense-2.38.1/src/linux/backend-v4l2.h librealsense-2.38.1-patch/src/linux/backend-v4l2.h
+--- librealsense-2.38.1/src/linux/backend-v4l2.h	2020-08-28 18:54:59.000000000 +0900
++++ librealsense-2.38.1-patch/src/linux/backend-v4l2.h	2020-10-05 15:03:01.983584430 +0900
 @@ -33,9 +33,9 @@
  #include <sys/stat.h>
  #include <sys/mman.h>
@@ -27,12 +27,12 @@ diff -ruN librealsense-2.25.0/src/linux/backend-v4l2.h librealsense-2.25.0-patch
 +#include "video.h"
 +#include "uvcvideo.h"
 +#include "videodev2.h"
- #include <fts.h>
  #include <regex>
  #include <list>
-diff -ruN librealsense-2.25.0/src/linux/uvcvideo.h librealsense-2.25.0-patch/src/linux/uvcvideo.h
---- librealsense-2.25.0/src/linux/uvcvideo.h	1970-01-01 09:00:00.000000000 +0900
-+++ librealsense-2.25.0-patch/src/linux/uvcvideo.h	2019-08-08 14:53:25.000000000 +0900
+
+diff -ruN librealsense-2.38.1/src/linux/uvcvideo.h librealsense-2.38.1-patch/src/linux/uvcvideo.h
+--- librealsense-2.38.1/src/linux/uvcvideo.h	1970-01-01 09:00:00.000000000 +0900
++++ librealsense-2.38.1-patch/src/linux/uvcvideo.h	2019-08-08 14:53:25.000000000 +0900
 @@ -0,0 +1,99 @@
 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 +#ifndef __LINUX_UVCVIDEO_H_
@@ -133,9 +133,9 @@ diff -ruN librealsense-2.25.0/src/linux/uvcvideo.h librealsense-2.25.0-patch/src
 +} __attribute__((packed));
 +
 +#endif
-diff -ruN librealsense-2.25.0/src/linux/v4l2-common.h librealsense-2.25.0-patch/src/linux/v4l2-common.h
---- librealsense-2.25.0/src/linux/v4l2-common.h	1970-01-01 09:00:00.000000000 +0900
-+++ librealsense-2.25.0-patch/src/linux/v4l2-common.h	2019-08-08 14:53:25.000000000 +0900
+diff -ruN librealsense-2.38.1/src/linux/v4l2-common.h librealsense-2.38.1-patch/src/linux/v4l2-common.h
+--- librealsense-2.38.1/src/linux/v4l2-common.h	1970-01-01 09:00:00.000000000 +0900
++++ librealsense-2.38.1-patch/src/linux/v4l2-common.h	2019-08-08 14:53:25.000000000 +0900
 @@ -0,0 +1,108 @@
 +/* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */
 +/*
@@ -245,9 +245,9 @@ diff -ruN librealsense-2.25.0/src/linux/v4l2-common.h librealsense-2.25.0-patch/
 +#define V4L2_SUBDEV_SEL_FLAG_KEEP_CONFIG V4L2_SEL_FLAG_KEEP_CONFIG
 +
 +#endif /* __V4L2_COMMON__ */
-diff -ruN librealsense-2.25.0/src/linux/v4l2-controls.h librealsense-2.25.0-patch/src/linux/v4l2-controls.h
---- librealsense-2.25.0/src/linux/v4l2-controls.h	1970-01-01 09:00:00.000000000 +0900
-+++ librealsense-2.25.0-patch/src/linux/v4l2-controls.h	2019-08-08 14:53:25.000000000 +0900
+diff -ruN librealsense-2.38.1/src/linux/v4l2-controls.h librealsense-2.38.1-patch/src/linux/v4l2-controls.h
+--- librealsense-2.38.1/src/linux/v4l2-controls.h	1970-01-01 09:00:00.000000000 +0900
++++ librealsense-2.38.1-patch/src/linux/v4l2-controls.h	2019-08-08 14:53:25.000000000 +0900
 @@ -0,0 +1,1107 @@
 +/* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */
 +/*
@@ -1356,9 +1356,9 @@ diff -ruN librealsense-2.25.0/src/linux/v4l2-controls.h librealsense-2.25.0-patc
 +#define V4L2_CID_DETECT_MD_REGION_GRID		(V4L2_CID_DETECT_CLASS_BASE + 4)
 +
 +#endif
-diff -ruN librealsense-2.25.0/src/linux/videodev2.h librealsense-2.25.0-patch/src/linux/videodev2.h
---- librealsense-2.25.0/src/linux/videodev2.h	1970-01-01 09:00:00.000000000 +0900
-+++ librealsense-2.25.0-patch/src/linux/videodev2.h	2019-09-19 13:35:44.641220634 +0900
+diff -ruN librealsense-2.38.1/src/linux/videodev2.h librealsense-2.38.1-patch/src/linux/videodev2.h
+--- librealsense-2.38.1/src/linux/videodev2.h	1970-01-01 09:00:00.000000000 +0900
++++ librealsense-2.38.1-patch/src/linux/videodev2.h	2019-09-19 13:35:44.641220634 +0900
 @@ -0,0 +1,2501 @@
 +/* SPDX-License-Identifier: ((GPL-2.0+ WITH Linux-syscall-note) OR BSD-3-Clause) */
 +/*
@@ -3861,9 +3861,9 @@ diff -ruN librealsense-2.25.0/src/linux/videodev2.h librealsense-2.25.0-patch/sr
 +#define BASE_VIDIOC_PRIVATE	192		/* 192-255 are private */
 +
 +#endif /* __LINUX_VIDEODEV2_H */
-diff -ruN librealsense-2.25.0/src/linux/video.h librealsense-2.25.0-patch/src/linux/video.h
---- librealsense-2.25.0/src/linux/video.h	1970-01-01 09:00:00.000000000 +0900
-+++ librealsense-2.25.0-patch/src/linux/video.h	2019-08-08 14:53:16.000000000 +0900
+diff -ruN librealsense-2.38.1/src/linux/video.h librealsense-2.38.1-patch/src/linux/video.h
+--- librealsense-2.38.1/src/linux/video.h	1970-01-01 09:00:00.000000000 +0900
++++ librealsense-2.38.1-patch/src/linux/video.h	2019-08-08 14:53:16.000000000 +0900
 @@ -0,0 +1,570 @@
 +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
 +/*

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.29.0-${project.parent.version}</version>
+  <version>2.38.1-${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.29.0-${project.parent.version}</version>
+  <version>2.38.1-${project.parent.version}</version>
   <name>JavaCPP Presets for librealsense2</name>
 
   <dependencies>

diff --git a/librealsense2/samples/pom.xml b/librealsense2/samples/pom.xml
@@ -2,15 +2,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco.librealsense2</groupId>
     <artifactId>rsdistance</artifactId>
-    <version>1.5.4</version>
+    <version>1.5.5-SNAPSHOT</version>
     <properties>
         <exec.mainClass>RsDistance</exec.mainClass>
     </properties>
     <dependencies>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>librealsense2-platform</artifactId>
-            <version>2.29.0-1.5.4</version>
+            <version>2.38.1-1.5.5-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.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.5-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.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.5-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.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.5-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.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.5-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.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.5-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.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.5-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.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.5-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.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.5-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.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.5-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.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.5-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.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.5-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.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.5-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.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.5.5-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.librealsense2;