[SCM] openni/master: Add patch to fix preprocessor symbol with C++11

eighthave at users.alioth.debian.org eighthave at users.alioth.debian.org
Mon May 20 03:25:54 UTC 2013


The following commit has been merged in the master branch:
commit 2c1a32c43d6f1403685b1df88924c087a80b2011
Author: Jochen Sprickerhof <jochen at sprickerhof.de>
Date:   Fri Aug 17 17:04:55 2012 +0200

    Add patch to fix preprocessor symbol with C++11

diff --git a/debian/patches/0008-Fix-preprocessor-macro-to-be-C-11-compatible.patch b/debian/patches/0008-Fix-preprocessor-macro-to-be-C-11-compatible.patch
new file mode 100644
index 0000000..92e40c6
--- /dev/null
+++ b/debian/patches/0008-Fix-preprocessor-macro-to-be-C-11-compatible.patch
@@ -0,0 +1,26 @@
+From: Jochen Sprickerhof <jochen at sprickerhof.de>
+Date: Fri, 17 Aug 2012 17:02:38 +0200
+Subject: Fix preprocessor macro to be C++11 compatible
+
+g++-4.7 -std=c++11 doesn't export the symbol linux anymore because it's
+obsolete.
+---
+ Include/XnPlatform.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Include/XnPlatform.h b/Include/XnPlatform.h
+index b40497b..3af7ef5 100644
+--- a/Include/XnPlatform.h
++++ b/Include/XnPlatform.h
+@@ -62,9 +62,9 @@
+ 	#include "Win32/XnPlatformWin32.h"
+ #elif defined(ANDROID) && defined(__arm__)
+ 	#include "Android-Arm/XnPlatformAndroid-Arm.h"
+-#elif (linux && (i386 || __x86_64__))
++#elif (__linux__ && (i386 || __x86_64__))
+ 	#include "Linux-x86/XnPlatformLinux-x86.h"
+-#elif (linux && __arm__)
++#elif (__linux__ && __arm__)
+ 	#include "Linux-Arm/XnPlatformLinux-Arm.h"
+ #elif _ARC
+ 	#include "ARC/XnPlatformARC.h"
diff --git a/debian/patches/series b/debian/patches/series
index 87e02af..3228179 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-Silence-asserts.patch
 0006-Use-system-wide-libjpeg.patch
 0007-Use-system-wide-tinyxml.patch
+0008-Fix-preprocessor-macro-to-be-C-11-compatible.patch

-- 
openni packaging



More information about the pkg-multimedia-commits mailing list