diff --git a/.github/workflows/librealsense2.yml b/.github/workflows/librealsense2.yml index a456dad297f..208b6225a68 100644 --- a/.github/workflows/librealsense2.yml +++ b/.github/workflows/librealsense2.yml @@ -41,6 +41,10 @@ jobs: runs-on: macos-11 steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions + macosx-arm64: + runs-on: macos-11 + steps: + - uses: bytedeco/javacpp-presets/.github/actions/deploy-macosx@actions windows-x86: runs-on: windows-2019 steps: @@ -50,7 +54,7 @@ jobs: steps: - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions redeploy: - needs: [linux-armhf, linux-arm64, linux-x86, linux-x86_64, macosx-x86_64, windows-x86, windows-x86_64] + needs: [linux-armhf, linux-arm64, linux-x86, linux-x86_64, macosx-x86_64, macosx-arm64, windows-x86, windows-x86_64] runs-on: ubuntu-20.04 steps: - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions diff --git a/librealsense2/cppbuild.sh b/librealsense2/cppbuild.sh index c29a8d587c4..f30faa79150 100755 --- a/librealsense2/cppbuild.sh +++ b/librealsense2/cppbuild.sh @@ -8,7 +8,7 @@ if [[ -z "$PLATFORM" ]]; then fi LIBREALSENSE2_VERSION=2.50.0 -LIBUSB_VERSION=1.0.22 +LIBUSB_VERSION=1.0.26 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 @@ -71,6 +71,12 @@ case $PLATFORM in 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 ;; + macosx-arm64) + "$CMAKE" -DCMAKE_OSX_ARCHITECTURES="arm64" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$INSTALL_PATH" -DCMAKE_MACOSX_RPATH=ON -DBUILD_UNIT_TESTS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_GRAPHICAL_EXAMPLES=OFF -DCMAKE_THREAD_LIBS_INIT="-lpthread" -DBUILD_WITH_OPENMP=false -DHWM_OVER_XU=false . + 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 + ;; windows-x86) mkdir -p build cd build diff --git a/librealsense2/platform/pom.xml b/librealsense2/platform/pom.xml index 0d1af5543ac..04ac77c40c9 100644 --- a/librealsense2/platform/pom.xml +++ b/librealsense2/platform/pom.xml @@ -60,6 +60,12 @@ ${project.version} ${javacpp.platform.macosx-x86_64} + + ${project.groupId} + ${javacpp.moduleId} + ${project.version} + ${javacpp.platform.macosx-arm64} + ${project.groupId} ${javacpp.moduleId} @@ -134,6 +140,7 @@ requires static org.bytedeco.${javacpp.moduleId}.linux.x86; requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64; requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64; + requires static org.bytedeco.${javacpp.moduleId}.macosx.arm64; requires static org.bytedeco.${javacpp.moduleId}.windows.x86; requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64; } diff --git a/librealsense2/src/main/java/org/bytedeco/librealsense2/presets/realsense2.java b/librealsense2/src/main/java/org/bytedeco/librealsense2/presets/realsense2.java index 94b9ff8c279..4a7955a3688 100644 --- a/librealsense2/src/main/java/org/bytedeco/librealsense2/presets/realsense2.java +++ b/librealsense2/src/main/java/org/bytedeco/librealsense2/presets/realsense2.java @@ -38,7 +38,7 @@ inherit = javacpp.class, value = { @Platform( - value = {"linux-armhf", "linux-arm64", "linux-x86", "macosx-x86", "windows-x86"}, + value = {"linux-armhf", "linux-arm64", "linux-x86", "macosx-x86", "macosx-arm64", "windows-x86"}, compiler = "cpp11", include = { "librealsense2/h/rs_types.h", diff --git a/pom.xml b/pom.xml index df007b07545..2f209e9a4c8 100644 --- a/pom.xml +++ b/pom.xml @@ -1453,6 +1453,7 @@ libffi libpostal leptonica + librealsense2 tesseract