[SCM] openni-sensor-primesense/master: Add patch for arm64 (Closes: #787971), thanks Edmund Grimley Evans
jspricke-guest at users.alioth.debian.org
jspricke-guest at users.alioth.debian.org
Mon Jun 8 13:23:01 UTC 2015
The following commit has been merged in the master branch:
commit 1d6c85ebafac3c0e200d86b47dd114bc06efaff0
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Mon Jun 8 15:16:37 2015 +0200
Add patch for arm64 (Closes: #787971), thanks Edmund Grimley Evans
diff --git a/debian/patches/0009-Add-support-for-Powerpc-Thanks-to-Roland-Stigge.patch b/debian/patches/0011-Add-Arm64-support-thanks-Edmund-Grimley-Evans.patch
similarity index 71%
copy from debian/patches/0009-Add-support-for-Powerpc-Thanks-to-Roland-Stigge.patch
copy to debian/patches/0011-Add-Arm64-support-thanks-Edmund-Grimley-Evans.patch
index 5c0fbaa..e82c4c3 100644
--- a/debian/patches/0009-Add-support-for-Powerpc-Thanks-to-Roland-Stigge.patch
+++ b/debian/patches/0011-Add-Arm64-support-thanks-Edmund-Grimley-Evans.patch
@@ -1,94 +1,98 @@
+From f98567d7aa83c26d5f8dc394efce98c390fc672f Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Mon, 11 May 2015 15:48:01 +0200
-Subject: Add support for Powerpc (Thanks to Roland Stigge)
+Date: Mon, 8 Jun 2015 14:53:34 +0200
+Subject: [PATCH 2/2] Add Arm64 support (thanks Edmund Grimley Evans)
---
Platform/Linux/Build/Common/CommonDefs.mak | 2 ++
- Platform/Linux/Build/Common/Platform.Powerpc | 9 +++++++++
+ Platform/Linux/Build/Common/Platform.AArch64 | 9 +++++++++
Platform/Linux/CreateRedist/RedistMaker | 2 ++
Source/Utils/XnSensorServer/SensorServer.cpp | 2 +-
Source/XnDeviceSensorV2/XnDeviceSensorInit.h | 2 +-
Source/XnDeviceSensorV2/XnSensorClient.cpp | 2 +-
6 files changed, 16 insertions(+), 3 deletions(-)
- create mode 100644 Platform/Linux/Build/Common/Platform.Powerpc
+ create mode 100644 Platform/Linux/Build/Common/Platform.AArch64
diff --git a/Platform/Linux/Build/Common/CommonDefs.mak b/Platform/Linux/Build/Common/CommonDefs.mak
-index 11cb9d2..f5f50f5 100644
+index f5f50f5..5ec0092 100644
--- a/Platform/Linux/Build/Common/CommonDefs.mak
+++ b/Platform/Linux/Build/Common/CommonDefs.mak
@@ -15,6 +15,8 @@ else ifneq (,$(findstring i386,$(MACHINE)))
HOST_PLATFORM = x86
else ifneq (,$(findstring arm,$(MACHINE)))
HOST_PLATFORM = Arm
-+else ifneq (,$(findstring ppc,$(MACHINE)))
-+ HOST_PLATFORM = Powerpc
++else ifneq (,$(findstring aarch64,$(MACHINE)))
++ HOST_PLATFORM = AArch64
+ else ifneq (,$(findstring ppc,$(MACHINE)))
+ HOST_PLATFORM = Powerpc
else
- DUMMY:=$(error Can't determine host platform)
- endif
-diff --git a/Platform/Linux/Build/Common/Platform.Powerpc b/Platform/Linux/Build/Common/Platform.Powerpc
+diff --git a/Platform/Linux/Build/Common/Platform.AArch64 b/Platform/Linux/Build/Common/Platform.AArch64
new file mode 100644
-index 0000000..8fe48e5
+index 0000000..7a1f193
--- /dev/null
-+++ b/Platform/Linux/Build/Common/Platform.Powerpc
++++ b/Platform/Linux/Build/Common/Platform.AArch64
@@ -0,0 +1,9 @@
-+ifeq "$(CFG)" "Release"
-+
-+ # Optimization level, minus currently buggy optimizing methods (which break bit-exact)
-+ CFLAGS += -O3 -fno-tree-pre -fno-strict-aliasing
-+
-+ # More optimization flags
-+ CFLAGS += -ftree-vectorize -ffast-math -funsafe-math-optimizations -fsingle-precision-constant
-+
-+endif
++ifeq "$(CFG)" "Release"
++
++ # Optimization level, minus currently buggy optimizing methods (which break bit-exact)
++ CFLAGS += -O3 -fno-tree-pre -fno-strict-aliasing
++
++ # More optimization flags
++ CFLAGS += -ftree-vectorize -ffast-math -funsafe-math-optimizations -fsingle-precision-constant
++
++endif
diff --git a/Platform/Linux/CreateRedist/RedistMaker b/Platform/Linux/CreateRedist/RedistMaker
-index 4d58a30..14fc068 100644
+index d0530db..ea5c427 100755
--- a/Platform/Linux/CreateRedist/RedistMaker
+++ b/Platform/Linux/CreateRedist/RedistMaker
@@ -29,6 +29,8 @@ else
PLATFORM="x64" ;;
arm)
PLATFORM="Arm" ;;
-+ ppc)
-+ PLATFORM="Powerpc" ;;
- *)
- echo "Unknown machine type: $MACHINE_TYPE"
- exit 1
++ aarch64)
++ PLATFORM="AArch64" ;;
+ ppc)
+ PLATFORM="Powerpc" ;;
+ arm*)
diff --git a/Source/Utils/XnSensorServer/SensorServer.cpp b/Source/Utils/XnSensorServer/SensorServer.cpp
-index affc7a3..59043e3 100644
+index 59043e3..33dc432 100644
--- a/Source/Utils/XnSensorServer/SensorServer.cpp
+++ b/Source/Utils/XnSensorServer/SensorServer.cpp
@@ -56,7 +56,7 @@ int main(int argc, char* argv[])
nRetVal = XnSensorServerGetGlobalConfigFile(strConfigDir, strConfigFile, XN_FILE_MAX_PATH);
XN_CHECK_RC(nRetVal, "Resolving global config file");
--#if (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_MACOSX)
-+#if (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_LINUX_POWERPC || XN_PLATFORM == XN_PLATFORM_MACOSX)
+-#if (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_LINUX_POWERPC || XN_PLATFORM == XN_PLATFORM_MACOSX)
++#if (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_LINUX_AARCH64 || XN_PLATFORM == XN_PLATFORM_LINUX_POWERPC || XN_PLATFORM == XN_PLATFORM_MACOSX)
xnLogSetOutputFolder("/var/log/primesense/XnSensorServer/");
#endif
diff --git a/Source/XnDeviceSensorV2/XnDeviceSensorInit.h b/Source/XnDeviceSensorV2/XnDeviceSensorInit.h
-index 3de4773..7dbb4cb 100644
+index 7dbb4cb..ab886ed 100644
--- a/Source/XnDeviceSensorV2/XnDeviceSensorInit.h
+++ b/Source/XnDeviceSensorV2/XnDeviceSensorInit.h
@@ -57,7 +57,7 @@
#define XN_SENSOR_USB_MISC_BUFFER_SIZE 0x1000
#define XN_SENSOR_USB_MISC_BUFFERS 1
--#elif (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_MACOSX || XN_PLATFORM == XN_PLATFORM_ANDROID_ARM)
-+#elif (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_LINUX_POWERPC || XN_PLATFORM == XN_PLATFORM_MACOSX || XN_PLATFORM == XN_PLATFORM_ANDROID_ARM)
+-#elif (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_LINUX_POWERPC || XN_PLATFORM == XN_PLATFORM_MACOSX || XN_PLATFORM == XN_PLATFORM_ANDROID_ARM)
++#elif (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_LINUX_AARCH64 || XN_PLATFORM == XN_PLATFORM_LINUX_POWERPC || XN_PLATFORM == XN_PLATFORM_MACOSX || XN_PLATFORM == XN_PLATFORM_ANDROID_ARM)
#define XN_SENSOR_USB_IMAGE_BUFFER_SIZE_MULTIPLIER_ISO 32
#define XN_SENSOR_USB_IMAGE_BUFFER_SIZE_MULTIPLIER_BULK 40
#define XN_SENSOR_USB_IMAGE_BUFFER_SIZE_MULTIPLIER_LOWBAND_ISO 16
diff --git a/Source/XnDeviceSensorV2/XnSensorClient.cpp b/Source/XnDeviceSensorV2/XnSensorClient.cpp
-index a010f3f..441962b 100644
+index 441962b..59c8b8c 100644
--- a/Source/XnDeviceSensorV2/XnSensorClient.cpp
+++ b/Source/XnDeviceSensorV2/XnSensorClient.cpp
@@ -882,7 +882,7 @@ XnStatus XnSensorClient::StartServerProcess()
#if (XN_PLATFORM == XN_PLATFORM_WIN32)
nRetVal = GetModuleDir(strServerDir);
--#elif (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_MACOSX)
-+#elif (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_LINUX_POWERPC || XN_PLATFORM == XN_PLATFORM_MACOSX)
+-#elif (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_LINUX_POWERPC || XN_PLATFORM == XN_PLATFORM_MACOSX)
++#elif (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_LINUX_AARCH64 || XN_PLATFORM == XN_PLATFORM_LINUX_POWERPC || XN_PLATFORM == XN_PLATFORM_MACOSX)
sprintf(strServerDir, "/usr/lib/libopenni-sensor-primesense0");
#endif
+--
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index f12c235..f2de6ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
0008-Move-XnSensorServer-to-usr-lib-libopenni-sensor-prim.patch
0009-Add-support-for-Powerpc-Thanks-to-Roland-Stigge.patch
0010-Add-ARMhf-support.patch
+0011-Add-Arm64-support-thanks-Edmund-Grimley-Evans.patch
--
openni-sensor-primesense packaging
More information about the pkg-multimedia-commits
mailing list