[SCM] kodi/master: Refresh back-ported patch

[rbalint at users.alioth.debian.org]

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

    Refresh back-ported patch

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
index c52d1fc..18c8fd8 100644
--- a/debian/patches/0003-core-added-s390x-support-to-system-info.patch
+++ b/debian/patches/0003-core-added-s390x-support-to-system-info.patch
@@ -7,11 +7,9 @@ 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)
+@@ -997,6 +997,8 @@
          kernelCpuFamily = "MIPS";
        else if (machine.compare(0, 4, "i686", 4) == 0 || machine == "i386" || machine == "amd64" ||  machine.compare(0, 3, "x86", 3) == 0)
          kernelCpuFamily = "x86";
@@ -20,16 +18,16 @@ index fcbfec3..c79e0b6 100644
        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)
+@@ -1010,7 +1012,7 @@
  int CSysInfo::GetXbmcBitness(void)
  {
- #if defined (__aarch64__) || defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || \
+ #if defined (__aarch64__) || defined(__arm64__) || 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)
+@@ -1372,6 +1374,8 @@
  #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";
@@ -38,6 +36,3 @@ index fcbfec3..c79e0b6 100644
  #elif defined(__powerpc) || defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || defined(__ppc64__) || defined(_M_PPC)
    return "PowerPC";
  #else
--- 
-2.1.4
-

-- 
kodi packaging