[SCM] kodi/master: Fix build on s390x

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ad826a83ad26430a23cd75ff8d087b363e624946
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sun Aug 30 10:17:23 2015 +0200

    Fix build on s390x

diff --git a/debian/patches/0001-arm64-Fix-build-breakages-due-to-architecture-specif.patch b/debian/patches/08-fix-s390x-build.patch
similarity index 52%
copy from debian/patches/0001-arm64-Fix-build-breakages-due-to-architecture-specif.patch
copy to debian/patches/08-fix-s390x-build.patch
index 77310f9..f6299b5 100644
--- a/debian/patches/0001-arm64-Fix-build-breakages-due-to-architecture-specif.patch
+++ b/debian/patches/08-fix-s390x-build.patch
@@ -1,83 +1,59 @@
-From 78b7376fcf75fa4f2689f077df90b5ba89b862f9 Mon Sep 17 00:00:00 2001
-From: Edmund Grimley Evans <edmund.grimley.evans at gmail.com>
-Date: Wed, 26 Aug 2015 08:00:58 +0200
-Subject: [PATCH] arm64: Fix build breakages due to architecture specific
- guards
-
-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=796532
----
- xbmc/cores/DllLoader/DllLoader.h            | 2 +-
- xbmc/cores/DllLoader/ldt_keeper.c           | 2 +-
- xbmc/cores/VideoRenderers/LinuxRendererGL.h | 2 +-
- xbmc/threads/Atomics.cpp                    | 2 +-
- xbmc/utils/MathUtils.h                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
+Description: Fix build on s390x
+ Upstream is most probably not interested in this port thus I have not
+ forwarded the patch.
+ .
+Author: Balint Reczey <balint at balintreczey.hu>
+Forwarded: not-needed
 
 diff --git a/xbmc/cores/DllLoader/DllLoader.h b/xbmc/cores/DllLoader/DllLoader.h
-index 070aee6..e669203 100644
+index e669203..30dde17 100644
 --- a/xbmc/cores/DllLoader/DllLoader.h
 +++ b/xbmc/cores/DllLoader/DllLoader.h
 @@ -23,7 +23,7 @@
  #include "coffldr.h"
  #include "LibraryLoader.h"
  
--#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__mips__)
-+#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__mips__) && !defined(__aarch64__)
+-#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__mips__) && !defined(__aarch64__)
++#if defined(__linux__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__mips__) && !defined(__aarch64__) && !defined(__s390x__)
  #define USE_LDT_KEEPER
  #include "ldt_keeper.h"
  #endif
 diff --git a/xbmc/cores/DllLoader/ldt_keeper.c b/xbmc/cores/DllLoader/ldt_keeper.c
-index 8af9a86..1c0cdb2 100644
+index 1c0cdb2..397389a 100644
 --- a/xbmc/cores/DllLoader/ldt_keeper.c
 +++ b/xbmc/cores/DllLoader/ldt_keeper.c
 @@ -19,7 +19,7 @@
   */
  
  //#ifndef __powerpc__
--#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__mips__)
-+#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__mips__) && !defined(__aarch64__)
+-#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__mips__) && !defined(__aarch64__)
++#if !defined(__powerpc__) && !defined(__ppc__) && !defined(__arm__) && !defined(__mips__) && !defined(__aarch64__) && !defined(__s390x__)
  
  #include "ldt_keeper.h"
  
 diff --git a/xbmc/cores/VideoRenderers/LinuxRendererGL.h b/xbmc/cores/VideoRenderers/LinuxRendererGL.h
-index fcdea8d..5a3e3df 100644
+index 5a3e3df..6068c47 100644
 --- a/xbmc/cores/VideoRenderers/LinuxRendererGL.h
 +++ b/xbmc/cores/VideoRenderers/LinuxRendererGL.h
 @@ -323,7 +323,7 @@ protected:
  
  
  inline int NP2( unsigned x ) {
--#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__) && !defined(__mips__)
-+#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__) && !defined(__mips__) && !defined(__aarch64__)
+-#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__) && !defined(__mips__) && !defined(__aarch64__)
++#if defined(TARGET_POSIX) && !defined(__POWERPC__) && !defined(__PPC__) && !defined(__arm__) && !defined(__mips__) && !defined(__aarch64__) && !defined(__s390x__)
    // If there are any issues compiling this, just append a ' && 0'
    // to the above to make it '#if defined(TARGET_POSIX) && 0'
  
-diff --git a/xbmc/threads/Atomics.cpp b/xbmc/threads/Atomics.cpp
-index 417b2b6..c172867 100644
---- a/xbmc/threads/Atomics.cpp
-+++ b/xbmc/threads/Atomics.cpp
-@@ -106,7 +106,7 @@ long cas(volatile long *pAddr, long expectedVal, long swapVal)
- ///////////////////////////////////////////////////////////////////////////
- long long cas2(volatile long long* pAddr, long long expectedVal, long long swapVal)
- {
--#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__)// PowerPC and ARM
-+#if defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || defined(__aarch64__) // PowerPC and ARM
- // Not available/required
- // Hack to allow compilation
-   throw "cas2 is not implemented";
 diff --git a/xbmc/utils/MathUtils.h b/xbmc/utils/MathUtils.h
-index 21b6a37..1039ba9 100644
+index a925480..180652d 100644
 --- a/xbmc/utils/MathUtils.h
 +++ b/xbmc/utils/MathUtils.h
 @@ -35,7 +35,7 @@
  #if defined(__ppc__) || \
      defined(__powerpc__) || \
      defined(__mips__) || \
--    defined(__arm__)
-+    defined(__arm__) || defined(__aarch64__)
+-    defined(__arm__) || defined(__aarch64__)
++    defined(__arm__) || defined(__aarch64__) || defined(__s390x__)
    #define DISABLE_MATHUTILS_ASM_ROUND_INT
  #endif
  
--- 
-2.1.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 8de2c4d..aa300da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,6 @@
 05-dont-require-neon-on-arm-armhf.patch
 06-use-external-libraries.patch
 07-use-system-groovy.patch
+08-fix-s390x-build.patch
 09-use-correct-ftgl.h
 10-dont-use-omitted-files.patch

-- 
kodi packaging