diff -Nru openni-1.5.4.0/debian/changelog openni-1.5.4.0/debian/changelog --- openni-1.5.4.0/debian/changelog 2016-01-23 14:39:08.000000000 +0000 +++ openni-1.5.4.0/debian/changelog 2016-05-18 00:06:59.000000000 +0000 @@ -1,3 +1,10 @@ +openni (1.5.4.0-14+rpi1) stretch-staging; urgency=medium + + [changes brought forward from 1.5.4.0-13+rpi1 by Peter Michael Green at Sat, 12 Sep 2015 00:02:32 +0000] + * Remove wrong compiler flags for arm. + + -- Raspbian forward porter Wed, 18 May 2016 00:06:59 +0000 + openni (1.5.4.0-14) unstable; urgency=medium * Fix gcc6 compability (Closes: #811848). diff -Nru openni-1.5.4.0/debian/patches/0013-Add-ARM-support.patch openni-1.5.4.0/debian/patches/0013-Add-ARM-support.patch --- openni-1.5.4.0/debian/patches/0013-Add-ARM-support.patch 2016-01-23 14:37:55.000000000 +0000 +++ openni-1.5.4.0/debian/patches/0013-Add-ARM-support.patch 2016-05-18 00:06:59.000000000 +0000 @@ -1,31 +1,22 @@ -From 6a78444abbe7ae138c1eb80df0df476d9d142e7f Mon Sep 17 00:00:00 2001 -From: Joe Burmeister -Date: Wed, 22 Oct 2014 17:43:03 +0100 -Subject: [PATCH] Quick changes to support armhf. +Remove various bogus march/mcpu/mfpu/mfloat-abi settings. ---- - Externals/PSCommon/Linux/Build/Platform.Arm | 2 +- - Platform/Linux/Build/Common/Platform.Arm | 8 +++++++- - Platform/Linux/CreateRedist/Redist_OpenNi.py | 1 - - 3 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/Externals/PSCommon/Linux/Build/Platform.Arm b/Externals/PSCommon/Linux/Build/Platform.Arm -index c85cfb7..2341ed0 100644 ---- a/Externals/PSCommon/Linux/Build/Platform.Arm -+++ b/Externals/PSCommon/Linux/Build/Platform.Arm +Index: openni-1.5.4.0/Externals/PSCommon/Linux/Build/Platform.Arm +=================================================================== +--- openni-1.5.4.0.orig/Externals/PSCommon/Linux/Build/Platform.Arm ++++ openni-1.5.4.0/Externals/PSCommon/Linux/Build/Platform.Arm @@ -1,7 +1,7 @@ ifeq "$(CFG)" "Release" # Hardware specifying flags - CFLAGS += -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-mcpu=cortex-a8 -+ CFLAGS += -march=armv7-a -mtune=cortex-a8 -mfpu=neon #-mcpu=cortex-a8 ++ # CFLAGS += -march=armv7-a -mtune=cortex-a8 -mfpu=neon #-mcpu=cortex-a8 # Optimization level, minus currently buggy optimizing methods (which break bit-exact) CFLAGS += -O3 -fno-tree-pre -fno-strict-aliasing -diff --git a/Platform/Linux/Build/Common/Platform.Arm b/Platform/Linux/Build/Common/Platform.Arm -index c85cfb7..07144a3 100644 ---- a/Platform/Linux/Build/Common/Platform.Arm -+++ b/Platform/Linux/Build/Common/Platform.Arm +Index: openni-1.5.4.0/Platform/Linux/Build/Common/Platform.Arm +=================================================================== +--- openni-1.5.4.0.orig/Platform/Linux/Build/Common/Platform.Arm ++++ openni-1.5.4.0/Platform/Linux/Build/Common/Platform.Arm @@ -1,7 +1,13 @@ +# take this file's dir +COMMON_MAK_DIR = $(dir $(lastword $(MAKEFILE_LIST))) @@ -37,15 +28,15 @@ # Hardware specifying flags - CFLAGS += -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp #-mcpu=cortex-a8 -+ CFLAGS += -march=armv7-a -mtune=cortex-a8 -mfpu=neon #-mcpu=cortex-a8 ++ # CFLAGS += -march=armv7-a -mtune=cortex-a8 -mfpu=neon #-mcpu=cortex-a8 # Optimization level, minus currently buggy optimizing methods (which break bit-exact) CFLAGS += -O3 -fno-tree-pre -fno-strict-aliasing -diff --git a/Platform/Linux/CreateRedist/Redist_OpenNi.py b/Platform/Linux/CreateRedist/Redist_OpenNi.py -index 0d667cf..548b87f 100755 ---- a/Platform/Linux/CreateRedist/Redist_OpenNi.py -+++ b/Platform/Linux/CreateRedist/Redist_OpenNi.py -@@ -349,7 +349,6 @@ if PLATFORM == 'CE4100': +Index: openni-1.5.4.0/Platform/Linux/CreateRedist/Redist_OpenNi.py +=================================================================== +--- openni-1.5.4.0.orig/Platform/Linux/CreateRedist/Redist_OpenNi.py ++++ openni-1.5.4.0/Platform/Linux/CreateRedist/Redist_OpenNi.py +@@ -350,7 +350,6 @@ if PLATFORM == 'CE4100': if PLATFORM == 'Arm': samples_list.remove('NiUserTracker') @@ -53,6 +44,3 @@ samples_list.remove('NiSimpleViewer') samples_list.remove('NiHandTracker') samples_list.remove('NiUserSelection') --- -1.9.1 - diff -Nru openni-1.5.4.0/debian/patches/0015-Add-mipsel-support.patch openni-1.5.4.0/debian/patches/0015-Add-mipsel-support.patch --- openni-1.5.4.0/debian/patches/0015-Add-mipsel-support.patch 2016-01-23 14:37:55.000000000 +0000 +++ openni-1.5.4.0/debian/patches/0015-Add-mipsel-support.patch 2016-05-18 00:06:59.000000000 +0000 @@ -1,7 +1,7 @@ -Index: new.openni-1.5.4.0/Include/XnPlatform.h +Index: openni-1.5.4.0/Include/XnPlatform.h =================================================================== ---- new.openni-1.5.4.0.orig/Include/XnPlatform.h -+++ new.openni-1.5.4.0/Include/XnPlatform.h +--- openni-1.5.4.0.orig/Include/XnPlatform.h ++++ openni-1.5.4.0/Include/XnPlatform.h @@ -37,6 +37,7 @@ #define XN_PLATFORM_ANDROID_ARM 9 #define XN_PLATFORM_LINUX_POWERPC 10 @@ -19,10 +19,10 @@ #elif _ARC #include "ARC/XnPlatformARC.h" #elif (__APPLE__) -Index: new.openni-1.5.4.0/Platform/Linux/Build/Common/CommonDefs.mak +Index: openni-1.5.4.0/Platform/Linux/Build/Common/CommonDefs.mak =================================================================== ---- new.openni-1.5.4.0.orig/Platform/Linux/Build/Common/CommonDefs.mak -+++ new.openni-1.5.4.0/Platform/Linux/Build/Common/CommonDefs.mak +--- openni-1.5.4.0.orig/Platform/Linux/Build/Common/CommonDefs.mak ++++ openni-1.5.4.0/Platform/Linux/Build/Common/CommonDefs.mak @@ -22,6 +22,8 @@ else ifneq (,$(findstring aarch64,$(MACH HOST_PLATFORM = AArch64 else ifneq (,$(findstring ppc,$(MACHINE))) @@ -32,10 +32,10 @@ else DUMMY:=$(error Can't determine host platform) endif -Index: new.openni-1.5.4.0/Platform/Linux/Build/Common/Platform.Mips +Index: openni-1.5.4.0/Platform/Linux/Build/Common/Platform.Mips =================================================================== --- /dev/null -+++ new.openni-1.5.4.0/Platform/Linux/Build/Common/Platform.Mips ++++ openni-1.5.4.0/Platform/Linux/Build/Common/Platform.Mips @@ -0,0 +1,11 @@ +export GLUT_SUPPORTED=1 + @@ -48,10 +48,10 @@ + CFLAGS += -ftree-vectorize -ffast-math -funsafe-math-optimizations -fsingle-precision-constant + +endif -Index: new.openni-1.5.4.0/Samples/NiViewer/NiViewer.cpp +Index: openni-1.5.4.0/Samples/NiViewer/NiViewer.cpp =================================================================== ---- new.openni-1.5.4.0.orig/Samples/NiViewer/NiViewer.cpp -+++ new.openni-1.5.4.0/Samples/NiViewer/NiViewer.cpp +--- openni-1.5.4.0.orig/Samples/NiViewer/NiViewer.cpp ++++ openni-1.5.4.0/Samples/NiViewer/NiViewer.cpp @@ -49,7 +49,7 @@ // -------------------------------- #include @@ -70,10 +70,10 @@ #define _getch() getchar() #endif -Index: new.openni-1.5.4.0/Source/OpenNI/XnOpenNI.cpp +Index: openni-1.5.4.0/Source/OpenNI/XnOpenNI.cpp =================================================================== ---- new.openni-1.5.4.0.orig/Source/OpenNI/XnOpenNI.cpp -+++ new.openni-1.5.4.0/Source/OpenNI/XnOpenNI.cpp +--- openni-1.5.4.0.orig/Source/OpenNI/XnOpenNI.cpp ++++ openni-1.5.4.0/Source/OpenNI/XnOpenNI.cpp @@ -7062,7 +7062,7 @@ XN_C_API XnStatus xnScriptNodeRun(XnNode #define XN_OPEN_NI_FILES_LOCATION "\\Data\\" #elif (CE4100) @@ -83,10 +83,10 @@ #define XN_OPEN_NI_FILES_LOCATION "/var/lib/ni/" #elif (XN_PLATFORM == XN_PLATFORM_ANDROID_ARM) #define XN_OPEN_NI_FILES_LOCATION "/data/ni/" -Index: new.openni-1.5.4.0/Include/Linux-Mips/XnPlatformLinux-Mips.h +Index: openni-1.5.4.0/Include/Linux-Mips/XnPlatformLinux-Mips.h =================================================================== --- /dev/null -+++ new.openni-1.5.4.0/Include/Linux-Mips/XnPlatformLinux-Mips.h ++++ openni-1.5.4.0/Include/Linux-Mips/XnPlatformLinux-Mips.h @@ -0,0 +1,43 @@ +/**************************************************************************** +* * @@ -131,10 +131,10 @@ +#endif // __MIPSEB__ +#endif //_XN_PLATFORM_LINUX_MIPS_H_ + -Index: new.openni-1.5.4.0/Include/XnOS.h +Index: openni-1.5.4.0/Include/XnOS.h =================================================================== ---- new.openni-1.5.4.0.orig/Include/XnOS.h -+++ new.openni-1.5.4.0/Include/XnOS.h +--- openni-1.5.4.0.orig/Include/XnOS.h ++++ openni-1.5.4.0/Include/XnOS.h @@ -44,7 +44,7 @@ //--------------------------------------------------------------------------- #if (XN_PLATFORM == XN_PLATFORM_WIN32) @@ -144,10 +144,10 @@ #include "Linux-x86/XnOSLinux-x86.h" #elif defined(_ARC) #include "ARC/XnOSARC.h" -Index: new.openni-1.5.4.0/Include/XnUSBDevice.h +Index: openni-1.5.4.0/Include/XnUSBDevice.h =================================================================== ---- new.openni-1.5.4.0.orig/Include/XnUSBDevice.h -+++ new.openni-1.5.4.0/Include/XnUSBDevice.h +--- openni-1.5.4.0.orig/Include/XnUSBDevice.h ++++ openni-1.5.4.0/Include/XnUSBDevice.h @@ -48,7 +48,7 @@ #define USB_DT_DEVICE_SIZE 0 #define USB_DT_DEVICE 0 @@ -157,10 +157,10 @@ #include typedef struct usb_endpoint_descriptor XnUSBEndpointDescriptor; typedef struct usb_interface_descriptor XnUSBInterfaceDescriptor; -Index: new.openni-1.5.4.0/Platform/Linux/CreateRedist/Redist_OpenNi.py +Index: openni-1.5.4.0/Platform/Linux/CreateRedist/Redist_OpenNi.py =================================================================== ---- new.openni-1.5.4.0.orig/Platform/Linux/CreateRedist/Redist_OpenNi.py -+++ new.openni-1.5.4.0/Platform/Linux/CreateRedist/Redist_OpenNi.py +--- openni-1.5.4.0.orig/Platform/Linux/CreateRedist/Redist_OpenNi.py ++++ openni-1.5.4.0/Platform/Linux/CreateRedist/Redist_OpenNi.py @@ -190,6 +190,8 @@ else: PLATFORM = "AArch64" elif machinetype[:3] == "ppc":