[SCM] kodi/master: Fix system info for s390x and arm64 architectures

[rbalint at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit efc6cdba559d0701583352839e62c046b0b6e334
Author: Balint Reczey <balint at balintreczey.hu>
Date:   Sat Mar 26 02:09:40 2016 +0100

    Fix system info for s390x and arm64 architectures

diff --git a/debian/patches/0002-core-added-arm64-support-to-GetKernelCpuFamily.patch b/debian/patches/0002-core-added-arm64-support-to-GetKernelCpuFamily.patch
new file mode 100644
index 0000000..8c2d395
--- /dev/null
+++ b/debian/patches/0002-core-added-arm64-support-to-GetKernelCpuFamily.patch
@@ -0,0 +1,25 @@
+From 66cc42b894d26d05bfaa147e30ba5c10b5d16390 Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint at balintreczey.hu>
+Date: Sat, 26 Mar 2016 01:55:49 +0100
+Subject: [PATCH 2/3] [core] added arm64 support to GetKernelCpuFamily()
+
+---
+ 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 eb85abb..fcbfec3 100644
+--- a/xbmc/utils/SystemInfo.cpp
++++ b/xbmc/utils/SystemInfo.cpp
+@@ -991,7 +991,7 @@ const std::string& CSysInfo::GetKernelCpuFamily(void)
+     if (uname(&un) == 0)
+     {
+       std::string machine(un.machine);
+-      if (machine.compare(0, 3, "arm", 3) == 0)
++      if (machine.compare(0, 3, "arm", 3) == 0 || machine.compare(0, 7, "aarch64", 7) == 0)
+         kernelCpuFamily = "ARM";
+       else if (machine.compare(0, 4, "mips", 4) == 0)
+         kernelCpuFamily = "MIPS";
+-- 
+2.1.4
+
diff --git a/debian/patches/0003-core-added-s390x-support-to-system-info.patch b/debian/patches/0003-core-added-s390x-support-to-system-info.patch
new file mode 100644
index 0000000..c52d1fc
--- /dev/null
+++ b/debian/patches/0003-core-added-s390x-support-to-system-info.patch
@@ -0,0 +1,43 @@
+From 1db09e800ffd1691d93bc512210d564a2e0ee7f7 Mon Sep 17 00:00:00 2001
+From: Balint Reczey <balint at balintreczey.hu>
+Date: Sat, 26 Mar 2016 02:07:59 +0100
+Subject: [PATCH 3/3] [core] added s390x support to system info
+
+---
+ xbmc/utils/SystemInfo.cpp | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
+index fcbfec3..c79e0b6 100644
+--- a/xbmc/utils/SystemInfo.cpp
++++ b/xbmc/utils/SystemInfo.cpp
+@@ -997,6 +997,8 @@ const std::string& CSysInfo::GetKernelCpuFamily(void)
+         kernelCpuFamily = "MIPS";
+       else if (machine.compare(0, 4, "i686", 4) == 0 || machine == "i386" || machine == "amd64" ||  machine.compare(0, 3, "x86", 3) == 0)
+         kernelCpuFamily = "x86";
++      else if (machine.compare(0, 4, "s390", 4) == 0)
++        kernelCpuFamily = "s390";
+       else if (machine.compare(0, 3, "ppc", 3) == 0 || machine.compare(0, 5, "power", 5) == 0)
+         kernelCpuFamily = "PowerPC";
+     }
+@@ -1010,7 +1012,7 @@ const std::string& CSysInfo::GetKernelCpuFamily(void)
+ int CSysInfo::GetXbmcBitness(void)
+ {
+ #if defined (__aarch64__) || defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || \
+-  defined(_M_AMD64) || defined(__ppc64__) || defined(__mips64)
++  defined(_M_AMD64) || defined(__ppc64__) || defined(__mips64) || defined(__s390x__)
+   return 64;
+ #elif defined(__thumb__) || defined(_M_ARMT) || defined(__arm__) || defined(_M_ARM) || defined(__mips__) || defined(mips) || defined(__mips) || defined(i386) || \
+   defined(__i386) || defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__) || defined(_M_IX86) || defined(_X86_) || defined(__powerpc) || \
+@@ -1372,6 +1374,8 @@ std::string CSysInfo::GetBuildTargetCpuFamily(void)
+ #elif defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || defined(_M_AMD64) || \
+    defined(i386) || defined(__i386) || defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__) || defined(_M_IX86) || defined(_X86_)
+   return "x86";
++#elif defined(__s390x__)
++  return "s390";
+ #elif defined(__powerpc) || defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__) || defined(_M_PPC)
+   return "PowerPC";
+ #else
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 2ac54f7..58b4f00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,6 @@
 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
 02_allow_all_arches.patch
 03-privacy.patch
 04-differentiate-from-vanilla-Kodi.patch

-- 
kodi packaging