diff -Nru openni2-2.2.0.33+dfsg/debian/changelog openni2-2.2.0.33+dfsg/debian/changelog --- openni2-2.2.0.33+dfsg/debian/changelog 2017-08-09 06:40:32.000000000 +0000 +++ openni2-2.2.0.33+dfsg/debian/changelog 2017-08-18 17:42:31.000000000 +0000 @@ -1,3 +1,10 @@ +openni2 (2.2.0.33+dfsg-9+rpi1) buster-staging; urgency=medium + + [changes brought forward from 2.2.0.33+dfsg-6+rpi1 by Peter Michael Green at Mon, 12 Sep 2016 22:39:36 +0000] + * Force PSCommon platform to armv6l + + -- Raspbian forward porter Fri, 18 Aug 2017 17:42:31 +0000 + openni2 (2.2.0.33+dfsg-9) unstable; urgency=medium * Add patch for GCC7 (Closes: #871157) diff -Nru openni2-2.2.0.33+dfsg/debian/patches/9999-raspbian.patch openni2-2.2.0.33+dfsg/debian/patches/9999-raspbian.patch --- openni2-2.2.0.33+dfsg/debian/patches/9999-raspbian.patch 1970-01-01 00:00:00.000000000 +0000 +++ openni2-2.2.0.33+dfsg/debian/patches/9999-raspbian.patch 2017-08-18 17:42:31.000000000 +0000 @@ -0,0 +1,60 @@ +Description: Force PSCommon platform to Armv6l +Author: Peter Michael Green + +Index: openni2-2.2.0.33+dfsg/ThirdParty/PSCommon/BuildSystem/Platform.Arm +=================================================================== +--- openni2-2.2.0.33+dfsg.orig/ThirdParty/PSCommon/BuildSystem/Platform.Arm ++++ openni2-2.2.0.33+dfsg/ThirdParty/PSCommon/BuildSystem/Platform.Arm +@@ -4,7 +4,7 @@ export GLUT_SUPPORTED=1 + ifeq "$(CFG)" "Release" + + # Hardware specifying flags +- CFLAGS += -Wno-unused-local-typedefs -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 +Index: openni2-2.2.0.33+dfsg/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak +=================================================================== +--- openni2-2.2.0.33+dfsg.orig/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak ++++ openni2-2.2.0.33+dfsg/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak +@@ -6,23 +6,23 @@ ifndef CFG + CFG = Release + endif + +-# find out the platform on which we're running +-MACHINE = $(shell uname -m) +-ifneq (,$(findstring x86_64,$(MACHINE))) +- HOST_PLATFORM = x64 +-else ifneq (,$(findstring x86,$(MACHINE))) +- HOST_PLATFORM = x86 +-else ifneq (,$(findstring i686,$(MACHINE))) +- HOST_PLATFORM = x86 +-else ifneq (,$(findstring i386,$(MACHINE))) +- HOST_PLATFORM = x86 +-else ifneq (,$(findstring armv6l,$(MACHINE))) ++## find out the platform on which we're running ++#MACHINE = $(shell uname -m) ++#ifneq (,$(findstring x86_64,$(MACHINE))) ++# HOST_PLATFORM = x64 ++#else ifneq (,$(findstring x86,$(MACHINE))) ++# HOST_PLATFORM = x86 ++#else ifneq (,$(findstring i686,$(MACHINE))) ++# HOST_PLATFORM = x86 ++#else ifneq (,$(findstring i386,$(MACHINE))) ++# HOST_PLATFORM = x86 ++#else ifneq (,$(findstring armv6l,$(MACHINE))) + HOST_PLATFORM = Armv6l +-else ifneq (,$(findstring arm,$(MACHINE))) +- HOST_PLATFORM = Arm +-else +- HOST_PLATFORM = generic +-endif ++#else ifneq (,$(findstring arm,$(MACHINE))) ++# HOST_PLATFORM = Arm ++#else ++# HOST_PLATFORM = generic ++#endif + + # now check if this is a cross-compilation or not + ifeq "$(PLATFORM)" "" diff -Nru openni2-2.2.0.33+dfsg/debian/patches/series openni2-2.2.0.33+dfsg/debian/patches/series --- openni2-2.2.0.33+dfsg/debian/patches/series 2017-08-08 20:53:38.000000000 +0000 +++ openni2-2.2.0.33+dfsg/debian/patches/series 2017-08-18 17:42:31.000000000 +0000 @@ -13,3 +13,4 @@ 0013-Fix-GCC6-compilation.patch 0014-fix-format-overflow-for-GCC7.patch 0015-Initialize-variable-for-gcc7.patch +9999-raspbian.patch