xbmc-master: update to xbmc-master-14-6ba500c, update FM patch

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/mediacenter/xbmc-master-theme-Confluence/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-master-theme-Confluence"
-PKG_VERSION="14-7a836d2"
+PKG_VERSION="14-6ba500c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-master/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-master"
-PKG_VERSION="14-7a836d2"
+PKG_VERSION="14-6ba500c"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-master/patches/xbmc-master-103-disable-online-check.patch

@@ -1,6 +1,6 @@
-From 7503fd2355ab44503cf38809c5ba70ef2c0f2144 Mon Sep 17 00:00:00 2001
+From 1716ffbf57a8d812f3bc7b26752e867066c36c44 Mon Sep 17 00:00:00 2001
 From: Stefan Saraev <stefan@saraev.ca>
-Date: Fri, 10 Jan 2014 19:44:16 +0200
+Date: Sat, 7 Jun 2014 12:40:57 +0300
 Subject: [PATCH] disable online check
 
 ---
@@ -10,30 +10,30 @@ Subject: [PATCH] disable online check
  3 files changed, 1 insertion(+), 6 deletions(-)
 
 diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
-index 10173ee..70a474a 100644
+index 456c733..0c20ae2 100644
 --- a/xbmc/GUIInfoManager.cpp
 +++ b/xbmc/GUIInfoManager.cpp
-@@ -271,7 +271,6 @@ const infomap system_labels[] =  {{ "hasnetwork",       SYSTEM_ETHERNET_LINK_ACT
+@@ -273,7 +273,6 @@ const infomap system_labels[] =  {{ "hasnetwork",       SYSTEM_ETHERNET_LINK_ACT
                                    { "currentwindow",    SYSTEM_CURRENT_WINDOW },
                                    { "currentcontrol",   SYSTEM_CURRENT_CONTROL },
                                    { "dvdlabel",         SYSTEM_DVD_LABEL },
 -                                  { "internetstate",    SYSTEM_INTERNET_STATE },
-                                   { "kernelversion",    SYSTEM_KERNEL_VERSION },
+                                   { "osversioninfo",    SYSTEM_OS_VERSION_INFO },
+                                   { "kernelversion",    SYSTEM_OS_VERSION_INFO }, // old, not correct name
                                    { "uptime",           SYSTEM_UPTIME },
-                                   { "totaluptime",      SYSTEM_TOTALUPTIME },
 diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
-index c77d495..06459dc 100644
+index 55ed760..aefeb70 100644
 --- a/xbmc/utils/SystemInfo.cpp
 +++ b/xbmc/utils/SystemInfo.cpp
-@@ -72,7 +72,6 @@ bool CSysInfoJob::DoWork()
+@@ -240,7 +240,6 @@ bool CSysInfoJob::DoWork()
  {
    m_info.systemUptime      = GetSystemUpTime(false);
    m_info.systemTotalUptime = GetSystemUpTime(true);
 -  m_info.internetState     = GetInternetState();
    m_info.videoEncoder      = GetVideoEncoder();
    m_info.cpuFrequency      = GetCPUFreqInfo();
-   m_info.kernelVersion     = CSysInfo::GetKernelVersion();
-@@ -569,9 +568,7 @@ CStdString CSysInfo::GetKernelVersion()
+   m_info.osVersionInfo     = CSysInfo::GetOsPrettyNameWithVersion() + " (kernel: " + CSysInfo::GetKernelName() + " " + CSysInfo::GetKernelVersionFull() + ")";
+@@ -963,9 +962,7 @@ int CSysInfo::GetXbmcBitness(void)
  
  bool CSysInfo::HasInternet()
  {
@@ -45,7 +45,7 @@ index c77d495..06459dc 100644
  
  CStdString CSysInfo::GetHddSpaceInfo(int drive, bool shortText)
 diff --git a/xbmc/windows/GUIWindowSystemInfo.cpp b/xbmc/windows/GUIWindowSystemInfo.cpp
-index 60aa49d..a0a2e27 100644
+index 03a23e3..1528939 100644
 --- a/xbmc/windows/GUIWindowSystemInfo.cpp
 +++ b/xbmc/windows/GUIWindowSystemInfo.cpp
 @@ -126,7 +126,6 @@ void CGUIWindowSystemInfo::FrameMove()
@@ -57,5 +57,5 @@ index 60aa49d..a0a2e27 100644
    else if (m_section == CONTROL_BT_VIDEO)
    {
 -- 
-1.8.3.2
+1.9.1