[libfreenect] Add patch for s390 and ppc (rhbz#1143912)
rmattes
rmattes at fedoraproject.org
Wed Mar 4 19:35:08 UTC 2015
commit e222c04c1b771caa8597e076a8f2fab3de6deff6
Author: Rich Mattes <richmattes at gmail.com>
Date: Wed Mar 4 14:27:42 2015 -0500
Add patch for s390 and ppc (rhbz#1143912)
libfreenect.spec | 8 +++-
secarch.patch | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 121 insertions(+), 1 deletion(-)
---
diff --git a/libfreenect.spec b/libfreenect.spec
index 43441ea..fda7430 100644
--- a/libfreenect.spec
+++ b/libfreenect.spec
@@ -8,7 +8,7 @@
Name: libfreenect
Version: 0.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Device driver for the Kinect
License: GPLv2+ or ASL 2.0
URL: http://www.openkinect.org/
@@ -22,6 +22,8 @@ Patch1: %{name}-0.4.1-openni2.patch
Patch2: %{name}-0.4.2-aarch64.patch
# Allow for proper libdir
Patch3: %{name}-0.4.2-libdir.patch
+# BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1143912
+Patch4: secarch.patch
BuildRequires: cmake
BuildRequires: Cython
@@ -99,6 +101,7 @@ rm -rf platform/windows
%patch1 -p0 -b .openni2
%patch2 -p0 -b .aarch64
%patch3 -p0 -b .libdir
+%patch4 -p1 -b .secarch
%build
mkdir build
@@ -189,6 +192,9 @@ mv %{buildroot}%{_libdir}/OpenNI2-FreenectDriver %{buildroot}%{_libdir}/openni2/
%changelog
* Wed Mar 04 2015 Rich Mattes <richmattes at gmail.com> - 0.5.2-1
+- Add patch for s390 and ppc (rhbz#1143912)
+
+* Wed Mar 04 2015 Rich Mattes <richmattes at gmail.com> - 0.5.2-1
- Update to release 0.5.2 (rhbz#1160258)
* Tue Aug 19 2014 Jiri Kastner <jkastner /at/ redhat /dot/ com> - 0.5.0-1
diff --git a/secarch.patch b/secarch.patch
new file mode 100644
index 0000000..0c7308f
--- /dev/null
+++ b/secarch.patch
@@ -0,0 +1,114 @@
+diff -urN libfreenect/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-ppc/OniPlatformLinux-PPC.h libfreenect.new/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-ppc/OniPlatformLinux-PPC.h
+--- libfreenect/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-ppc/OniPlatformLinux-PPC.h 1970-01-01 01:00:00.000000000 +0100
++++ libfreenect.new/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-ppc/OniPlatformLinux-PPC.h 2014-09-18 11:54:01.405363509 +0200
+@@ -0,0 +1,41 @@
++/*****************************************************************************
++* *
++* OpenNI 2.x Alpha *
++* Copyright (C) 2012 PrimeSense Ltd. *
++* *
++* This file is part of OpenNI. *
++* *
++* Licensed under the Apache License, Version 2.0 (the "License"); *
++* you may not use this file except in compliance with the License. *
++* You may obtain a copy of the License at *
++* *
++* http://www.apache.org/licenses/LICENSE-2.0 *
++* *
++* Unless required by applicable law or agreed to in writing, software *
++* distributed under the License is distributed on an "AS IS" BASIS, *
++* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. *
++* See the License for the specific language governing permissions and *
++* limitations under the License. *
++* *
++*****************************************************************************/
++#ifndef _ONI_PLATFORM_LINUX_PPC_H_
++#define _ONI_PLATFORM_LINUX_PPC_H_
++
++// Start with Linux-x86, and override what's different
++#include "../Linux-x86/OniPlatformLinux-x86.h"
++
++//---------------------------------------------------------------------------
++// Platform Basic Definition
++//---------------------------------------------------------------------------
++#undef ONI_PLATFORM
++#undef ONI_PLATFORM_STRING
++#define ONI_PLATFORM ONI_PLATFORM_LINUX_PPC
++#define ONI_PLATFORM_STRING "Linux-PowerPC"
++
++#if !(defined(__powerpc64__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
++#undef ONI_PLATFORM_ENDIAN_TYPE
++#define ONI_PLATFORM_ENDIAN_TYPE ONI_PLATFORM_IS_BIG_ENDIAN
++#endif
++
++#endif //_ONI_PLATFORM_LINUX_PPC_H_
++
+diff -urN libfreenect/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-s390/OniPlatformLinux-s390.h libfreenect.new/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-s390/OniPlatformLinux-s390.h
+--- libfreenect/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-s390/OniPlatformLinux-s390.h 1970-01-01 01:00:00.000000000 +0100
++++ libfreenect.new/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/Linux-s390/OniPlatformLinux-s390.h 2014-09-18 11:55:06.169556389 +0200
+@@ -0,0 +1,42 @@
++/*****************************************************************************
++* *
++* OpenNI 2.x Alpha *
++* Copyright (C) 2012 PrimeSense Ltd. *
++* *
++* This file is part of OpenNI. *
++* *
++* Licensed under the Apache License, Version 2.0 (the "License"); *
++* you may not use this file except in compliance with the License. *
++* You may obtain a copy of the License at *
++* *
++* http://www.apache.org/licenses/LICENSE-2.0 *
++* *
++* Unless required by applicable law or agreed to in writing, software *
++* distributed under the License is distributed on an "AS IS" BASIS, *
++* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. *
++* See the License for the specific language governing permissions and *
++* limitations under the License. *
++* *
++*****************************************************************************/
++#ifndef _ONI_PLATFORM_LINUX_s390_H_
++#define _ONI_PLATFORM_LINUX_s390_H_
++
++// Start with Linux-x86, and override what's different
++#include "../Linux-x86/OniPlatformLinux-x86.h"
++
++//---------------------------------------------------------------------------
++// Platform Basic Definition
++//---------------------------------------------------------------------------
++#undef ONI_PLATFORM
++#undef ONI_PLATFORM_STRING
++#define ONI_PLATFORM ONI_PLATFORM_LINUX_S390
++#define ONI_PLATFORM_STRING "Linux-s390"
++
++#undef ONI_PLATFORM_ENDIAN_TYPE
++#define ONI_PLATFORM_ENDIAN_TYPE ONI_PLATFORM_IS_BIG_ENDIAN
++
++#undef ONI_DEFAULT_MEM_ALIGN
++#define ONI_DEFAULT_MEM_ALIGN 8
++
++#endif //_ONI_PLATFORM_LINUX_s390_H_
++
+diff -urN libfreenect/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/OniPlatform.h libfreenect.new/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/OniPlatform.h
+--- libfreenect/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/OniPlatform.h 2014-09-18 11:51:35.428923550 +0200
++++ libfreenect.new/OpenNI2-FreenectDriver/extern/OpenNI-Linux-x64-2.2.0.33/Include/OniPlatform.h 2014-09-18 11:52:50.242149667 +0200
+@@ -27,6 +27,8 @@
+ #define ONI_PLATFORM_LINUX_ARM 3
+ #define ONI_PLATFORM_MACOSX 4
+ #define ONI_PLATFORM_ANDROID_ARM 5
++#define ONI_PLATFORM_LINUX_PPC 6
++#define ONI_PLATFORM_LINUX_S390 7
+
+ #if (defined _WIN32)
+ # ifndef RC_INVOKED
+@@ -41,6 +43,10 @@
+ # include "Linux-x86/OniPlatformLinux-x86.h"
+ #elif (__linux__ && (__arm__ || __aarch64__))
+ # include "Linux-Arm/OniPlatformLinux-Arm.h"
++#elif (__linux__ && (__powerpc__ || __powerpc64__))
++# include "Linux-ppc/OniPlatformLinux-PPC.h"
++#elif (__linux__ && (__s390__ || __s390x__ ))
++# include "Linux-s390/OniPlatformLinux-s390.h"
+ #elif _ARC
+ # include "ARC/OniPlaformARC.h"
+ #elif (__APPLE__)
More information about the scm-commits
mailing list