From 0e1cb64a8f69212ddc1fb7c3251723cd8c437481 Mon Sep 17 00:00:00 2001 From: Debian Multimedia Maintainers Date: Fri, 5 Feb 2021 19:15:35 +0000 Subject: [PATCH] Add-ARMhf-support Gbp-Pq: Name 0009-Add-ARMhf-support.patch --- Packaging/Harvest.py | 8 ++------ Source/Tools/NiViewer/Makefile | 2 +- ThirdParty/PSCommon/BuildSystem/Platform.Arm | 5 ++++- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Packaging/Harvest.py b/Packaging/Harvest.py index 4ce9ed2..1b60640 100755 --- a/Packaging/Harvest.py +++ b/Packaging/Harvest.py @@ -98,9 +98,7 @@ class Harvest: self.copySharedObject(binDriversDir, 'Kinect', targetDriversDir) def copySample(self, samplesDir, name, isLibrary = False, isGL = False, isJava = False): - if self.arch == 'Arm' and isGL: - return - + sampleTargetDir = os.path.join(samplesDir, name) sampleSourceDir = os.path.join(self.rootDir, 'Samples', name) @@ -262,9 +260,7 @@ $(OUTPUT_FILE): copy-redist self.copyExecutable(self.binDir, name, os.path.join(samplesDir, 'Bin')) def copyTool(self, toolsDir, name, isGL = False): - if self.arch == 'Arm' and isGL: - return - + self.copyExecutable(self.binDir, name, toolsDir) def copyDocumentation(self, docDir): diff --git a/Source/Tools/NiViewer/Makefile b/Source/Tools/NiViewer/Makefile index f1d5714..6ecb814 100644 --- a/Source/Tools/NiViewer/Makefile +++ b/Source/Tools/NiViewer/Makefile @@ -27,7 +27,7 @@ else endif LIB_DIRS += ../../../ThirdParty/PSCommon/XnLib/Bin/$(PLATFORM)-$(CFG) -USED_LIBS += OpenNI2 XnLib +USED_LIBS += OpenNI2 XnLib pthread EXE_NAME = NiViewer diff --git a/ThirdParty/PSCommon/BuildSystem/Platform.Arm b/ThirdParty/PSCommon/BuildSystem/Platform.Arm index c4a112d..2484f78 100644 --- a/ThirdParty/PSCommon/BuildSystem/Platform.Arm +++ b/ThirdParty/PSCommon/BuildSystem/Platform.Arm @@ -1,7 +1,10 @@ +# some defaults +export GLUT_SUPPORTED=1 + ifeq "$(CFG)" "Release" # Hardware specifying flags - CFLAGS += -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 -- 2.30.2