Source: openni Followup-For: Bug #734110 User: debian-powe...@lists.debian.org
I used Roland's patch to produce a debdiff which is applicable. I also included a verification so it checks the endiannes, since there is also ppc64el to be taken into account. The debdiff is attached. Regards. Fernando -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: ppc64el (ppc64le) Kernel: Linux 3.13-1-powerpc64le (SMP w/16 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: sysvinit (via /sbin/init)
diff -Nru openni-1.5.4.0/debian/changelog openni-1.5.4.0/debian/changelog --- openni-1.5.4.0/debian/changelog 2014-12-07 19:22:15.000000000 +0000 +++ openni-1.5.4.0/debian/changelog 2015-03-13 14:35:43.000000000 +0000 @@ -1,3 +1,9 @@ +openni (1.5.4.0-9ppc64el1) UNRELEASED; urgency=medium + + * Enabled ppc + + -- Fernando Seiti Furusato <ferse...@br.ibm.com> Fri, 13 Mar 2015 14:35:40 +0000 + openni (1.5.4.0-9) unstable; urgency=medium [ Jochen Sprickerhof ] diff -Nru openni-1.5.4.0/debian/patches/ppc.patch openni-1.5.4.0/debian/patches/ppc.patch --- openni-1.5.4.0/debian/patches/ppc.patch 1970-01-01 00:00:00.000000000 +0000 +++ openni-1.5.4.0/debian/patches/ppc.patch 2015-03-13 14:35:18.000000000 +0000 @@ -0,0 +1,170 @@ +--- /dev/null ++++ b/Include/Linux-Powerpc/XnPlatformLinux-Powerpc.h +@@ -0,0 +1,44 @@ ++/**************************************************************************** ++* * ++* OpenNI 1.x Alpha * ++* Copyright (C) 2011 PrimeSense Ltd. * ++* * ++* This file is part of OpenNI. * ++* * ++* OpenNI is free software: you can redistribute it and/or modify * ++* it under the terms of the GNU Lesser General Public License as published * ++* by the Free Software Foundation, either version 3 of the License, or * ++* (at your option) any later version. * ++* * ++* OpenNI is distributed in the hope that it will be useful, * ++* but WITHOUT ANY WARRANTY; without even the implied warranty of * ++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * ++* GNU Lesser General Public License for more details. * ++* * ++* You should have received a copy of the GNU Lesser General Public License * ++* along with OpenNI. If not, see <http://www.gnu.org/licenses/>. * ++* * ++****************************************************************************/ ++#ifndef _XN_PLATFORM_LINUX_POWERPC_H_ ++#define _XN_PLATFORM_LINUX_POWERPC_H_ ++ ++// Start with Linux-x86, and override what's different ++#include "../Linux-x86/XnPlatformLinux-x86.h" ++ ++//--------------------------------------------------------------------------- ++// Platform Basic Definition ++//--------------------------------------------------------------------------- ++#undef XN_PLATFORM ++#undef XN_PLATFORM_STRING ++#undef XN_PLATFORM_ENDIAN_TYPE ++#define XN_PLATFORM XN_PLATFORM_LINUX_POWERPC ++#define XN_PLATFORM_STRING "Linux-Powerpc" ++ ++#ifdef __BIG_ENDIAN__ ++#define XN_PLATFORM_ENDIAN_TYPE XN_PLATFORM_IS_BIG_ENDIAN ++#else ++#define XN_PLATFORM_ENDIAN_TYPE XN_PLATFORM_IS_LITTLE_ENDIAN ++ ++#endif // __BIG_ENDIAN__ ++#endif //_XN_PLATFORM_LINUX_POWERPC_H_ ++ +--- a/Include/XnOS.h ++++ b/Include/XnOS.h +@@ -44,7 +44,7 @@ + //--------------------------------------------------------------------------- + #if (XN_PLATFORM == XN_PLATFORM_WIN32) + #include "Win32/XnOSWin32.h" +-#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_MACOSX || XN_PLATFORM == XN_PLATFORM_ANDROID_ARM || XN_PLATFORM == XN_PLATFORM_LINUX_POWERPC) + #include "Linux-x86/XnOSLinux-x86.h" + #elif defined(_ARC) + #include "ARC/XnOSARC.h" +--- a/Include/XnPlatform.h ++++ b/Include/XnPlatform.h +@@ -35,6 +35,7 @@ + #define XN_PLATFORM_LINUX_ARM 7 + #define XN_PLATFORM_MACOSX 8 + #define XN_PLATFORM_ANDROID_ARM 9 ++#define XN_PLATFORM_LINUX_POWERPC 10 + + #define XN_PLATFORM_IS_LITTLE_ENDIAN 1 + #define XN_PLATFORM_IS_BIG_ENDIAN 2 +@@ -66,6 +67,8 @@ + #include "Linux-x86/XnPlatformLinux-x86.h" + #elif (__linux__ && __arm__) + #include "Linux-Arm/XnPlatformLinux-Arm.h" ++#elif (__linux__ && __powerpc__) ++ #include "Linux-Powerpc/XnPlatformLinux-Powerpc.h" + #elif _ARC + #include "ARC/XnPlatformARC.h" + #elif (__APPLE__) +--- a/Include/XnUSBDevice.h ++++ b/Include/XnUSBDevice.h +@@ -48,7 +48,7 @@ + #define USB_DT_DEVICE_SIZE 0 + #define USB_DT_DEVICE 0 + +-#elif (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM) ++#elif (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_LINUX_POWERPC) + #include <linux/usb/ch9.h> + typedef struct usb_endpoint_descriptor XnUSBEndpointDescriptor; + typedef struct usb_interface_descriptor XnUSBInterfaceDescriptor; +--- a/Platform/Linux/Build/Common/CommonDefs.mak ++++ b/Platform/Linux/Build/Common/CommonDefs.mak +@@ -18,6 +18,8 @@ + 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 +@@ -59,4 +61,4 @@ + # platform specific args + include $(COMMON_MAK_DIR)Platform.$(PLATFORM) + +-endif # _COMMON_DEFS_MAKE_ +\ No newline at end of file ++endif # _COMMON_DEFS_MAKE_ +--- /dev/null ++++ b/Platform/Linux/Build/Common/Platform.Powerpc +@@ -0,0 +1,11 @@ ++export GLUT_SUPPORTED=1 ++ ++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 +--- a/Platform/Linux/CreateRedist/Redist_OpenNi.py ++++ b/Platform/Linux/CreateRedist/Redist_OpenNi.py +@@ -186,6 +186,8 @@ + PLATFORM = "x86" + elif machinetype[:3] == "arm": + PLATFORM = "Arm" ++ elif machinetype[:3] == "ppc": ++ PLATFORM = "Powerpc" + else: + print "Unknown platform:", machinetype + finish_script(1) +@@ -333,6 +335,7 @@ + + shutil.copytree("../../Include/Linux-x86", REDIST_DIR + "/Include/Linux-x86") + shutil.copytree("../../Include/Linux-Arm", REDIST_DIR + "/Include/Linux-Arm") ++shutil.copytree("../../Include/Linux-Powerpc", REDIST_DIR + "/Include/Linux-Powerpc") + shutil.copytree("../../Include/MacOSX", REDIST_DIR + "/Include/MacOSX") + shutil.copytree("Build/Common", REDIST_DIR + "/Samples/Build/Common") + +--- a/Samples/NiViewer/NiViewer.cpp ++++ b/Samples/NiViewer/NiViewer.cpp +@@ -49,7 +49,7 @@ + // -------------------------------- + #include <XnCppWrapper.h> + +-#if (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM) ++#if (XN_PLATFORM == XN_PLATFORM_LINUX_X86 || XN_PLATFORM == XN_PLATFORM_LINUX_ARM || XN_PLATFORM == XN_PLATFORM_LINUX_POWERPC) + #define UNIX + #define GLX_GLXEXT_LEGACY + #endif +@@ -79,7 +79,7 @@ + #if (XN_PLATFORM == XN_PLATFORM_WIN32) + #include <conio.h> + #include <direct.h> +-#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_MACOSX || XN_PLATFORM_LINUX_POWERPC) + #define _getch() getchar() + #endif + +--- a/Source/OpenNI/XnOpenNI.cpp ++++ b/Source/OpenNI/XnOpenNI.cpp +@@ -7062,7 +7062,7 @@ + #define XN_OPEN_NI_FILES_LOCATION "\\Data\\" + #elif (CE4100) + #define XN_OPEN_NI_FILES_LOCATION "/usr/etc/ni/" +-#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_MACOSX || XN_PLATFORM == XN_PLATFORM_LINUX_POWERPC) + #define XN_OPEN_NI_FILES_LOCATION "/var/lib/ni/" + #elif (XN_PLATFORM == XN_PLATFORM_ANDROID_ARM) + #define XN_OPEN_NI_FILES_LOCATION "/data/ni/" diff -Nru openni-1.5.4.0/debian/patches/series openni-1.5.4.0/debian/patches/series --- openni-1.5.4.0/debian/patches/series 2014-02-25 16:26:06.000000000 +0000 +++ openni-1.5.4.0/debian/patches/series 2015-03-13 14:28:44.000000000 +0000 @@ -10,3 +10,4 @@ #0010-Including-call-to-libusb_detach_kernel_driver-to-det.patch 0011-do-not-compile-windows-chm-file.patch 0012-Remove-j-from-make-flags-fixes-bug-on-arm.patch +ppc.patch
_______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
