[SCM] openni/master: Fix ppc patch

[jspricke-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6079dbf8fa4b4db1cbf29c6743d06dd59415b37c
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Sun May 17 22:15:10 2015 +0200

    Fix ppc patch

diff --git a/debian/changelog b/debian/changelog
index a8f5b50..8f52701 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 openni (1.5.4.0-10) unstable; urgency=medium
 
   [ Fernando Seiti Furusato ]
-  * Enabled ppc
+  * Enabled ppc (Closes: #734110). Thanks Roland Stigge and Fernando Seiti
+    Furusato.
 
  -- Jochen Sprickerhof <debian at jochen.sprickerhof.de>  Sun, 17 May 2015 22:12:06 +0200
 
diff --git a/debian/patches/ppc.patch b/debian/patches/0013-Enabled-ppc.patch
similarity index 88%
rename from debian/patches/ppc.patch
rename to debian/patches/0013-Enabled-ppc.patch
index fc98c7b..43e0a9d 100644
--- a/debian/patches/ppc.patch
+++ b/debian/patches/0013-Enabled-ppc.patch
@@ -1,3 +1,22 @@
+From ccc8187b172049ff28ce14b322574f058529a5d5 Mon Sep 17 00:00:00 2001
+From: Roland Stigge <stigge at antcom.de>
+Date: Sun, 17 May 2015 22:23:08 +0200
+Subject: [PATCH] Enabled ppc
+
+---
+ Include/Linux-Powerpc/XnPlatformLinux-Powerpc.h | 44 +++++++++++++++++++++++++
+ Include/XnOS.h                                  |  2 +-
+ Include/XnPlatform.h                            |  3 ++
+ Include/XnUSBDevice.h                           |  2 +-
+ Platform/Linux/Build/Common/CommonDefs.mak      |  4 ++-
+ Platform/Linux/Build/Common/Platform.Powerpc    | 11 +++++++
+ Platform/Linux/CreateRedist/Redist_OpenNi.py    |  3 ++
+ Samples/NiViewer/NiViewer.cpp                   |  4 +--
+ Source/OpenNI/XnOpenNI.cpp                      |  2 +-
+ 9 files changed, 69 insertions(+), 6 deletions(-)
+ create mode 100644 Include/Linux-Powerpc/XnPlatformLinux-Powerpc.h
+ create mode 100644 Platform/Linux/Build/Common/Platform.Powerpc
+
 --- /dev/null
 +++ b/Include/Linux-Powerpc/XnPlatformLinux-Powerpc.h
 @@ -0,0 +1,44 @@
@@ -78,14 +97,14 @@
 --- 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;
+ 	#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 @@
@@ -121,22 +140,22 @@
 --- 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)
+         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")
- 
+ 
+ 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 @@
diff --git a/debian/patches/series b/debian/patches/series
index 862e4f3..3a95ce0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +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
+0013-Enabled-ppc.patch

-- 
openni packaging