[SCM] openni2/master: Add ARMhf support.

[jspricke-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 420f4cb768864d8f9443f69919c04d46772bddd9
Author: Joe Burmeister <joe at SuaveAirApps.co.uk>
Date:   Thu Oct 30 09:31:09 2014 +0000

    Add ARMhf support.

diff --git a/debian/patches/0009-Add-ARMhf-support.patch b/debian/patches/0009-Add-ARMhf-support.patch
new file mode 100644
index 0000000..b37b383
--- /dev/null
+++ b/debian/patches/0009-Add-ARMhf-support.patch
@@ -0,0 +1,52 @@
+--- a/Packaging/Harvest.py
++++ b/Packaging/Harvest.py
+@@ -98,9 +98,7 @@ class Harvest:
+             self.copySharedObject(binDriversDir, 'Kinect', targetDriversDir)
+         
+     def copySample(self, samplesDir, name, isLibrary = False, isGL = False, isJava = False):
+-        if self.arch == 'Arm' and isGL:
+-            return
+-            
++
+         sampleTargetDir = os.path.join(samplesDir, name)
+         sampleSourceDir = os.path.join(self.rootDir, 'Samples', name)
+ 
+@@ -262,9 +260,7 @@ $(OUTPUT_FILE): copy-redist
+             self.copyExecutable(self.binDir, name, os.path.join(samplesDir, 'Bin'))
+         
+     def copyTool(self, toolsDir, name, isGL = False):
+-        if self.arch == 'Arm' and isGL:
+-            return
+-            
++
+         self.copyExecutable(self.binDir, name, toolsDir)
+ 
+     def copyDocumentation(self, docDir):
+--- a/Source/Tools/NiViewer/Makefile
++++ b/Source/Tools/NiViewer/Makefile
+@@ -26,7 +26,7 @@ else
+ endif
+ 
+ LIB_DIRS  += ../../../ThirdParty/PSCommon/XnLib/Bin/$(PLATFORM)-$(CFG)
+-USED_LIBS += OpenNI2 XnLib
++USED_LIBS += OpenNI2 XnLib pthread
+ 
+ EXE_NAME = NiViewer
+ 
+--- a/ThirdParty/PSCommon/BuildSystem/Platform.Arm
++++ b/ThirdParty/PSCommon/BuildSystem/Platform.Arm
+@@ -1,7 +1,10 @@
++# some defaults
++export GLUT_SUPPORTED=1
++
+ ifeq "$(CFG)" "Release"
+ 
+     # Hardware specifying flags
+-    CFLAGS += -march=armv7-a -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp #-mcpu=cortex-a8
++    CFLAGS += -Wno-unused-local-typedefs -march=armv7-a -mtune=cortex-a9 -mfpu=neon #-mfloat-abi=softfp #-mcpu=cortex-a8
+ 
+     # Optimization level, minus currently buggy optimizing methods (which break bit-exact)
+     CFLAGS += -O3 -fno-tree-pre -fno-strict-aliasing
+-- 
+1.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 75aa777..16371d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 0006-Disable-SSE.patch
 0007-Link-NiViewer-against-ptherad-DSO-on-Ubuntu-raring.patch
 0008-Add-unused-attribute-to-fix-compilation-with-gcc-4.8.patch
+0009-Add-ARMhf-support.patch

-- 
openni2 packaging