Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade librealsense2 to 2.44.0 #1031

Merged
merged 4 commits into from
Apr 14, 2021
Merged

Upgrade librealsense2 to 2.44.0 #1031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af76610
upgrade librealsense2 to 2.44.0
n-kai-cj Apr 10, 2021
31a5072
update README files
n-kai-cj Apr 11, 2021
e94fcb6
Merge remote-tracking branch 'upstream/master' into librealsense2_2.44.0
saudet Apr 14, 2021
6e55674
Update CHANGELOG.md and fix versions
saudet Apr 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions librealsense2/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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>
Expand Down
12 changes: 6 additions & 6 deletions librealsense2/cppbuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
;;
Expand All @@ -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
;;
Expand All @@ -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
;;
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion librealsense2/platform/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion librealsense2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions librealsense2/samples/display/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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 -->
Expand Down
4 changes: 2 additions & 2 deletions librealsense2/samples/distance/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion librealsense2/src/gen/java/org/bytedeco/librealsense2/STAEControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion librealsense2/src/gen/java/org/bytedeco/librealsense2/STAFactor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion librealsense2/src/gen/java/org/bytedeco/librealsense2/STCensusRadius.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion librealsense2/src/gen/java/org/bytedeco/librealsense2/STColorControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion librealsense2/src/gen/java/org/bytedeco/librealsense2/STColorCorrection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion librealsense2/src/gen/java/org/bytedeco/librealsense2/STDepthControlGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion librealsense2/src/gen/java/org/bytedeco/librealsense2/STDepthTableControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion librealsense2/src/gen/java/org/bytedeco/librealsense2/STHdad.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion librealsense2/src/gen/java/org/bytedeco/librealsense2/STRauColorThresholdsControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion librealsense2/src/gen/java/org/bytedeco/librealsense2/STRauSupportVectorControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion librealsense2/src/gen/java/org/bytedeco/librealsense2/STRsm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion librealsense2/src/gen/java/org/bytedeco/librealsense2/STSloColorThresholdsControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
2 changes: 1 addition & 1 deletion librealsense2/src/gen/java/org/bytedeco/librealsense2/STSloPenaltyControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Loading