kodi (default): update to kodi-06d904b

This commit is contained in:
CvH 2020-06-14 19:53:16 +02:00
parent 3eb0309364
commit a7e46710e7
2 changed files with 19 additions and 30 deletions

View File

@ -19,8 +19,8 @@ case $KODI_VENDOR in
PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz"
;;
*)
PKG_VERSION="941afd2aacdcc27c459dbf9889f532b9935aa526"
PKG_SHA256="83bd3487d62d71cb5ad241ed7cb4891839d983f641220eb0638afc5feebc8a92"
PKG_VERSION="06d904b5aab0ede4a777ac644051fc52fd74dc61"
PKG_SHA256="51634aadfbe2e7ce5c5295673336f9be1f351dee320275bd39661aa01dfb13d1"
PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz"
PKG_SOURCE_NAME="kodi-$PKG_VERSION.tar.gz"
;;

View File

@ -1,39 +1,31 @@
From 468f917d3c1ee6f84b1a075d327d7c7626f1e223 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 18 Apr 2015 15:03:31 +0300
Subject: [PATCH 03/13] disable online check
Subject: disable online check
---
xbmc/GUIInfoManager.cpp | 1 -
xbmc/utils/SystemInfo.cpp | 5 +----
xbmc/windows/GUIWindowSystemInfo.cpp | 1 -
3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
index cb09e75..a218e1d 100644
index 1d112c4dd218..eaff4ee12d3f 100644
--- a/xbmc/GUIInfoManager.cpp
+++ b/xbmc/GUIInfoManager.cpp
@@ -278,7 +278,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 },
{ "osversioninfo", SYSTEM_OS_VERSION_INFO },
{ "kernelversion", SYSTEM_OS_VERSION_INFO }, // old, not correct name
{ "uptime", SYSTEM_UPTIME },
@@ -1710,7 +1710,6 @@ const infomap system_labels[] = {{"hasnetwork", SYSTEM_ETHERNET_LINK_ACTIVE},
{"currentcontrol", SYSTEM_CURRENT_CONTROL},
{"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID},
{"dvdlabel", SYSTEM_DVD_LABEL},
- {"internetstate", SYSTEM_INTERNET_STATE},
{"osversioninfo", SYSTEM_OS_VERSION_INFO},
{"kernelversion", SYSTEM_OS_VERSION_INFO}, // old, not correct name
{"uptime", SYSTEM_UPTIME},
diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
index f423cfe..d8483d0 100644
index 5b1d89ed2011..4a39f1122bca 100644
--- a/xbmc/utils/SystemInfo.cpp
+++ b/xbmc/utils/SystemInfo.cpp
@@ -247,7 +247,6 @@ bool CSysInfoJob::DoWork()
@@ -250,7 +250,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.osVersionInfo = CSysInfo::GetOsPrettyNameWithVersion() + " (kernel: " + CSysInfo::GetKernelName() + " " + CSysInfo::GetKernelVersionFull() + ")";
@@ -1023,9 +1022,7 @@ int CSysInfo::GetXbmcBitness(void)
m_info.cpuFrequency =
StringUtils::Format("%4.0f MHz", CServiceBroker::GetCPUInfo()->GetCPUFrequency());
@@ -948,9 +948,7 @@ int CSysInfo::GetXbmcBitness(void)
bool CSysInfo::HasInternet()
{
@ -45,10 +37,10 @@ index f423cfe..d8483d0 100644
std::string CSysInfo::GetHddSpaceInfo(int drive, bool shortText)
diff --git a/xbmc/windows/GUIWindowSystemInfo.cpp b/xbmc/windows/GUIWindowSystemInfo.cpp
index 6ff2391..ee73c88 100644
index e73004d0bbe8..d4af7836d643 100644
--- a/xbmc/windows/GUIWindowSystemInfo.cpp
+++ b/xbmc/windows/GUIWindowSystemInfo.cpp
@@ -125,7 +125,6 @@ void CGUIWindowSystemInfo::FrameMove()
@@ -124,7 +124,6 @@ void CGUIWindowSystemInfo::FrameMove()
SetControlLabel(i++, "%s: %s", 13160, NETWORK_GATEWAY_ADDRESS);
SetControlLabel(i++, "%s: %s", 13161, NETWORK_DNS1_ADDRESS);
SetControlLabel(i++, "%s: %s", 20307, NETWORK_DNS2_ADDRESS);
@ -56,6 +48,3 @@ index 6ff2391..ee73c88 100644
}
else if (m_section == CONTROL_BT_VIDEO)
--
2.5.0