Merge pull request #10114 from heitbaum/kodi-latest

kodi: update to githash de5db92
This commit is contained in:
Matthias Reichl 2025-06-04 00:14:41 +02:00 committed by GitHub
commit 4101b36d19
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 27 additions and 15 deletions

View File

@ -3,8 +3,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="kodi"
PKG_VERSION="264adc124d4770ffef0e3de5b11478077cfd4152"
PKG_SHA256="1057f12c69dfc1397848692d6e8aa79518585e2e7a9ff3647cecab53b9a88025"
PKG_VERSION="de5db9200b6e42972db6ebdd4b4c908f23179cac"
PKG_SHA256="41b6ad56549b55399218a664186131bcad4d1ed354cf6831a1f0a8de32113010"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv"
PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz"

View File

@ -1,9 +1,17 @@
Subject: disable online check
---
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
index e2aa9643ab89..d258e84f73d4 100644
--- a/xbmc/GUIInfoManager.cpp
+++ b/xbmc/GUIInfoManager.cpp
@@ -1953,7 +1953,6 @@ const infomap system_labels[] = {
@@ -1907,7 +1907,7 @@ constexpr std::array<InfoMap, 7> weather = {{
/// <p>
/// }
// clang-format off
-constexpr std::array<InfoMap, 76> system_labels = {{
+constexpr std::array<InfoMap, 75> system_labels = {{
{"hasnetwork", SYSTEM_ETHERNET_LINK_ACTIVE},
{"hasmediadvd", SYSTEM_MEDIA_DVD},
{"hasmediaaudiocd", SYSTEM_MEDIA_AUDIO_CD},
@@ -1955,7 +1955,6 @@ constexpr std::array<InfoMap, 76> system_labels = {{
{"currentcontrol", SYSTEM_CURRENT_CONTROL},
{"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID},
{"dvdlabel", SYSTEM_DVD_LABEL},
@ -11,6 +19,8 @@ Subject: disable online check
{"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 049d7449528d..83f08e08d1c2 100644
--- a/xbmc/utils/SystemInfo.cpp
+++ b/xbmc/utils/SystemInfo.cpp
@@ -281,7 +281,6 @@ bool CSysInfoJob::DoWork()
@ -21,7 +31,7 @@ Subject: disable online check
m_info.videoEncoder = GetVideoEncoder();
m_info.cpuFrequency =
StringUtils::Format("{:4.0f} MHz", CServiceBroker::GetCPUInfo()->GetCPUFrequency());
@@ -1107,9 +1106,7 @@ int CSysInfo::GetXbmcBitness(void)
@@ -1119,9 +1118,7 @@ int CSysInfo::GetXbmcBitness(void)
bool CSysInfo::HasInternet()
{
@ -32,9 +42,11 @@ Subject: disable online check
}
std::string CSysInfo::GetHddSpaceInfo(int drive, bool shortText)
diff --git a/xbmc/windows/GUIWindowSystemInfo.cpp b/xbmc/windows/GUIWindowSystemInfo.cpp
index bf007ccfa687..b7628ae6cc51 100644
--- a/xbmc/windows/GUIWindowSystemInfo.cpp
+++ b/xbmc/windows/GUIWindowSystemInfo.cpp
@@ -126,7 +126,6 @@ void CGUIWindowSystemInfo::FrameMove()
@@ -147,7 +147,6 @@ void CGUIWindowSystemInfo::FrameMove()
SetControlLabel(i++, "{}: {}", 13160, NETWORK_GATEWAY_ADDRESS);
SetControlLabel(i++, "{}: {}", 13161, NETWORK_DNS1_ADDRESS);
SetControlLabel(i++, "{}: {}", 20307, NETWORK_DNS2_ADDRESS);