From: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org>
Date: Thu, 29 Sep 2016 18:49:48 +0000 (+0000)
Subject: raspbian
X-Git-Tag: archive/raspbian/2.2.0.33+dfsg-8+rpi1~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=81029f1028c49a44f02d1aca0f2c2e03cad4d966;p=openni2.git

raspbian


Gbp-Pq: Name 9999-raspbian.patch
---

diff --git a/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak b/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak
index c29d9bd..71e2b5d 100644
--- a/ThirdParty/PSCommon/BuildSystem/CommonDefs.mak
+++ b/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 --git a/ThirdParty/PSCommon/BuildSystem/Platform.Arm b/ThirdParty/PSCommon/BuildSystem/Platform.Arm
index 2484f78..970e9b6 100644
--- a/ThirdParty/PSCommon/BuildSystem/Platform.Arm
+++ b/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