[SCM] kodi/master: Fix GetKernelBitness() on s390x to fix FTBFS on that arch

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1ab3626b1f4fa55444a309b45d8c9bfeac4bb414
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Mon Mar 28 17:42:45 2016 +0200

    Fix GetKernelBitness() on s390x to fix FTBFS on that arch

diff --git a/debian/patches/0004-core-Make-GetKernelBitness-return-64-for-s390x.patch b/debian/patches/0004-core-Make-GetKernelBitness-return-64-for-s390x.patch
new file mode 100644
index 0000000..4934365
--- /dev/null
+++ b/debian/patches/0004-core-Make-GetKernelBitness-return-64-for-s390x.patch
@@ -0,0 +1,25 @@
+From fff68ada161baeb2c544bfdddbc01aab382cd678 Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint at balintreczey.hu>
+Date: Mon, 28 Mar 2016 17:39:32 +0200
+Subject: [PATCH 4/4] [core] Make GetKernelBitness() return 64 for s390x
+
+---
+ xbmc/utils/SystemInfo.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
+index c79e0b6..09d720e 100644
+--- a/xbmc/utils/SystemInfo.cpp
++++ b/xbmc/utils/SystemInfo.cpp
+@@ -944,7 +944,7 @@ int CSysInfo::GetKernelBitness(void)
+     {
+       std::string machine(un.machine);
+       if (machine == "x86_64" || machine == "amd64" || machine == "arm64" || machine == "aarch64" || machine == "ppc64" ||
+-          machine == "ia64" || machine == "mips64")
++          machine == "ia64" || machine == "mips64" || machine == "s390x")
+         kernelBitness = 64;
+       else
+         kernelBitness = 32;
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 58b4f00..adbbc22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 0001-arm64-Fix-build-breakages-due-to-architecture-specif.patch
 0002-core-added-arm64-support-to-GetKernelCpuFamily.patch
 0003-core-added-s390x-support-to-system-info.patch
+0004-core-Make-GetKernelBitness-return-64-for-s390x.patch
 02_allow_all_arches.patch
 03-privacy.patch
 04-differentiate-from-vanilla-Kodi.patch

-- 
kodi packaging