From: Peter Michael Green Date: Sun, 17 Feb 2019 21:11:06 +0000 (+0000) Subject: Manual merge of version 2.2.0.33+dfsg-7+rpi1 and 2.2.0.33+dfsg-7+deb9u1 to produce... X-Git-Tag: archive/raspbian/2.2.0.33+dfsg-7+rpi1+deb9u1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=76d542cbbf574f6992d677dd452a01a3bec89e6e;p=openni2.git Manual merge of version 2.2.0.33+dfsg-7+rpi1 and 2.2.0.33+dfsg-7+deb9u1 to produce 2.2.0.33+dfsg-7+rpi1+deb9u1 --- 76d542cbbf574f6992d677dd452a01a3bec89e6e diff --cc debian/changelog index 7a933dc,b9b124e..4233b5a --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,10 +1,17 @@@ - openni2 (2.2.0.33+dfsg-7+rpi1) stretch-staging; urgency=medium ++openni2 (2.2.0.33+dfsg-7+rpi1+deb9u1) stretch-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 Thu, 29 Sep 2016 18:49:48 +0000 ++ -- Peter Michael green Sun, 17 Feb 2019 15:12:00 +0000 ++ + openni2 (2.2.0.33+dfsg-7+deb9u1) stretch; urgency=medium + + * Non-maintainer upload. + * Fix armhf baseline violation and armel FTBFS caused by NEON usage. + (Closes: #874220) + + -- Adrian Bunk Tue, 13 Mar 2018 17:52:24 +0200 openni2 (2.2.0.33+dfsg-7) unstable; urgency=medium diff --cc debian/patches/9999-raspbian.patch index 30aafab,0000000..f08e908 mode 100644,000000..100644 --- a/debian/patches/9999-raspbian.patch +++ b/debian/patches/9999-raspbian.patch @@@ -1,60 -1,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 ++ 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 --cc debian/patches/series index 65515f8,8e091bf..7c4d1a8 --- a/debian/patches/series +++ b/debian/patches/series @@@ -11,4 -11,4 +11,5 @@@ 0011-Mark-variables-unused.patch 0012-generic-linux.patch 0013-Fix-GCC6-compilation.patch + 0014-No-NEON.patch +9999-raspbian.patch