[openni] Added patch and changed spec for arm support

[Scott K Logan]

commit 9e741a0cab971089daba62fc8cdcd0528dc3e1f8
Author: Scott K Logan <logans at cottsay.net>
Date:   Wed Feb 26 20:59:04 2014 -0700

    Added patch and changed spec for arm support

 openni-1.3.2.1-arm.patch |   11 +++++++++++
 openni.spec              |   20 ++++++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/openni-1.3.2.1-arm.patch b/openni-1.3.2.1-arm.patch
new file mode 100644
index 0000000..c8ed733
--- /dev/null
+++ b/openni-1.3.2.1-arm.patch
@@ -0,0 +1,11 @@
+diff -uNr a/Platform/Linux-x86/Build/Platform.Arm b/Platform/Linux-x86/Build/Platform.Arm
+--- a/Platform/Linux-x86/Build/Platform.Arm	2011-07-13 13:35:20.000000000 -0600
++++ b/Platform/Linux-x86/Build/Platform.Arm	2013-09-08 19:07:59.066850035 -0600
+@@ -1,6 +1,5 @@
+-export CXX=/home/primesense/DiGMi/BeagleBoard/Kernel/OE/angstrom-dev/cross/armv7a/bin/arm-angstrom-linux-gnueabi-g++
+ export GLES=1
+ 
+ ifeq "$(CFG)" "Release"
+-    CFLAGS += -mcpu=cortex-a8 -mfpu=neon -ftree-vectorize -mfloat-abi=softfp -ffast-math -fsingle-precision-constant
++    CFLAGS += -ftree-vectorize -ffast-math
+ endif
diff --git a/openni.spec b/openni.spec
index bf447de..26a7f31 100644
--- a/openni.spec
+++ b/openni.spec
@@ -2,7 +2,7 @@
 
 Name:           openni
 Version:        1.3.2.1
-Release:        8%{?gitrev}%{?dist}
+Release:        9%{?gitrev}%{?dist}
 Summary:        Library for human-machine Natural Interaction
 
 Group:          System Environment/Libraries
@@ -19,8 +19,9 @@ Patch1:         openni-1.3.2.1-fedora.patch
 Patch2:         openni-1.3.2.1-disable-sse.patch
 Patch3:         openni-1.3.2.1-silence-assert.patch
 Patch4:         openni-1.3.2.1-fedora-java.patch
+Patch5:         openni-1.3.2.1-arm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch:  %{ix86} x86_64
+ExclusiveArch:  %{ix86} x86_64 %{arm}
 
 BuildRequires:  freeglut-devel, tinyxml-devel, libjpeg-devel, dos2unix, libusb1-devel
 BuildRequires:  python, doxygen, graphviz
@@ -84,6 +85,7 @@ The %{name}-examples package contains example programs for OpenNI.
 %patch2 -p1 -b .disable-sse
 %patch3 -p1 -b .silence-assert
 %patch4 -p1 -b .fedora-java
+%patch5 -p1 -b .arm
 
 rm -rf Source/External
 rm -rf Platform/Linux-x86/Build/Prerequisites/*
@@ -101,9 +103,16 @@ dos2unix LGPL.txt
 
 %build
 cd Platform/Linux-x86/CreateRedist
+%ifarch %{arm}
+chmod +x RedistMaker.Arm
+# {?_smp_mflags} omitted, not supported by OpenNI Makefiles
+CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" DEBUG=1 \
+./RedistMaker.Arm
+%else
 # {?_smp_mflags} omitted, not supported by OpenNI Makefiles
 CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" DEBUG=1 \
 ./RedistMaker
+%endif
 #cat Output/BuildOpenNI.txt
 
 
@@ -118,7 +127,9 @@ INSTALL_JAR=$RPM_BUILD_ROOT%{_libdir}/%{name} \
 ./install.sh -n
 
 install -m 0755 Samples/Bin/Release/libSample-NiSampleModule.so $RPM_BUILD_ROOT%{_libdir}/libNiSampleModule.so
+%ifnarch %{arm}
 install -m 0755 Samples/Bin/Release/NiViewer $RPM_BUILD_ROOT%{_bindir}
+%endif
 install -m 0755 Samples/Bin/Release/Sample-NiAudioSample $RPM_BUILD_ROOT%{_bindir}/NiAudioSample
 install -m 0755 Samples/Bin/Release/Sample-NiBackRecorder $RPM_BUILD_ROOT%{_bindir}/NiBackRecorder
 install -m 0755 Samples/Bin/Release/Sample-NiConvertXToONI $RPM_BUILD_ROOT%{_bindir}/NiConvertXToONI
@@ -126,8 +137,10 @@ install -m 0755 Samples/Bin/Release/Sample-NiCRead $RPM_BUILD_ROOT%{_bindir}/NiC
 install -m 0755 Samples/Bin/Release/Sample-NiRecordSynthetic $RPM_BUILD_ROOT%{_bindir}/NiRecordSynthetic
 install -m 0755 Samples/Bin/Release/Sample-NiSimpleCreate $RPM_BUILD_ROOT%{_bindir}/NiSimpleCreate
 install -m 0755 Samples/Bin/Release/Sample-NiSimpleRead $RPM_BUILD_ROOT%{_bindir}/NiSimpleRead
+%ifnarch %{arm}
 install -m 0755 Samples/Bin/Release/Sample-NiSimpleViewer $RPM_BUILD_ROOT%{_bindir}/NiSimpleViewer
 install -m 0755 Samples/Bin/Release/Sample-NiUserTracker $RPM_BUILD_ROOT%{_bindir}/NiUserTracker
+%endif
 
 popd
 
@@ -198,6 +211,9 @@ fi
 
 
 %changelog
+* Wed Feb 26 2014 Scott K Logan <logans at cottsay.net> - 1.3.2.1-9
+- Added patch and changed spec for arm support
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.2.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild