From 947325b9da1e79cde5977396226293d5d242b3e1 Mon Sep 17 00:00:00 2001
From: ixgbe00 <yangwang@iscas.ac.cn>
Date: Thu, 10 Oct 2024 17:02:53 +0800
Subject: [PATCH 1/7] Support for riscv64

---
 platform/pom.xml                              | 95 ++++++++++++++++++-
 src/it/osgi/pom.xml                           |  9 ++
 .../properties/linux-riscv64.properties       | 31 ++++++
 3 files changed, 134 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/org/bytedeco/javacpp/properties/linux-riscv64.properties

diff --git a/platform/pom.xml b/platform/pom.xml
index f7edbe7b3..c8d907bc3 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -66,6 +66,7 @@
     <javacpp.platform.ios-x86_64>ios-x86_64${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
     <javacpp.platform.linux-armhf>linux-armhf${javacpp.platform.extension}</javacpp.platform.linux-armhf>
     <javacpp.platform.linux-arm64>linux-arm64${javacpp.platform.extension}</javacpp.platform.linux-arm64>
+	<javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
     <javacpp.platform.linux-ppc64le>linux-ppc64le${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
     <javacpp.platform.linux-x86>linux-x86${javacpp.platform.extension}</javacpp.platform.linux-x86>
     <javacpp.platform.linux-x86_64>linux-x86_64${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
@@ -128,6 +129,12 @@
       <artifactId>javacpp</artifactId>
       <version>${project.version}</version>
       <classifier>${javacpp.platform.linux-arm64}</classifier>
+    </dependency>
+	<dependency>
+      <groupId>org.bytedeco</groupId>
+      <artifactId>javacpp</artifactId>
+      <version>${project.version}</version>
+      <classifier>${javacpp.platform.linux-riscv64}</classifier>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -240,7 +247,7 @@
             <configuration>
               <archive>
                 <manifestEntries>
-                  <Class-Path>javacpp.jar javacpp-linux-armhf.jar javacpp-linux-arm64.jar javacpp-linux-ppc64le.jar javacpp-linux-x86.jar javacpp-linux-x86_64.jar javacpp-macosx-arm64.jar javacpp-macosx-x86_64.jar javacpp-windows-x86.jar javacpp-windows-x86_64.jar</Class-Path>
+                  <Class-Path>javacpp.jar javacpp-linux-armhf.jar javacpp-linux-arm64.jar javacpp-linux-riscv64.jar javacpp-linux-ppc64le.jar javacpp-linux-x86.jar javacpp-linux-x86_64.jar javacpp-macosx-arm64.jar javacpp-macosx-x86_64.jar javacpp-windows-x86.jar javacpp-windows-x86_64.jar</Class-Path>
                 </manifestEntries>
               </archive>
             </configuration>
@@ -300,6 +307,7 @@
                       requires static org.bytedeco.javacpp.ios.x86_64;
                       requires static org.bytedeco.javacpp.linux.armhf;
                       requires static org.bytedeco.javacpp.linux.arm64;
+					  requires static org.bytedeco.javacpp.linux.riscv64;
                       requires static org.bytedeco.javacpp.linux.ppc64le;
                       requires static org.bytedeco.javacpp.linux.x86;
                       requires static org.bytedeco.javacpp.linux.x86_64;
@@ -424,6 +432,7 @@
         <javacpp.platform.ios-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
@@ -453,6 +462,7 @@
         <javacpp.platform.ios-x86_64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
@@ -482,6 +492,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -511,6 +522,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -541,6 +553,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -570,6 +583,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -599,6 +613,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -628,6 +643,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -657,6 +673,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -686,6 +703,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -715,6 +733,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -744,6 +763,7 @@
         <javacpp.platform.ios-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -773,6 +793,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -802,6 +823,37 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
+        <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
+        <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
+        <javacpp.platform.macosx-x86_64></javacpp.platform.macosx-x86_64>
+        <javacpp.platform.windows-x86></javacpp.platform.windows-x86>
+        <javacpp.platform.windows-x86_64></javacpp.platform.windows-x86_64>
+      </properties>
+    </profile>
+	
+    <profile>
+      <id>javacpp-platform-linux-riscv64</id>
+      <activation>
+        <property>
+          <name>javacpp.platform</name>
+          <value>linux-riscv64</value>
+        </property>
+      </activation>
+      <properties>
+        <javacpp.platform.android-arm></javacpp.platform.android-arm>
+        <javacpp.platform.android-arm64></javacpp.platform.android-arm64>
+        <javacpp.platform.android-x86></javacpp.platform.android-x86>
+        <javacpp.platform.android-x86_64></javacpp.platform.android-x86_64>
+        <javacpp.platform.ios-arm></javacpp.platform.ios-arm>
+        <javacpp.platform.ios-arm64></javacpp.platform.ios-arm64>
+        <javacpp.platform.ios-x86></javacpp.platform.ios-x86>
+        <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
+        <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
+		<javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+        <javacpp.platform.linux-riscv64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -831,6 +883,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -860,6 +913,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -889,6 +943,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
@@ -918,6 +973,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -947,6 +1003,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -976,6 +1033,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -1005,6 +1063,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -1136,6 +1195,18 @@
         <javacpp.platform.linux-arm64>linux-arm64${javacpp.platform.extension}</javacpp.platform.linux-arm64>
       </properties>
     </profile>
+	
+    <profile>
+      <id>javacpp.platform.linux-riscv64-true</id>
+      <activation>
+        <property>
+          <name>javacpp.platform.linux-riscv64</name>
+        </property>
+      </activation>
+      <properties>
+        <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
+      </properties>
+    </profile>
 
     <profile>
       <id>javacpp.platform.linux-ppc64le-true</id>
@@ -1285,6 +1356,19 @@
         <javacpp.platform.linux-arm64>linux-arm64${javacpp.platform.extension}</javacpp.platform.linux-arm64>
       </properties>
     </profile>
+	
+    <profile>
+      <id>javacpp.platform.custom-linux-riscv64</id>
+      <activation>
+        <property>
+          <name>javacpp.platform.host</name>
+        </property>
+        <os><name>linux</name><arch>riscv64</arch></os>
+      </activation>
+      <properties>
+        <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
+      </properties>
+    </profile>
 
     <profile>
       <id>javacpp.platform.custom-linux-ppc64le</id>
@@ -1504,6 +1588,15 @@
         <os.arch>arm64</os.arch>
       </properties>
     </profile>
+    <profile>
+      <id>riscv64</id>
+      <activation>
+        <os><arch>riscv64</arch></os>
+      </activation>
+      <properties>
+        <os.arch>riscv64</os.arch>
+      </properties>
+    </profile>
     <profile>
       <id>armv8</id>
       <activation>
diff --git a/src/it/osgi/pom.xml b/src/it/osgi/pom.xml
index a13f924de..cdf052bca 100644
--- a/src/it/osgi/pom.xml
+++ b/src/it/osgi/pom.xml
@@ -73,6 +73,15 @@
         <os.arch>arm64</os.arch>
       </properties>
     </profile>
+    <profile>
+      <id>riscv64</id>
+      <activation>
+        <os><arch>riscv64</arch></os>
+      </activation>
+      <properties>
+        <os.arch>riscv64</os.arch>
+      </properties>
+    </profile>
     <profile>
       <id>armv8</id>
       <activation>
diff --git a/src/main/resources/org/bytedeco/javacpp/properties/linux-riscv64.properties b/src/main/resources/org/bytedeco/javacpp/properties/linux-riscv64.properties
new file mode 100644
index 000000000..b5f84bb36
--- /dev/null
+++ b/src/main/resources/org/bytedeco/javacpp/properties/linux-riscv64.properties
@@ -0,0 +1,31 @@
+platform=linux-riscv64
+platform.path.separator=:
+platform.source.suffix=.cpp
+platform.includepath.prefix=-I
+platform.includepath=
+platform.compiler=g++
+platform.compiler.cpp98=-std=c++98
+platform.compiler.cpp03=-std=c++03
+platform.compiler.cpp11=-std=c++11
+platform.compiler.cpp14=-std=c++14
+platform.compiler.cpp17=-std=c++17
+platform.compiler.debug=-O0 -g
+platform.compiler.default=-O3 -s
+platform.compiler.fastfpu=-ffast-math
+platform.compiler.nodeprecated=-Wno-deprecated-declarations
+platform.compiler.noexceptions=-fno-exceptions -fno-rtti
+platform.compiler.nowarnings=-w
+platform.compiler.output=-Wl,-rpath,$ORIGIN/ -Wl,-z,noexecstack -Wl,-Bsymbolic -Wall -fPIC -pthread -shared -o\u0020
+platform.linkpath.prefix=-L
+platform.linkpath.prefix2=-Wl,-rpath,
+platform.linkpath=
+platform.link.prefix=-l
+platform.link.suffix=
+platform.link=
+platform.framework.prefix=-F
+platform.framework.suffix=
+platform.framework=
+platform.executable.prefix=
+platform.executable.suffix=
+platform.library.prefix=lib
+platform.library.suffix=.so

From 5c95c85b2e7457d77e7985aa1a5d88e7a6f5efcf Mon Sep 17 00:00:00 2001
From: ixgbe00 <yangwang@iscas.ac.cn>
Date: Thu, 10 Oct 2024 17:02:53 +0800
Subject: [PATCH 2/7] Support for riscv64

---
 platform/pom.xml                              | 95 ++++++++++++++++++-
 src/it/osgi/pom.xml                           |  9 ++
 .../properties/linux-riscv64.properties       | 31 ++++++
 3 files changed, 134 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/org/bytedeco/javacpp/properties/linux-riscv64.properties

diff --git a/platform/pom.xml b/platform/pom.xml
index f7edbe7b3..c8d907bc3 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -66,6 +66,7 @@
     <javacpp.platform.ios-x86_64>ios-x86_64${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
     <javacpp.platform.linux-armhf>linux-armhf${javacpp.platform.extension}</javacpp.platform.linux-armhf>
     <javacpp.platform.linux-arm64>linux-arm64${javacpp.platform.extension}</javacpp.platform.linux-arm64>
+	<javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
     <javacpp.platform.linux-ppc64le>linux-ppc64le${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
     <javacpp.platform.linux-x86>linux-x86${javacpp.platform.extension}</javacpp.platform.linux-x86>
     <javacpp.platform.linux-x86_64>linux-x86_64${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
@@ -128,6 +129,12 @@
       <artifactId>javacpp</artifactId>
       <version>${project.version}</version>
       <classifier>${javacpp.platform.linux-arm64}</classifier>
+    </dependency>
+	<dependency>
+      <groupId>org.bytedeco</groupId>
+      <artifactId>javacpp</artifactId>
+      <version>${project.version}</version>
+      <classifier>${javacpp.platform.linux-riscv64}</classifier>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -240,7 +247,7 @@
             <configuration>
               <archive>
                 <manifestEntries>
-                  <Class-Path>javacpp.jar javacpp-linux-armhf.jar javacpp-linux-arm64.jar javacpp-linux-ppc64le.jar javacpp-linux-x86.jar javacpp-linux-x86_64.jar javacpp-macosx-arm64.jar javacpp-macosx-x86_64.jar javacpp-windows-x86.jar javacpp-windows-x86_64.jar</Class-Path>
+                  <Class-Path>javacpp.jar javacpp-linux-armhf.jar javacpp-linux-arm64.jar javacpp-linux-riscv64.jar javacpp-linux-ppc64le.jar javacpp-linux-x86.jar javacpp-linux-x86_64.jar javacpp-macosx-arm64.jar javacpp-macosx-x86_64.jar javacpp-windows-x86.jar javacpp-windows-x86_64.jar</Class-Path>
                 </manifestEntries>
               </archive>
             </configuration>
@@ -300,6 +307,7 @@
                       requires static org.bytedeco.javacpp.ios.x86_64;
                       requires static org.bytedeco.javacpp.linux.armhf;
                       requires static org.bytedeco.javacpp.linux.arm64;
+					  requires static org.bytedeco.javacpp.linux.riscv64;
                       requires static org.bytedeco.javacpp.linux.ppc64le;
                       requires static org.bytedeco.javacpp.linux.x86;
                       requires static org.bytedeco.javacpp.linux.x86_64;
@@ -424,6 +432,7 @@
         <javacpp.platform.ios-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
@@ -453,6 +462,7 @@
         <javacpp.platform.ios-x86_64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
@@ -482,6 +492,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -511,6 +522,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -541,6 +553,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -570,6 +583,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -599,6 +613,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -628,6 +643,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -657,6 +673,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -686,6 +703,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -715,6 +733,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -744,6 +763,7 @@
         <javacpp.platform.ios-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -773,6 +793,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -802,6 +823,37 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
+        <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
+        <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
+        <javacpp.platform.macosx-x86_64></javacpp.platform.macosx-x86_64>
+        <javacpp.platform.windows-x86></javacpp.platform.windows-x86>
+        <javacpp.platform.windows-x86_64></javacpp.platform.windows-x86_64>
+      </properties>
+    </profile>
+	
+    <profile>
+      <id>javacpp-platform-linux-riscv64</id>
+      <activation>
+        <property>
+          <name>javacpp.platform</name>
+          <value>linux-riscv64</value>
+        </property>
+      </activation>
+      <properties>
+        <javacpp.platform.android-arm></javacpp.platform.android-arm>
+        <javacpp.platform.android-arm64></javacpp.platform.android-arm64>
+        <javacpp.platform.android-x86></javacpp.platform.android-x86>
+        <javacpp.platform.android-x86_64></javacpp.platform.android-x86_64>
+        <javacpp.platform.ios-arm></javacpp.platform.ios-arm>
+        <javacpp.platform.ios-arm64></javacpp.platform.ios-arm64>
+        <javacpp.platform.ios-x86></javacpp.platform.ios-x86>
+        <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
+        <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
+		<javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+        <javacpp.platform.linux-riscv64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -831,6 +883,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -860,6 +913,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -889,6 +943,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
@@ -918,6 +973,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -947,6 +1003,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -976,6 +1033,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -1005,6 +1063,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -1136,6 +1195,18 @@
         <javacpp.platform.linux-arm64>linux-arm64${javacpp.platform.extension}</javacpp.platform.linux-arm64>
       </properties>
     </profile>
+	
+    <profile>
+      <id>javacpp.platform.linux-riscv64-true</id>
+      <activation>
+        <property>
+          <name>javacpp.platform.linux-riscv64</name>
+        </property>
+      </activation>
+      <properties>
+        <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
+      </properties>
+    </profile>
 
     <profile>
       <id>javacpp.platform.linux-ppc64le-true</id>
@@ -1285,6 +1356,19 @@
         <javacpp.platform.linux-arm64>linux-arm64${javacpp.platform.extension}</javacpp.platform.linux-arm64>
       </properties>
     </profile>
+	
+    <profile>
+      <id>javacpp.platform.custom-linux-riscv64</id>
+      <activation>
+        <property>
+          <name>javacpp.platform.host</name>
+        </property>
+        <os><name>linux</name><arch>riscv64</arch></os>
+      </activation>
+      <properties>
+        <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
+      </properties>
+    </profile>
 
     <profile>
       <id>javacpp.platform.custom-linux-ppc64le</id>
@@ -1504,6 +1588,15 @@
         <os.arch>arm64</os.arch>
       </properties>
     </profile>
+    <profile>
+      <id>riscv64</id>
+      <activation>
+        <os><arch>riscv64</arch></os>
+      </activation>
+      <properties>
+        <os.arch>riscv64</os.arch>
+      </properties>
+    </profile>
     <profile>
       <id>armv8</id>
       <activation>
diff --git a/src/it/osgi/pom.xml b/src/it/osgi/pom.xml
index a13f924de..cdf052bca 100644
--- a/src/it/osgi/pom.xml
+++ b/src/it/osgi/pom.xml
@@ -73,6 +73,15 @@
         <os.arch>arm64</os.arch>
       </properties>
     </profile>
+    <profile>
+      <id>riscv64</id>
+      <activation>
+        <os><arch>riscv64</arch></os>
+      </activation>
+      <properties>
+        <os.arch>riscv64</os.arch>
+      </properties>
+    </profile>
     <profile>
       <id>armv8</id>
       <activation>
diff --git a/src/main/resources/org/bytedeco/javacpp/properties/linux-riscv64.properties b/src/main/resources/org/bytedeco/javacpp/properties/linux-riscv64.properties
new file mode 100644
index 000000000..b5f84bb36
--- /dev/null
+++ b/src/main/resources/org/bytedeco/javacpp/properties/linux-riscv64.properties
@@ -0,0 +1,31 @@
+platform=linux-riscv64
+platform.path.separator=:
+platform.source.suffix=.cpp
+platform.includepath.prefix=-I
+platform.includepath=
+platform.compiler=g++
+platform.compiler.cpp98=-std=c++98
+platform.compiler.cpp03=-std=c++03
+platform.compiler.cpp11=-std=c++11
+platform.compiler.cpp14=-std=c++14
+platform.compiler.cpp17=-std=c++17
+platform.compiler.debug=-O0 -g
+platform.compiler.default=-O3 -s
+platform.compiler.fastfpu=-ffast-math
+platform.compiler.nodeprecated=-Wno-deprecated-declarations
+platform.compiler.noexceptions=-fno-exceptions -fno-rtti
+platform.compiler.nowarnings=-w
+platform.compiler.output=-Wl,-rpath,$ORIGIN/ -Wl,-z,noexecstack -Wl,-Bsymbolic -Wall -fPIC -pthread -shared -o\u0020
+platform.linkpath.prefix=-L
+platform.linkpath.prefix2=-Wl,-rpath,
+platform.linkpath=
+platform.link.prefix=-l
+platform.link.suffix=
+platform.link=
+platform.framework.prefix=-F
+platform.framework.suffix=
+platform.framework=
+platform.executable.prefix=
+platform.executable.suffix=
+platform.library.prefix=lib
+platform.library.suffix=.so

From 4eee963d96a1501c587840d3305a84545822fbed Mon Sep 17 00:00:00 2001
From: ixgbe00 <yangwang@iscas.ac.cn>
Date: Thu, 10 Oct 2024 20:35:10 +0800
Subject: [PATCH 3/7] Update the workflow and the GitHub Actions scripts to
 support riscv64

---
 .github/workflows/javacpp.yml |  6 +++++-
 .travis.yml                   | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/javacpp.yml b/.github/workflows/javacpp.yml
index c6456f0d2..b2f35ab23 100644
--- a/.github/workflows/javacpp.yml
+++ b/.github/workflows/javacpp.yml
@@ -41,6 +41,10 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
+  linux-riscv64:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
   linux-ppc64le:
     runs-on: ubuntu-20.04
     steps:
@@ -77,7 +81,7 @@ jobs:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
   redeploy:
 #    needs: [android-arm, android-arm64, android-x86, android-x86_64, ios-arm64, ios-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64]
-    needs: [android-arm64, android-x86_64, ios-arm64, ios-x86_64, linux-arm64, linux-ppc64le, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64]
+    needs: [android-arm64, android-x86_64, ios-arm64, ios-x86_64, linux-arm64, linux-riscv64, linux-ppc64le, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64]
     runs-on: ubuntu-20.04
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
diff --git a/.travis.yml b/.travis.yml
index 27568822c..4dd2c9a3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,6 +57,17 @@ jobs:
         - export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-ppc64el"
       script:
         - mvn clean $MAVEN_PHASE -B -V -U -s $HOME/settings.xml -Djavacpp.platform=linux-ppc64le
+    - os: linux
+      arch: riscv64
+      language: java
+      addons:
+        apt:
+          packages: openjdk-8-jdk-headless maven
+      env: PLATFORMS="linux-riscv64"
+      install:
+        - export JAVA_HOME="/usr/lib/jvm/java-8-openjdk-riscv64"
+      script:
+        - mvn clean $MAVEN_PHASE -B -V -U -s $HOME/settings.xml -Djavacpp.platform=linux-riscv64
     - os: linux
       arch: amd64
       language: java

From 5896a47c959506964ab9050bcef7001a61eb5142 Mon Sep 17 00:00:00 2001
From: ixgbe00 <yangwang@iscas.ac.cn>
Date: Sun, 13 Oct 2024 16:06:06 +0800
Subject: [PATCH 4/7] Add the compiler for linux-riscv64

---
 .../org/bytedeco/javacpp/properties/linux-riscv64.properties    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/org/bytedeco/javacpp/properties/linux-riscv64.properties b/src/main/resources/org/bytedeco/javacpp/properties/linux-riscv64.properties
index b5f84bb36..37ed96211 100644
--- a/src/main/resources/org/bytedeco/javacpp/properties/linux-riscv64.properties
+++ b/src/main/resources/org/bytedeco/javacpp/properties/linux-riscv64.properties
@@ -10,7 +10,7 @@ platform.compiler.cpp11=-std=c++11
 platform.compiler.cpp14=-std=c++14
 platform.compiler.cpp17=-std=c++17
 platform.compiler.debug=-O0 -g
-platform.compiler.default=-O3 -s
+platform.compiler.default=-march=rv64gc -mabi=lp64d -O3 -s
 platform.compiler.fastfpu=-ffast-math
 platform.compiler.nodeprecated=-Wno-deprecated-declarations
 platform.compiler.noexceptions=-fno-exceptions -fno-rtti

From ea8868ad92779dade14883b9bf7e1409b9f40bbf Mon Sep 17 00:00:00 2001
From: ixgbe00 <yangwang@iscas.ac.cn>
Date: Sun, 13 Oct 2024 21:01:55 +0800
Subject: [PATCH 5/7] fix the compiler name for riscv64

---
 .../org/bytedeco/javacpp/properties/linux-riscv64.properties    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/org/bytedeco/javacpp/properties/linux-riscv64.properties b/src/main/resources/org/bytedeco/javacpp/properties/linux-riscv64.properties
index 37ed96211..6e9096100 100644
--- a/src/main/resources/org/bytedeco/javacpp/properties/linux-riscv64.properties
+++ b/src/main/resources/org/bytedeco/javacpp/properties/linux-riscv64.properties
@@ -3,7 +3,7 @@ platform.path.separator=:
 platform.source.suffix=.cpp
 platform.includepath.prefix=-I
 platform.includepath=
-platform.compiler=g++
+platform.compiler=riscv64-linux-gnu-g++
 platform.compiler.cpp98=-std=c++98
 platform.compiler.cpp03=-std=c++03
 platform.compiler.cpp11=-std=c++11

From ba75848aff3f79897ed1f124d0451a8988e21bec Mon Sep 17 00:00:00 2001
From: ixgbe00 <yangwang@iscas.ac.cn>
Date: Fri, 22 Nov 2024 09:35:41 +0800
Subject: [PATCH 6/7] fix formatting

---
 platform/pom.xml | 56 ++++++++++++++++++++++++------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/platform/pom.xml b/platform/pom.xml
index be3fecd0d..fd1b5e7ae 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -66,7 +66,7 @@
     <javacpp.platform.ios-x86_64>ios-x86_64${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
     <javacpp.platform.linux-armhf>linux-armhf${javacpp.platform.extension}</javacpp.platform.linux-armhf>
     <javacpp.platform.linux-arm64>linux-arm64${javacpp.platform.extension}</javacpp.platform.linux-arm64>
-	<javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
+    <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
     <javacpp.platform.linux-ppc64le>linux-ppc64le${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
     <javacpp.platform.linux-x86>linux-x86${javacpp.platform.extension}</javacpp.platform.linux-x86>
     <javacpp.platform.linux-x86_64>linux-x86_64${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
@@ -130,7 +130,7 @@
       <version>${project.version}</version>
       <classifier>${javacpp.platform.linux-arm64}</classifier>
     </dependency>
-	<dependency>
+    <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>javacpp</artifactId>
       <version>${project.version}</version>
@@ -307,7 +307,7 @@
                       requires static org.bytedeco.javacpp.ios.x86_64;
                       requires static org.bytedeco.javacpp.linux.armhf;
                       requires static org.bytedeco.javacpp.linux.arm64;
-					  requires static org.bytedeco.javacpp.linux.riscv64;
+                      requires static org.bytedeco.javacpp.linux.riscv64;
                       requires static org.bytedeco.javacpp.linux.ppc64le;
                       requires static org.bytedeco.javacpp.linux.x86;
                       requires static org.bytedeco.javacpp.linux.x86_64;
@@ -432,7 +432,7 @@
         <javacpp.platform.ios-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
@@ -462,7 +462,7 @@
         <javacpp.platform.ios-x86_64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
@@ -492,7 +492,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -522,7 +522,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -553,7 +553,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -583,7 +583,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -613,7 +613,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -643,7 +643,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -673,7 +673,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -703,7 +703,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -733,7 +733,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -763,7 +763,7 @@
         <javacpp.platform.ios-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -793,7 +793,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -823,7 +823,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -833,7 +833,7 @@
         <javacpp.platform.windows-x86_64></javacpp.platform.windows-x86_64>
       </properties>
     </profile>
-	
+
     <profile>
       <id>javacpp-platform-linux-riscv64</id>
       <activation>
@@ -852,7 +852,7 @@
         <javacpp.platform.ios-x86></javacpp.platform.ios-x86>
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
-		<javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
+        <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
         <javacpp.platform.linux-riscv64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
@@ -883,7 +883,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -913,7 +913,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -943,7 +943,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
@@ -973,7 +973,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -1003,7 +1003,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -1033,7 +1033,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -1063,7 +1063,7 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-		<javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
@@ -1195,7 +1195,7 @@
         <javacpp.platform.linux-arm64>linux-arm64${javacpp.platform.extension}</javacpp.platform.linux-arm64>
       </properties>
     </profile>
-	
+
     <profile>
       <id>javacpp.platform.linux-riscv64-true</id>
       <activation>
@@ -1356,7 +1356,7 @@
         <javacpp.platform.linux-arm64>linux-arm64${javacpp.platform.extension}</javacpp.platform.linux-arm64>
       </properties>
     </profile>
-	
+
     <profile>
       <id>javacpp.platform.custom-linux-riscv64</id>
       <activation>

From 804546b75c8a6ceebad2173a7464b0c09a290de8 Mon Sep 17 00:00:00 2001
From: Samuel Audet <samuel.audet@gmail.com>
Date: Fri, 22 Nov 2024 21:48:37 +0900
Subject: [PATCH 7/7] Update CHANGELOG.md and fix nits

---
 .github/workflows/javacpp.yml |   6 +-
 CHANGELOG.md                  |   2 +
 platform/pom.xml              | 102 +++++++++++++++++-----------------
 src/it/osgi/pom.xml           |  12 ++--
 4 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/.github/workflows/javacpp.yml b/.github/workflows/javacpp.yml
index 95b40c3f5..b93fcb7da 100644
--- a/.github/workflows/javacpp.yml
+++ b/.github/workflows/javacpp.yml
@@ -41,11 +41,11 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
-  linux-riscv64:
+  linux-ppc64le:
     runs-on: ubuntu-22.04
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
-  linux-ppc64le:
+  linux-riscv64:
     runs-on: ubuntu-22.04
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-ubuntu@actions
@@ -81,7 +81,7 @@ jobs:
       - uses: bytedeco/javacpp-presets/.github/actions/deploy-windows@actions
   redeploy:
 #    needs: [android-arm, android-arm64, android-x86, android-x86_64, ios-arm64, ios-x86_64, linux-armhf, linux-arm64, linux-ppc64le, linux-x86, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86, windows-x86_64]
-    needs: [android-arm64, android-x86_64, ios-arm64, ios-x86_64, linux-arm64, linux-riscv64, linux-ppc64le, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64]
+    needs: [android-arm64, android-x86_64, ios-arm64, ios-x86_64, linux-arm64, linux-ppc64le, linux-riscv64, linux-x86_64, macosx-arm64, macosx-x86_64, windows-x86_64]
     runs-on: ubuntu-22.04
     steps:
       - uses: bytedeco/javacpp-presets/.github/actions/redeploy@actions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4682b28a..2ac493449 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,6 @@
 
+ * Add support for `linux-riscv64` with `linux-riscv64.properties` ([pull #781](https://github.com/bytedeco/javacpp/pull/781))
+
 ### November 16, 2024 version 1.5.11
  * Fix `Generator` flakiness caused by calls to `Class.getDeclaredMethods()` ([pull #784](https://github.com/bytedeco/javacpp/pull/784))
  * Add minimal mappings for `std::chrono` from C++11 ([pull #766](https://github.com/bytedeco/javacpp/pull/766))
diff --git a/platform/pom.xml b/platform/pom.xml
index fd1b5e7ae..a9d6224fb 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -66,8 +66,8 @@
     <javacpp.platform.ios-x86_64>ios-x86_64${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
     <javacpp.platform.linux-armhf>linux-armhf${javacpp.platform.extension}</javacpp.platform.linux-armhf>
     <javacpp.platform.linux-arm64>linux-arm64${javacpp.platform.extension}</javacpp.platform.linux-arm64>
-    <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
     <javacpp.platform.linux-ppc64le>linux-ppc64le${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
+    <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
     <javacpp.platform.linux-x86>linux-x86${javacpp.platform.extension}</javacpp.platform.linux-x86>
     <javacpp.platform.linux-x86_64>linux-x86_64${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
     <javacpp.platform.macosx-arm64>macosx-arm64${javacpp.platform.extension}</javacpp.platform.macosx-arm64>
@@ -134,13 +134,13 @@
       <groupId>org.bytedeco</groupId>
       <artifactId>javacpp</artifactId>
       <version>${project.version}</version>
-      <classifier>${javacpp.platform.linux-riscv64}</classifier>
+      <classifier>${javacpp.platform.linux-ppc64le}</classifier>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>javacpp</artifactId>
       <version>${project.version}</version>
-      <classifier>${javacpp.platform.linux-ppc64le}</classifier>
+      <classifier>${javacpp.platform.linux-riscv64}</classifier>
     </dependency>
 <!--    <dependency>-->
 <!--      <groupId>org.bytedeco</groupId>-->
@@ -247,7 +247,7 @@
             <configuration>
               <archive>
                 <manifestEntries>
-                  <Class-Path>javacpp.jar javacpp-linux-armhf.jar javacpp-linux-arm64.jar javacpp-linux-riscv64.jar javacpp-linux-ppc64le.jar javacpp-linux-x86.jar javacpp-linux-x86_64.jar javacpp-macosx-arm64.jar javacpp-macosx-x86_64.jar javacpp-windows-x86.jar javacpp-windows-x86_64.jar</Class-Path>
+                  <Class-Path>javacpp.jar javacpp-linux-armhf.jar javacpp-linux-arm64.jar javacpp-linux-ppc64le.jar javacpp-linux-riscv64.jar javacpp-linux-x86.jar javacpp-linux-x86_64.jar javacpp-macosx-arm64.jar javacpp-macosx-x86_64.jar javacpp-windows-x86.jar javacpp-windows-x86_64.jar</Class-Path>
                 </manifestEntries>
               </archive>
             </configuration>
@@ -307,8 +307,8 @@
                       requires static org.bytedeco.javacpp.ios.x86_64;
                       requires static org.bytedeco.javacpp.linux.armhf;
                       requires static org.bytedeco.javacpp.linux.arm64;
-                      requires static org.bytedeco.javacpp.linux.riscv64;
                       requires static org.bytedeco.javacpp.linux.ppc64le;
+                      requires static org.bytedeco.javacpp.linux.riscv64;
                       requires static org.bytedeco.javacpp.linux.x86;
                       requires static org.bytedeco.javacpp.linux.x86_64;
                       requires static org.bytedeco.javacpp.macosx.arm64;
@@ -432,8 +432,8 @@
         <javacpp.platform.ios-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.macosx-arm64>
@@ -462,8 +462,8 @@
         <javacpp.platform.ios-x86_64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64>${os.name}-${os.arch}${javacpp.platform.extension}</javacpp.platform.macosx-arm64>
@@ -492,8 +492,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -522,8 +522,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -553,8 +553,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -583,8 +583,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -613,8 +613,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -643,8 +643,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -673,8 +673,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -703,8 +703,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -733,8 +733,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -763,8 +763,8 @@
         <javacpp.platform.ios-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -793,8 +793,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -823,8 +823,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -835,11 +835,11 @@
     </profile>
 
     <profile>
-      <id>javacpp-platform-linux-riscv64</id>
+      <id>javacpp-platform-linux-ppc64le</id>
       <activation>
         <property>
           <name>javacpp.platform</name>
-          <value>linux-riscv64</value>
+          <value>linux-ppc64le</value>
         </property>
       </activation>
       <properties>
@@ -853,8 +853,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
-        <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-ppc64le>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -865,11 +865,11 @@
     </profile>
 
     <profile>
-      <id>javacpp-platform-linux-ppc64le</id>
+      <id>javacpp-platform-linux-riscv64</id>
       <activation>
         <property>
           <name>javacpp.platform</name>
-          <value>linux-ppc64le</value>
+          <value>linux-riscv64</value>
         </property>
       </activation>
       <properties>
@@ -883,8 +883,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
-        <javacpp.platform.linux-ppc64le>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -913,8 +913,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -943,8 +943,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -973,8 +973,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64>${javacpp.platform}${javacpp.platform.extension}</javacpp.platform.macosx-arm64>
@@ -1003,8 +1003,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -1033,8 +1033,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -1063,8 +1063,8 @@
         <javacpp.platform.ios-x86_64></javacpp.platform.ios-x86_64>
         <javacpp.platform.linux-armhf></javacpp.platform.linux-armhf>
         <javacpp.platform.linux-arm64></javacpp.platform.linux-arm64>
-        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-ppc64le></javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64></javacpp.platform.linux-riscv64>
         <javacpp.platform.linux-x86></javacpp.platform.linux-x86>
         <javacpp.platform.linux-x86_64></javacpp.platform.linux-x86_64>
         <javacpp.platform.macosx-arm64></javacpp.platform.macosx-arm64>
@@ -1197,26 +1197,26 @@
     </profile>
 
     <profile>
-      <id>javacpp.platform.linux-riscv64-true</id>
+      <id>javacpp.platform.linux-ppc64le-true</id>
       <activation>
         <property>
-          <name>javacpp.platform.linux-riscv64</name>
+          <name>javacpp.platform.linux-ppc64le</name>
         </property>
       </activation>
       <properties>
-        <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-ppc64le>linux-ppc64le${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
       </properties>
     </profile>
 
     <profile>
-      <id>javacpp.platform.linux-ppc64le-true</id>
+      <id>javacpp.platform.linux-riscv64-true</id>
       <activation>
         <property>
-          <name>javacpp.platform.linux-ppc64le</name>
+          <name>javacpp.platform.linux-riscv64</name>
         </property>
       </activation>
       <properties>
-        <javacpp.platform.linux-ppc64le>linux-ppc64le${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
       </properties>
     </profile>
 
@@ -1358,28 +1358,28 @@
     </profile>
 
     <profile>
-      <id>javacpp.platform.custom-linux-riscv64</id>
+      <id>javacpp.platform.custom-linux-ppc64le</id>
       <activation>
         <property>
           <name>javacpp.platform.host</name>
         </property>
-        <os><name>linux</name><arch>riscv64</arch></os>
+        <os><name>linux</name><arch>ppc64le</arch></os>
       </activation>
       <properties>
-        <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
+        <javacpp.platform.linux-ppc64le>linux-ppc64le${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
       </properties>
     </profile>
 
     <profile>
-      <id>javacpp.platform.custom-linux-ppc64le</id>
+      <id>javacpp.platform.custom-linux-riscv64</id>
       <activation>
         <property>
           <name>javacpp.platform.host</name>
         </property>
-        <os><name>linux</name><arch>ppc64le</arch></os>
+        <os><name>linux</name><arch>riscv64</arch></os>
       </activation>
       <properties>
-        <javacpp.platform.linux-ppc64le>linux-ppc64le${javacpp.platform.extension}</javacpp.platform.linux-ppc64le>
+        <javacpp.platform.linux-riscv64>linux-riscv64${javacpp.platform.extension}</javacpp.platform.linux-riscv64>
       </properties>
     </profile>
 
@@ -1589,21 +1589,21 @@
       </properties>
     </profile>
     <profile>
-      <id>riscv64</id>
+      <id>armv8</id>
       <activation>
-        <os><arch>riscv64</arch></os>
+        <os><arch>armv8</arch></os>
       </activation>
       <properties>
-        <os.arch>riscv64</os.arch>
+        <os.arch>arm64</os.arch>
       </properties>
     </profile>
     <profile>
-      <id>armv8</id>
+      <id>riscv64</id>
       <activation>
-        <os><arch>armv8</arch></os>
+        <os><arch>riscv64</arch></os>
       </activation>
       <properties>
-        <os.arch>arm64</os.arch>
+        <os.arch>riscv64</os.arch>
       </properties>
     </profile>
     <profile>
diff --git a/src/it/osgi/pom.xml b/src/it/osgi/pom.xml
index cdf052bca..eee6561dd 100644
--- a/src/it/osgi/pom.xml
+++ b/src/it/osgi/pom.xml
@@ -74,21 +74,21 @@
       </properties>
     </profile>
     <profile>
-      <id>riscv64</id>
+      <id>armv8</id>
       <activation>
-        <os><arch>riscv64</arch></os>
+        <os><arch>armv8</arch></os>
       </activation>
       <properties>
-        <os.arch>riscv64</os.arch>
+        <os.arch>arm64</os.arch>
       </properties>
     </profile>
     <profile>
-      <id>armv8</id>
+      <id>riscv64</id>
       <activation>
-        <os><arch>armv8</arch></os>
+        <os><arch>riscv64</arch></os>
       </activation>
       <properties>
-        <os.arch>arm64</os.arch>
+        <os.arch>riscv64</os.arch>
       </properties>
     </profile>
     <profile>