From: Peter Michael Green Date: Thu, 28 Sep 2017 00:03:13 +0000 (+0000) Subject: Manual merge of version 2.2.0.33+dfsg-9+rpi1 and 2.2.0.33+dfsg-10 to produce 2.2... X-Git-Tag: archive/raspbian/2.2.0.33+dfsg-10+rpi1~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c3dde68640b7ec709868df402d7516bd3e4d88aa;p=openni2.git Manual merge of version 2.2.0.33+dfsg-9+rpi1 and 2.2.0.33+dfsg-10 to produce 2.2.0.33+dfsg-10+rpi1 --- c3dde68640b7ec709868df402d7516bd3e4d88aa diff --cc ThirdParty/PSCommon/BuildSystem/CommonDefs.mak index 71e2b5d,6384ef8..f08c6aa --- a/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak +++ b/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak @@@ -6,23 -6,21 +6,21 @@@ ifndef CF 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 +# HOST_PLATFORM = generic +#endif # now check if this is a cross-compilation or not ifeq "$(PLATFORM)" "" diff --cc debian/changelog index ab8ba40,db8d2ed..922b865 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,10 +1,17 @@@ - openni2 (2.2.0.33+dfsg-9+rpi1) buster-staging; urgency=medium ++openni2 (2.2.0.33+dfsg-10+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 ++ -- Peter Michael Green Thu, 28 Sep 2017 00:02:30 +0000 ++ + openni2 (2.2.0.33+dfsg-10) unstable; urgency=medium + + * Add patch for arm. + Thanks to Adrian Bunk (Closes: #874220) + * Remove flags, not needed anymore + + -- Jochen Sprickerhof Sat, 09 Sep 2017 16:17:46 +0200 openni2 (2.2.0.33+dfsg-9) unstable; urgency=medium diff --cc debian/patches/series index 34944a6,17c1a0f..8636d11 --- a/debian/patches/series +++ b/debian/patches/series @@@ -13,4 -13,4 +13,5 @@@ 0013-Fix-GCC6-compilation.patch 0014-fix-format-overflow-for-GCC7.patch 0015-Initialize-variable-for-gcc7.patch + 0016-Use-the-generic-platform-for-armel-armhf-NEON-is-not.patch +9999-raspbian.patch