Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian....@packages.debian.org
Usertags: pu
* Fix armhf baseline violation and armel FTBFS caused by NEON usage.
(Closes: #874220)
This aims at a small change without affecting other architectures.
Taking the fix from unstable verbatim was also not possible due to
2.2.0.33+dfsg-10 not building on stretch - the following compile
error is present with gcc 6 but for some reason not with gcc 7:
Linux/XnLinuxUSBDevice.cpp: In function 'XnBool
handleGetStringDescriptor(XnUSBDevice*, __u16, __u16, __u8)':
Linux/XnLinuxUSBDevice.cpp:401:18: error: dereferencing type-punned pointer
will break strict-aliasing rules [-Werror=strict-aliasing]
*(__u16*)&buf[2] = __cpu_to_le16(USB_LANGUAGE_ENGLISH_US);
^
Fixing the typo in ThirdParty/PSCommon/BuildSystem/Platform.generic
(see #874220) might be advisable for unstable, but for stretch the
different change avoids this change (that would also affect other
architectures).
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 2016-09-12 12:32:44.000000000
+0300
+++ openni2-2.2.0.33+dfsg/debian/changelog 2018-03-13 17:52:24.000000000
+0200
@@ -1,3 +1,11 @@
+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 <b...@debian.org> Tue, 13 Mar 2018 17:52:24 +0200
+
openni2 (2.2.0.33+dfsg-7) unstable; urgency=medium
* Don't link plugins in pkg-config file
diff -Nru openni2-2.2.0.33+dfsg/debian/patches/0014-No-NEON.patch
openni2-2.2.0.33+dfsg/debian/patches/0014-No-NEON.patch
--- openni2-2.2.0.33+dfsg/debian/patches/0014-No-NEON.patch 1970-01-01
02:00:00.000000000 +0200
+++ openni2-2.2.0.33+dfsg/debian/patches/0014-No-NEON.patch 2018-03-13
17:52:24.000000000 +0200
@@ -0,0 +1,23 @@
+Description: Fix armhf baseline violation and armel FTBFS caused by NEON usage
+Author: Adrian Bunk <b...@debian.org>
+Bug-Debian: https://bugs.debian.org/874220
+
+--- 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
+@@ -12,6 +12,6 @@ ifeq "$(CFG)" "Release"
+ # More optimization flags
+ CFLAGS += -ftree-vectorize -ffast-math -funsafe-math-optimizations
#-fsingle-precision-constant
+
+- DEFINES += XN_NEON
++ #DEFINES += XN_NEON
+ CFLAGS += -flax-vector-conversions
+ endif
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 2016-01-23 17:53:07.000000000
+0200
+++ openni2-2.2.0.33+dfsg/debian/patches/series 2018-03-13 17:52:24.000000000
+0200
@@ -11,3 +11,4 @@
0011-Mark-variables-unused.patch
0012-generic-linux.patch
0013-Fix-GCC6-compilation.patch
+0014-No-NEON.patch
