[SCM] openni-sensor-primesense/master: Add support for Powerpc Closes: #734144 (Thanks to Roland Stigge)
jspricke-guest at users.alioth.debian.org
jspricke-guest at users.alioth.debian.org
Mon May 11 13:48:54 UTC 2015
The following commit has been merged in the master branch:
commit 2af81754c3afc552a8efe492d2e3f918ccbf01f2
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Mon May 11 15:48:01 2015 +0200
Add support for Powerpc Closes: #734144 (Thanks to Roland Stigge)
diff --git a/Platform/Linux/Build/Common/CommonDefs.mak b/Platform/Linux/Build/Common/CommonDefs.mak
index 11cb9d2..f5f50f5 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
DUMMY:=$(error Can't determine host platform)
endif
diff --git a/Platform/Linux/Build/Common/Platform.Arm b/Platform/Linux/Build/Common/Platform.Powerpc
similarity index 68%
copy from Platform/Linux/Build/Common/Platform.Arm
copy to Platform/Linux/Build/Common/Platform.Powerpc
index 32cc34d..8fe48e5 100644
--- a/Platform/Linux/Build/Common/Platform.Arm
+++ b/Platform/Linux/Build/Common/Platform.Powerpc
@@ -1,8 +1,5 @@
ifeq "$(CFG)" "Release"
- # Hardware specifying flags
- CFLAGS += -march=armv7-a -mtune=cortex-a8 -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
diff --git a/Platform/Linux/CreateRedist/RedistMaker b/Platform/Linux/CreateRedist/RedistMaker
index cb4489c..9c1ffa0 100644
--- 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
diff --git a/Source/Utils/XnSensorServer/SensorServer.cpp b/Source/Utils/XnSensorServer/SensorServer.cpp
index affc7a3..59043e3 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)
xnLogSetOutputFolder("/var/log/primesense/XnSensorServer/");
#endif
diff --git a/Source/XnDeviceSensorV2/XnDeviceSensorInit.h b/Source/XnDeviceSensorV2/XnDeviceSensorInit.h
index 3de4773..7dbb4cb 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)
#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 7907999..7c50d45 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)
sprintf(strServerDir, "/usr/bin");
#endif
--
openni-sensor-primesense packaging
More information about the pkg-multimedia-commits
mailing list