Merge pull request #1 from ICH88/librealsense2-arm64

added arm64 support
ICH88 · Sep 24, 2020 · 46ad02a · 46ad02a
2 parents e531c37 + 3d3b285
commit 46ad02a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/librealsense2/cppbuild.sh b/librealsense2/cppbuild.sh
@@ -35,6 +35,16 @@ case $PLATFORM in
         make -j $MAKEJ
         make install/strip
         ;;
+    linux-arm64)
+        cd ../libusb-$LIBUSB_VERSION
+        CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++-8 CFLAGS="-march=armv8-a -mcpu=cortex-a57" CXXFLAGS="-march=armv8-a -mcpu=cortex-a57" CPPFLAGS="-march=armv8-a -mcpu=cortex-a57" ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=aarch64-linux-gnu --disable-udev
+		make -j $MAKEJ
+        make install
+        cd ../librealsense-$LIBREALSENSE2_VERSION
+		CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++-8 "$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 .
+        make -j $MAKEJ
+        make install/strip
+        ;;
     linux-x86)
         cd ../libusb-$LIBUSB_VERSION
         CC="gcc -m32" CXX="g++ -m32" ./configure --prefix=$INSTALL_PATH --disable-shared --with-pic --host=i686-linux --disable-udev

diff --git a/librealsense2/platform/pom.xml b/librealsense2/platform/pom.xml
@@ -40,13 +40,19 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>${javacpp.moduleId}</artifactId>
       <version>${project.version}</version>
-      <classifier>${javacpp.platform.linux-x86_64}</classifier>
+      <classifier>${javacpp.platform.linux-armhf}</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>${javacpp.moduleId}</artifactId>
       <version>${project.version}</version>
-      <classifier>${javacpp.platform.linux-armhf}</classifier>
+      <classifier>${javacpp.platform.linux-arm64}</classifier>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>${javacpp.moduleId}</artifactId>
+      <version>${project.version}</version>
+      <classifier>${javacpp.platform.linux-x86_64}</classifier>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
@@ -78,7 +84,7 @@
             <configuration>
               <archive>
                 <manifestEntries>
-                  <Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-linux-armhf.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86.jar ${javacpp.moduleId}-windows-x86_64.jar</Class-Path>
+                  <Class-Path>${javacpp.moduleId}.jar ${javacpp.moduleId}-linux-armhf.jar ${javacpp.moduleId}-linux-arm64.jar ${javacpp.moduleId}-linux-x86.jar ${javacpp.moduleId}-linux-x86_64.jar ${javacpp.moduleId}-macosx-x86_64.jar ${javacpp.moduleId}-windows-x86.jar ${javacpp.moduleId}-windows-x86_64.jar</Class-Path>
                 </manifestEntries>
               </archive>
             </configuration>
@@ -125,10 +131,11 @@
                     module org.bytedeco.${javacpp.moduleId}.platform {
                       requires static org.bytedeco.${javacpp.moduleId}.linux.x86;
                       requires static org.bytedeco.${javacpp.moduleId}.linux.x86_64;
-                      requires static org.bytedeco.${javacpp.moduleId}.linux.armhf;
                       requires static org.bytedeco.${javacpp.moduleId}.macosx.x86_64;
                       requires static org.bytedeco.${javacpp.moduleId}.windows.x86;
                       requires static org.bytedeco.${javacpp.moduleId}.windows.x86_64;
+					  requires static org.bytedeco.${javacpp.moduleId}.linux.armhf;
+					  requires static org.bytedeco.${javacpp.moduleId}.linux.arm64;
                     }
                   </moduleInfoSource>
                 </module>

diff --git 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-x86", "macosx-x86", "windows-x86", "linux-armhf"},
+            value = {"linux-x86", "macosx-x86", "windows-x86", "linux-armhf", "linux-arm64"},
             compiler = "cpp11",
             include = {
                 "librealsense2/h/rs_types.h",

diff --git a/pom.xml b/pom.xml
@@ -1127,6 +1127,7 @@
         </property>
       </activation>
       <modules>
+		<module>librealsense2</module>
         <module>opencv</module>
         <module>ffmpeg</module>
         <module>flycapture</module>