automatic import of ros-humble-openni2-camera

2 files changed, 42 insertions, 6 deletions

diff --git a/openni2-aarch64-support.patch b/openni2-aarch64-support.patch
index 8718ce9..678d91f 100644
--- a/openni2-aarch64-support.patch
+++ b/openni2-aarch64-support.patch
@@ -30,6 +30,38 @@ diff -ruN '--exclude=.git' '--exclude=.github' ./ThirdParty/PSCommon/XnLib/Inclu
 +#define XN_PLATFORM XN_PLATFORM_LINUX_ARM
 +#define XN_PLATFORM_STRING "Linux-Aarch64"
 +#endif
+diff -ruN '--exclude=.git' '--exclude=.github' ./Include/Linux-Aarch64/OniPlatformLinux-Aarch64.h ../OpenNI2-patched/Include/Linux-Aarch64/OniPlatformLinux-Aarch64.h
+--- a/Include/Linux-Aarch64/OniPlatformLinux-Aarch64.h	1970-01-01 00:00:00.000000000 +0000
++++ b/Include/Linux-Aarch64/OniPlatformLinux-Aarch64.h	2026-10-22 03:24:42.077885129 +0000
+@@ -0,0 +1,15 @@
++#ifndef _ONI_PLATFORM_LINUX_AARCH64_H_
++#define _ONI_PLATFORM_LINUX_AARCH64_H_
++
++// Start with Linux-x86, and override what's different
++#include "../Linux-x86/OniPlatformLinux-x86.h"
++
++//---------------------------------------------------------------------------
++// Platform Basic Definition
++//---------------------------------------------------------------------------
++#undef ONI_PLATFORM
++#undef ONI_PLATFORM_STRING
++#define ONI_PLATFORM ONI_PLATFORM_LINUX_ARM
++#define ONI_PLATFORM_STRING "Linux-Aarch64"
++
++#endif //_ONI_PLATFORM_LINUX_AARCH64_H_
+diff -ruN '--exclude=.git' '--exclude=.github' ./Include/OniPlatform.h ../OpenNI2-patched/Include/OniPlatform.h
+--- a/Include/OniPlatform.h	2026-10-22 03:13:34.628894060 +0000
++++ b/Include/OniPlatform.h	2026-10-22 03:24:42.077885129 +0000
+@@ -38,6 +38,8 @@
+ #elif defined (ANDROID) && defined (__arm__)
+ #	include "Android-Arm/OniPlatformAndroid-Arm.h"
+ #elif (__linux__ && (i386 || __x86_64__))
+ #	include "Linux-x86/OniPlatformLinux-x86.h"
++#elif (__linux__ && __aarch64__)
++#	include "Linux-Aarch64/OniPlatformLinux-Aarch64.h"
+ #elif (__linux__ && __arm__)
+ #	include "Linux-Arm/OniPlatformLinux-Arm.h"
+ #elif _ARC
 diff -ruN '--exclude=.git' '--exclude=.github' ./ThirdParty/PSCommon/XnLib/Include/XnPlatform.h ../OpenNI2-patched/ThirdParty/PSCommon/XnLib/Include/XnPlatform.h
 --- a/ThirdParty/PSCommon/XnLib/Include/XnPlatform.h	2026-10-22 03:13:34.655894141 +0000
 +++ b/ThirdParty/PSCommon/XnLib/Include/XnPlatform.h	2026-10-22 03:24:42.077885129 +0000
diff --git a/openni2-camera.spec b/openni2-camera.spec
index 7c08d23..e38d494 100644
--- a/openni2-camera.spec
+++ b/openni2-camera.spec
@@ -5,7 +5,7 @@
 
 Name:           ros-%{ros_distro}-%{RosPkgName}
 Version:        2.0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Drivers for the Asus Xtion and Primesense Devices
 License:        BSD
 URL:            https://github.com/ros-drivers/openni2_camera/tree/iron
@@ -69,7 +69,7 @@ cd OpenNI2-%{openni2_version}
 make Source/Core %{?_smp_mflags}
 OPENNI2_PREFIX=%{_builddir}/openni2_install
 mkdir -p $OPENNI2_PREFIX/lib $OPENNI2_PREFIX/include/openni2 $OPENNI2_PREFIX/lib/pkgconfig
-cp Bin/*/Release/libOpenNI2.so $OPENNI2_PREFIX/lib/
+cp Bin/*-Release/libOpenNI2.so $OPENNI2_PREFIX/lib/
 cp Include/*.h $OPENNI2_PREFIX/include/openni2/
 cat > $OPENNI2_PREFIX/lib/pkgconfig/libopenni2.pc << PCEOF
 prefix=$OPENNI2_PREFIX
@@ -113,14 +113,14 @@ make install DESTDIR=%{buildroot}
 cd ../..
 mkdir -p %{buildroot}/%{_libdir}
 mkdir -p %{buildroot}/%{_includedir}/openni2
-cp OpenNI2-%{openni2_version}/Bin/*/Release/libOpenNI2.so %{buildroot}/%{_libdir}/
+cp OpenNI2-%{openni2_version}/Bin/*-Release/libOpenNI2.so %{buildroot}/%{_libdir}/
 cp OpenNI2-%{openni2_version}/Include/*.h %{buildroot}/%{_includedir}/openni2/
 
 # Install OpenNI2 drivers if available
 mkdir -p %{buildroot}/%{_libdir}/OpenNI2/Drivers
-for drv in OpenNI2-%{openni2_version}/Bin/*/Release/libPS*.so \
-           OpenNI2-%{openni2_version}/Bin/*/Release/libOniFile.so \
-           OpenNI2-%{openni2_version}/Bin/*/Release/libDummyDevice.so; do
+for drv in OpenNI2-%{openni2_version}/Bin/*-Release/libPS*.so \
+           OpenNI2-%{openni2_version}/Bin/*-Release/libOniFile.so \
+           OpenNI2-%{openni2_version}/Bin/*-Release/libDummyDevice.so; do
     [ -f "$drv" ] && cp "$drv" %{buildroot}/%{_libdir}/OpenNI2/Drivers/ || true
 done
 
@@ -131,6 +131,10 @@ done
 %{_includedir}/openni2
 
 %changelog
+* Thu Oct 22 2026 ai-importer <ai-importer@openeuler.org> - 2.0.3-3
+- Add aarch64 support to OpenNI API platform header (Include/OniPlatform.h)
+- Fix Bin output glob pattern to match PLATFORM-Release directory structure
+
 * Thu Oct 22 2026 ai-importer <ai-importer@openeuler.org> - 2.0.3-2
 - Vendor OpenNI2 SDK (libopenni2 not available in openEuler)
 - Add aarch64 platform support to OpenNI2 build system