[SCM] openni-sensor-primesense/master: Add patch for mips build
jspricke at users.alioth.debian.org
jspricke at users.alioth.debian.org
Mon Sep 19 20:45:00 UTC 2016
The following commit has been merged in the master branch:
commit c18d9bb3b4bf531698a208f78421ccced70be402
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Mon Sep 19 21:25:21 2016 +0200
Add patch for mips build
Thanks: Daniel Knezevic
Closes: #838295
diff --git a/debian/patches/0010-Add-ARMhf-support.patch b/debian/patches/0010-Add-ARMhf-support.patch
index b275a80..a0276f4 100644
--- a/debian/patches/0010-Add-ARMhf-support.patch
+++ b/debian/patches/0010-Add-ARMhf-support.patch
@@ -1,7 +1,6 @@
-From a9b5a6bde1bb7ccf5a3440f19f2ff9580dbbc8e2 Mon Sep 17 00:00:00 2001
From: Joe Burmeister <joe at suaveairapps.co.uk>
Date: Wed, 15 Oct 2014 12:00:05 +0000
-Subject: [PATCH 1/2] Add ARMhf support.
+Subject: Add ARMhf support.
---
Platform/Linux/Build/Common/Platform.Arm | 2 +-
@@ -22,7 +21,7 @@ index 32cc34d..ecc5540 100644
# Optimization level, minus currently buggy optimizing methods (which break bit-exact)
CFLAGS += -O3 -fno-tree-pre -fno-strict-aliasing
diff --git a/Platform/Linux/CreateRedist/RedistMaker b/Platform/Linux/CreateRedist/RedistMaker
-index 14fc068..d0530db 100755
+index 14fc068..d0530db 100644
--- a/Platform/Linux/CreateRedist/RedistMaker
+++ b/Platform/Linux/CreateRedist/RedistMaker
@@ -31,6 +31,8 @@ else
@@ -34,6 +33,3 @@ index 14fc068..d0530db 100755
*)
echo "Unknown machine type: $MACHINE_TYPE"
exit 1
---
-2.1.4
-
diff --git a/debian/patches/0011-Add-Arm64-support-thanks-Edmund-Grimley-Evans.patch b/debian/patches/0011-Add-Arm64-support-thanks-Edmund-Grimley-Evans.patch
index e82c4c3..921e924 100644
--- a/debian/patches/0011-Add-Arm64-support-thanks-Edmund-Grimley-Evans.patch
+++ b/debian/patches/0011-Add-Arm64-support-thanks-Edmund-Grimley-Evans.patch
@@ -1,7 +1,6 @@
-From f98567d7aa83c26d5f8dc394efce98c390fc672f Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Mon, 8 Jun 2015 14:53:34 +0200
-Subject: [PATCH 2/2] Add Arm64 support (thanks Edmund Grimley Evans)
+Subject: Add Arm64 support (thanks Edmund Grimley Evans)
---
Platform/Linux/Build/Common/CommonDefs.mak | 2 ++
@@ -42,7 +41,7 @@ index 0000000..7a1f193
+
+endif
diff --git a/Platform/Linux/CreateRedist/RedistMaker b/Platform/Linux/CreateRedist/RedistMaker
-index d0530db..ea5c427 100755
+index d0530db..ea5c427 100644
--- a/Platform/Linux/CreateRedist/RedistMaker
+++ b/Platform/Linux/CreateRedist/RedistMaker
@@ -29,6 +29,8 @@ else
@@ -93,6 +92,3 @@ index 441962b..59c8b8c 100644
sprintf(strServerDir, "/usr/lib/libopenni-sensor-primesense0");
#endif
---
-2.1.4
-
diff --git a/debian/patches/0011-Add-Arm64-support-thanks-Edmund-Grimley-Evans.patch b/debian/patches/0012-Add-mips-support-thanks-Daniel-Knezevic.patch
similarity index 70%
copy from debian/patches/0011-Add-Arm64-support-thanks-Edmund-Grimley-Evans.patch
copy to debian/patches/0012-Add-mips-support-thanks-Daniel-Knezevic.patch
index e82c4c3..bfe3b44 100644
--- a/debian/patches/0011-Add-Arm64-support-thanks-Edmund-Grimley-Evans.patch
+++ b/debian/patches/0012-Add-mips-support-thanks-Daniel-Knezevic.patch
@@ -1,98 +1,94 @@
-From f98567d7aa83c26d5f8dc394efce98c390fc672f Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Mon, 8 Jun 2015 14:53:34 +0200
-Subject: [PATCH 2/2] Add Arm64 support (thanks Edmund Grimley Evans)
+Date: Mon, 19 Sep 2016 21:23:45 +0200
+Subject: Add mips support (thanks Daniel Knezevic)
---
Platform/Linux/Build/Common/CommonDefs.mak | 2 ++
- Platform/Linux/Build/Common/Platform.AArch64 | 9 +++++++++
+ Platform/Linux/Build/Common/Platform.Mips | 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.AArch64
+ create mode 100644 Platform/Linux/Build/Common/Platform.Mips
diff --git a/Platform/Linux/Build/Common/CommonDefs.mak b/Platform/Linux/Build/Common/CommonDefs.mak
-index f5f50f5..5ec0092 100644
+index 5ec0092..5f9e832 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 aarch64,$(MACHINE)))
-+ HOST_PLATFORM = AArch64
+@@ -19,6 +19,8 @@ else ifneq (,$(findstring aarch64,$(MACHINE)))
+ HOST_PLATFORM = AArch64
else ifneq (,$(findstring ppc,$(MACHINE)))
HOST_PLATFORM = Powerpc
++else ifneq (,$(findstring mips,$(MACHINE)))
++ HOST_PLATFORM = Mips
else
-diff --git a/Platform/Linux/Build/Common/Platform.AArch64 b/Platform/Linux/Build/Common/Platform.AArch64
+ DUMMY:=$(error Can't determine host platform)
+ endif
+diff --git a/Platform/Linux/Build/Common/Platform.Mips b/Platform/Linux/Build/Common/Platform.Mips
new file mode 100644
-index 0000000..7a1f193
+index 0000000..8fe48e5
--- /dev/null
-+++ b/Platform/Linux/Build/Common/Platform.AArch64
++++ b/Platform/Linux/Build/Common/Platform.Mips
@@ -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 d0530db..ea5c427 100755
+index ea5c427..919fb48 100644
--- a/Platform/Linux/CreateRedist/RedistMaker
+++ b/Platform/Linux/CreateRedist/RedistMaker
-@@ -29,6 +29,8 @@ else
- PLATFORM="x64" ;;
- arm)
- PLATFORM="Arm" ;;
-+ aarch64)
-+ PLATFORM="AArch64" ;;
- ppc)
+@@ -35,6 +35,8 @@ else
PLATFORM="Powerpc" ;;
arm*)
+ PLATFORM="Arm" ;;
++ mips*)
++ PLATFORM="Mips" ;;
+ *)
+ echo "Unknown machine type: $MACHINE_TYPE"
+ exit 1
diff --git a/Source/Utils/XnSensorServer/SensorServer.cpp b/Source/Utils/XnSensorServer/SensorServer.cpp
-index 59043e3..33dc432 100644
+index 33dc432..6f30214 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_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)
+-#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)
++#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 || XN_PLATFORM == XN_PLATFORM_LINUX_MIPS)
xnLogSetOutputFolder("/var/log/primesense/XnSensorServer/");
#endif
diff --git a/Source/XnDeviceSensorV2/XnDeviceSensorInit.h b/Source/XnDeviceSensorV2/XnDeviceSensorInit.h
-index 7dbb4cb..ab886ed 100644
+index ab886ed..d867347 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_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)
+-#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)
++#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 || XN_PLATFORM == XN_PLATFORM_LINUX_MIPS)
#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 441962b..59c8b8c 100644
+index 59c8b8c..326e925 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_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)
+-#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)
++#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_LINUX_MIPS)
sprintf(strServerDir, "/usr/lib/libopenni-sensor-primesense0");
#endif
---
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
index f2de6ef..8f33b95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@
0009-Add-support-for-Powerpc-Thanks-to-Roland-Stigge.patch
0010-Add-ARMhf-support.patch
0011-Add-Arm64-support-thanks-Edmund-Grimley-Evans.patch
+0012-Add-mips-support-thanks-Daniel-Knezevic.patch
--
openni-sensor-primesense packaging
More information about the pkg-multimedia-commits
mailing list