jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-01 23:17:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8269 from CvH/12.0/kod_up_301023

Browse Source 
kodi: update to c5d20b2
This commit is contained in:
Christian Hewitt 2023-10-30 18:01:07 +04:00 committed by GitHub
commit f784c3bd19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 46 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/mediacenter/kodi/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="kodi" PKG_NAME="kodi"
PKG_VERSION="21.0b1-Omega" PKG_VERSION="c5d20b27537a7375613250318050a74ab9d8953f"
PKG_SHA256="9fa84025eea49c633ba7cce4177c5843a74f591736412842ecc7fb8cbd12ab88" PKG_SHA256="01dd203fa802cdeb06ec2f8b556ab728bfdcba5ac24c9aaa68faf2cfe6129490"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv" PKG_SITE="http://www.kodi.tv"
PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz" PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz"

8
packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch
View File

@ -3,7 +3,7 @@ Subject: disable online check
--- ---
--- a/xbmc/GUIInfoManager.cpp --- a/xbmc/GUIInfoManager.cpp
+++ b/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp
@@ -1840,7 +1840,6 @@ const infomap system_labels[] = { @@ -1922,7 +1922,6 @@ const infomap system_labels[] = {
{"currentcontrol", SYSTEM_CURRENT_CONTROL}, {"currentcontrol", SYSTEM_CURRENT_CONTROL},
{"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID}, {"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID},
{"dvdlabel", SYSTEM_DVD_LABEL}, {"dvdlabel", SYSTEM_DVD_LABEL},
@ -13,7 +13,7 @@ Subject: disable online check
{"uptime", SYSTEM_UPTIME}, {"uptime", SYSTEM_UPTIME},
--- a/xbmc/utils/SystemInfo.cpp --- a/xbmc/utils/SystemInfo.cpp
+++ b/xbmc/utils/SystemInfo.cpp +++ b/xbmc/utils/SystemInfo.cpp
@@ -275,7 +275,6 @@ bool CSysInfoJob::DoWork() @@ -281,7 +281,6 @@ bool CSysInfoJob::DoWork()
{ {
m_info.systemUptime = GetSystemUpTime(false); m_info.systemUptime = GetSystemUpTime(false);
m_info.systemTotalUptime = GetSystemUpTime(true); m_info.systemTotalUptime = GetSystemUpTime(true);
@ -21,7 +21,7 @@ Subject: disable online check
m_info.videoEncoder = GetVideoEncoder(); m_info.videoEncoder = GetVideoEncoder();
m_info.cpuFrequency = m_info.cpuFrequency =
StringUtils::Format("{:4.0f} MHz", CServiceBroker::GetCPUInfo()->GetCPUFrequency()); StringUtils::Format("{:4.0f} MHz", CServiceBroker::GetCPUInfo()->GetCPUFrequency());
@@ -1021,9 +1020,7 @@ int CSysInfo::GetXbmcBitness(void) @@ -1105,9 +1104,7 @@ int CSysInfo::GetXbmcBitness(void)
bool CSysInfo::HasInternet() bool CSysInfo::HasInternet()
{ {
@ -34,7 +34,7 @@ Subject: disable online check
std::string CSysInfo::GetHddSpaceInfo(int drive, bool shortText) std::string CSysInfo::GetHddSpaceInfo(int drive, bool shortText)
--- a/xbmc/windows/GUIWindowSystemInfo.cpp --- a/xbmc/windows/GUIWindowSystemInfo.cpp
+++ b/xbmc/windows/GUIWindowSystemInfo.cpp +++ b/xbmc/windows/GUIWindowSystemInfo.cpp
@@ -124,7 +124,6 @@ void CGUIWindowSystemInfo::FrameMove() @@ -126,7 +126,6 @@ void CGUIWindowSystemInfo::FrameMove()
SetControlLabel(i++, "{}: {}", 13160, NETWORK_GATEWAY_ADDRESS); SetControlLabel(i++, "{}: {}", 13160, NETWORK_GATEWAY_ADDRESS);
SetControlLabel(i++, "{}: {}", 13161, NETWORK_DNS1_ADDRESS); SetControlLabel(i++, "{}: {}", 13161, NETWORK_DNS1_ADDRESS);
SetControlLabel(i++, "{}: {}", 20307, NETWORK_DNS2_ADDRESS); SetControlLabel(i++, "{}: {}", 20307, NETWORK_DNS2_ADDRESS);

7
packages/mediacenter/kodi/patches/kodi-100.05-make-binary-addons-executable.patch
View File

@ -10,8 +10,6 @@ credits to vpeter4 for the patch
xbmc/addons/Addon.cpp | 26 ++++++++++++++++++++++++++ xbmc/addons/Addon.cpp | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+) 1 file changed, 26 insertions(+)
diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
index 90669bb10e..f6aabfc615 100644
--- a/xbmc/addons/Addon.cpp --- a/xbmc/addons/Addon.cpp
+++ b/xbmc/addons/Addon.cpp +++ b/xbmc/addons/Addon.cpp
@@ -29,6 +29,10 @@ @@ -29,6 +29,10 @@
@ -25,7 +23,7 @@ index 90669bb10e..f6aabfc615 100644
#ifdef HAS_PYTHON #ifdef HAS_PYTHON
#include "interfaces/python/XBPython.h" #include "interfaces/python/XBPython.h"
#endif #endif
@@ -663,6 +667,28 @@ void OnPreInstall(const AddonPtr& addon) @@ -665,6 +669,28 @@ void OnPreInstall(const AddonPtr& addon)
void OnPostInstall(const AddonPtr& addon, bool update, bool modal) void OnPostInstall(const AddonPtr& addon, bool update, bool modal)
{ {
@ -54,6 +52,3 @@ index 90669bb10e..f6aabfc615 100644
addon->OnPostInstall(update, modal); addon->OnPostInstall(update, modal);
} }
--
2.34.1

7
packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch
View File

@ -7,11 +7,9 @@ Subject: [PATCH] disable minimize
xbmc/application/Application.cpp | 1 - xbmc/application/Application.cpp | 1 -
1 file changed, 1 deletion(-) 1 file changed, 1 deletion(-)
diff --git a/xbmc/application/Application.cpp b/xbmc/application/Application.cpp
index 27b7bc80cb..bafb5de064 100644
--- a/xbmc/application/Application.cpp --- a/xbmc/application/Application.cpp
+++ b/xbmc/application/Application.cpp +++ b/xbmc/application/Application.cpp
@@ -1572,7 +1572,6 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) @@ -1579,7 +1579,6 @@ void CApplication::OnApplicationMessage(
break; break;
case TMSG_MINIMIZE: case TMSG_MINIMIZE:
@ -19,6 +17,3 @@ index 27b7bc80cb..bafb5de064 100644
break; break;
case TMSG_EXECUTE_OS: case TMSG_EXECUTE_OS:
--
2.34.1

6
packages/mediacenter/kodi/patches/kodi-100.08-setup-timezone.patch
View File

@ -12,16 +12,16 @@ tz-data.service
--- a/xbmc/platform/posix/PosixTimezone.cpp --- a/xbmc/platform/posix/PosixTimezone.cpp
+++ b/xbmc/platform/posix/PosixTimezone.cpp +++ b/xbmc/platform/posix/PosixTimezone.cpp
@@ -26,6 +26,8 @@ @@ -24,6 +24,8 @@
#include <algorithm> #include "PlatformDefs.h"
+#include <fstream> +#include <fstream>
+ +
CPosixTimezone::CPosixTimezone() CPosixTimezone::CPosixTimezone()
{ {
char* line = NULL; char* line = NULL;
@@ -143,6 +145,16 @@ void CPosixTimezone::OnSettingChanged(co @@ -141,6 +143,16 @@ void CPosixTimezone::OnSettingChanged(co
const std::string &settingId = setting->GetId(); const std::string &settingId = setting->GetId();
if (settingId == CSettings::SETTING_LOCALE_TIMEZONE) if (settingId == CSettings::SETTING_LOCALE_TIMEZONE)
{ {

21
packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch
View File

@ -9,11 +9,9 @@ Subject: [PATCH] Use a wrapper to setup service addons
xbmc/addons/AddonManager.cpp | 3 +++ xbmc/addons/AddonManager.cpp | 3 +++
3 files changed, 47 insertions(+) 3 files changed, 47 insertions(+)
diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
index f6aabfc615..496e1fcfa0 100644
--- a/xbmc/addons/Addon.cpp --- a/xbmc/addons/Addon.cpp
+++ b/xbmc/addons/Addon.cpp +++ b/xbmc/addons/Addon.cpp
@@ -658,6 +658,37 @@ CAddonVersion CAddon::GetDependencyVersion(const std::string& dependencyID) cons @@ -660,6 +660,37 @@ CAddonVersion CAddon::GetDependencyVersi
return m_addonInfo->DependencyVersion(dependencyID); return m_addonInfo->DependencyVersion(dependencyID);
} }
@ -51,7 +49,7 @@ index f6aabfc615..496e1fcfa0 100644
void OnPreInstall(const AddonPtr& addon) void OnPreInstall(const AddonPtr& addon)
{ {
//Fallback to the pre-install callback in the addon. //Fallback to the pre-install callback in the addon.
@@ -687,6 +718,8 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal) @@ -689,6 +720,8 @@ void OnPostInstall(const AddonPtr& addon
} }
closedir(addonsDir); closedir(addonsDir);
} }
@ -60,7 +58,7 @@ index f6aabfc615..496e1fcfa0 100644
// OE // OE
addon->OnPostInstall(update, modal); addon->OnPostInstall(update, modal);
@@ -694,6 +727,8 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal) @@ -696,6 +729,8 @@ void OnPostInstall(const AddonPtr& addon
void OnPreUnInstall(const AddonPtr& addon) void OnPreUnInstall(const AddonPtr& addon)
{ {
@ -69,11 +67,9 @@ index f6aabfc615..496e1fcfa0 100644
addon->OnPreUnInstall(); addon->OnPreUnInstall();
} }
diff --git a/xbmc/addons/Addon.h b/xbmc/addons/Addon.h
index a09b8db80f..629f028584 100644
--- a/xbmc/addons/Addon.h --- a/xbmc/addons/Addon.h
+++ b/xbmc/addons/Addon.h +++ b/xbmc/addons/Addon.h
@@ -31,6 +31,15 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal); @@ -31,6 +31,15 @@ void OnPostInstall(const AddonPtr& addon
void OnPreUnInstall(const AddonPtr& addon); void OnPreUnInstall(const AddonPtr& addon);
void OnPostUnInstall(const AddonPtr& addon); void OnPostUnInstall(const AddonPtr& addon);
@ -89,8 +85,6 @@ index a09b8db80f..629f028584 100644
class CAddon : public IAddon class CAddon : public IAddon
{ {
public: public:
diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
index bb0b510378..0524caa5a9 100644
--- a/xbmc/addons/AddonManager.cpp --- a/xbmc/addons/AddonManager.cpp
+++ b/xbmc/addons/AddonManager.cpp +++ b/xbmc/addons/AddonManager.cpp
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
@ -101,7 +95,7 @@ index bb0b510378..0524caa5a9 100644
#include "addons/AddonBuilder.h" #include "addons/AddonBuilder.h"
#include "addons/AddonDatabase.h" #include "addons/AddonDatabase.h"
#include "addons/AddonEvents.h" #include "addons/AddonEvents.h"
@@ -863,6 +864,7 @@ bool CAddonMgr::DisableAddon(const std::string& id, AddonDisabledReason disabled @@ -863,6 +864,7 @@ bool CAddonMgr::DisableAddon(const std::
AddonPtr addon; AddonPtr addon;
if (GetAddon(id, addon, AddonType::UNKNOWN, OnlyEnabled::CHOICE_NO) && addon != nullptr) if (GetAddon(id, addon, AddonType::UNKNOWN, OnlyEnabled::CHOICE_NO) && addon != nullptr)
{ {
@ -109,7 +103,7 @@ index bb0b510378..0524caa5a9 100644
auto eventLog = CServiceBroker::GetEventLog(); auto eventLog = CServiceBroker::GetEventLog();
if (eventLog) if (eventLog)
eventLog->Add(EventPtr(new CAddonManagementEvent(addon, 24141))); eventLog->Add(EventPtr(new CAddonManagementEvent(addon, 24141)));
@@ -914,6 +916,7 @@ bool CAddonMgr::EnableSingle(const std::string& id) @@ -914,6 +916,7 @@ bool CAddonMgr::EnableSingle(const std::
if (!m_database->EnableAddon(id)) if (!m_database->EnableAddon(id))
return false; return false;
m_disabled.erase(id); m_disabled.erase(id);
@ -117,6 +111,3 @@ index bb0b510378..0524caa5a9 100644
// If enabling a repo add-on without an origin, set its origin to its own id // If enabling a repo add-on without an origin, set its origin to its own id
if (addon->HasType(AddonType::REPOSITORY) && addon->Origin().empty()) if (addon->HasType(AddonType::REPOSITORY) && addon->Origin().empty())
--
2.34.1

35
packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch
View File

@ -20,11 +20,9 @@ so, when shutdown/reboot is requested:
.../powermanagement/LogindUPowerSyscall.cpp | 2 -- .../powermanagement/LogindUPowerSyscall.cpp | 2 --
3 files changed, 20 insertions(+), 8 deletions(-) 3 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/xbmc/application/Application.cpp b/xbmc/application/Application.cpp
index bafb5de064..c5f39217cc 100644
--- a/xbmc/application/Application.cpp --- a/xbmc/application/Application.cpp
+++ b/xbmc/application/Application.cpp +++ b/xbmc/application/Application.cpp
@@ -1444,12 +1444,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) @@ -1447,12 +1447,12 @@ void CApplication::OnApplicationMessage(
switch (msg) switch (msg)
{ {
case TMSG_POWERDOWN: case TMSG_POWERDOWN:
@ -39,7 +37,7 @@ index bafb5de064..c5f39217cc 100644
break; break;
case TMSG_SHUTDOWN: case TMSG_SHUTDOWN:
@@ -1470,12 +1470,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) @@ -1473,12 +1473,13 @@ void CApplication::OnApplicationMessage(
case TMSG_RESTART: case TMSG_RESTART:
case TMSG_RESET: case TMSG_RESET:
@ -54,7 +52,7 @@ index bafb5de064..c5f39217cc 100644
Stop(EXITCODE_RESTARTAPP); Stop(EXITCODE_RESTARTAPP);
#endif #endif
break; break;
@@ -2039,7 +2040,7 @@ bool CApplication::Stop(int exitCode) @@ -2063,7 +2064,7 @@ bool CApplication::Stop(int exitCode)
m_frameMoveGuard.unlock(); m_frameMoveGuard.unlock();
CVariant vExitCode(CVariant::VariantTypeObject); CVariant vExitCode(CVariant::VariantTypeObject);
@ -63,7 +61,7 @@ index bafb5de064..c5f39217cc 100644
CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode); CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode);
// Abort any active screensaver // Abort any active screensaver
@@ -2071,7 +2072,6 @@ bool CApplication::Stop(int exitCode) @@ -2095,7 +2096,6 @@ bool CApplication::Stop(int exitCode)
// Needs cleaning up // Needs cleaning up
CServiceBroker::GetAppMessenger()->Stop(); CServiceBroker::GetAppMessenger()->Stop();
m_AppFocused = false; m_AppFocused = false;
@ -71,7 +69,7 @@ index bafb5de064..c5f39217cc 100644
CLog::Log(LOGINFO, "Stopping all"); CLog::Log(LOGINFO, "Stopping all");
// cancel any jobs from the jobmanager // cancel any jobs from the jobmanager
@@ -2602,6 +2602,18 @@ void CApplication::StopPlaying() @@ -2641,6 +2641,18 @@ void CApplication::StopPlaying()
} }
} }
@ -89,8 +87,8 @@ index bafb5de064..c5f39217cc 100644
+ +
bool CApplication::OnMessage(CGUIMessage& message) bool CApplication::OnMessage(CGUIMessage& message)
{ {
switch ( message.GetMessage() ) switch (message.GetMessage())
@@ -3114,7 +3126,7 @@ void CApplication::ProcessSlow() @@ -3151,7 +3163,7 @@ void CApplication::ProcessSlow()
if (CPlatformPosix::TestQuitFlag()) if (CPlatformPosix::TestQuitFlag())
{ {
CLog::Log(LOGINFO, "Quitting due to POSIX signal"); CLog::Log(LOGINFO, "Quitting due to POSIX signal");
@ -99,31 +97,27 @@ index bafb5de064..c5f39217cc 100644
} }
#endif #endif
diff --git a/xbmc/application/Application.h b/xbmc/application/Application.h
index 710ea9923b..59763464ab 100644
--- a/xbmc/application/Application.h --- a/xbmc/application/Application.h
+++ b/xbmc/application/Application.h +++ b/xbmc/application/Application.h
@@ -120,6 +120,7 @@ public: @@ -113,6 +113,7 @@ public:
bool CreateGUI(); bool CreateGUI();
bool InitWindow(RESOLUTION res = RES_INVALID); bool InitWindow(RESOLUTION res = RES_INVALID);
+ bool SetExitCode(int exitCode); + bool SetExitCode(int exitCode);
bool Stop(int exitCode); bool Stop(int exitCode);
void ReloadSkin(bool confirm = false);
const std::string& CurrentFile(); const std::string& CurrentFile();
@@ -274,6 +275,7 @@ private: CFileItem& CurrentFileItem();
CApplicationPlayer m_appPlayer; @@ -251,6 +252,7 @@ private:
CApplicationStackHelper m_stackHelper; unsigned int m_ProcessedExternalCalls = 0; /*!< counts calls which are processed during one "door open" cycle in FrameMove */
unsigned int m_ProcessedExternalDecay = 0; /*!< counts to close door after a few frames of no python activity */
int m_ExitCode{EXITCODE_QUIT}; int m_ExitCode{EXITCODE_QUIT};
+ bool m_ExitCodeSet = false; + bool m_ExitCodeSet = false;
}; };
XBMC_GLOBAL_REF(CApplication,g_application); XBMC_GLOBAL_REF(CApplication,g_application);
diff --git a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp
index 34eed6e41b..c374dbdbd3 100644
--- a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp --- a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp
+++ b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp +++ b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp
@@ -78,8 +78,6 @@ CLogindUPowerSyscall::~CLogindUPowerSyscall() @@ -79,8 +79,6 @@ CLogindUPowerSyscall::~CLogindUPowerSysc
bool CLogindUPowerSyscall::Powerdown() bool CLogindUPowerSyscall::Powerdown()
{ {
@ -132,6 +126,3 @@ index 34eed6e41b..c374dbdbd3 100644
return LogindSetPowerState("PowerOff"); return LogindSetPowerState("PowerOff");
} }
--
2.34.1

4
packages/mediacenter/kodi/patches/kodi-100.15-rename-default-pulse-device.patch
View File

@ -10,7 +10,7 @@ Subject: [PATCH] [PATCH] change pulseaudio default device name to Bluetooth
--- a/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp --- a/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp
@@ -491,7 +491,7 @@ static void SinkInfoRequestCallback(pa_c @@ -492,7 +492,7 @@ static void SinkInfoRequestCallback(pa_c
CAEDeviceInfo defaultDevice; CAEDeviceInfo defaultDevice;
defaultDevice.m_deviceName = std::string("Default"); defaultDevice.m_deviceName = std::string("Default");
defaultDevice.m_displayName = std::string("Default"); defaultDevice.m_displayName = std::string("Default");
@ -19,7 +19,7 @@ Subject: [PATCH] [PATCH] change pulseaudio default device name to Bluetooth
defaultDevice.m_dataFormats.insert(defaultDevice.m_dataFormats.end(), defaultDevice.m_dataFormats.insert(defaultDevice.m_dataFormats.end(),
defaultDataFormats.begin(), defaultDataFormats.end()); defaultDataFormats.begin(), defaultDataFormats.end());
defaultDevice.m_channels = CAEChannelInfo(AE_CH_LAYOUT_2_0); defaultDevice.m_channels = CAEChannelInfo(AE_CH_LAYOUT_2_0);
@@ -499,6 +499,8 @@ static void SinkInfoRequestCallback(pa_c @@ -500,6 +500,8 @@ static void SinkInfoRequestCallback(pa_c
defaultDevice.m_deviceType = AE_DEVTYPE_PCM; defaultDevice.m_deviceType = AE_DEVTYPE_PCM;
defaultDevice.m_wantsIECPassthrough = true; defaultDevice.m_wantsIECPassthrough = true;
sinkStruct->list->push_back(defaultDevice); sinkStruct->list->push_back(defaultDevice);

2
packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch
View File

@ -1,6 +1,6 @@
--- a/xbmc/windows/GUIWindowSystemInfo.cpp --- a/xbmc/windows/GUIWindowSystemInfo.cpp
+++ b/xbmc/windows/GUIWindowSystemInfo.cpp +++ b/xbmc/windows/GUIWindowSystemInfo.cpp
@@ -99,7 +99,6 @@ void CGUIWindowSystemInfo::FrameMove() @@ -100,7 +100,6 @@ void CGUIWindowSystemInfo::FrameMove()
SetControlLabel(i++, "{} {}", 13283, SYSTEM_OS_VERSION_INFO); SetControlLabel(i++, "{} {}", 13283, SYSTEM_OS_VERSION_INFO);
SetControlLabel(i++, "{}: {}", 12390, SYSTEM_UPTIME); SetControlLabel(i++, "{}: {}", 12390, SYSTEM_UPTIME);
SetControlLabel(i++, "{}: {}", 12394, SYSTEM_TOTALUPTIME); SetControlLabel(i++, "{}: {}", 12394, SYSTEM_TOTALUPTIME);

4
packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch
View File

@ -1,8 +1,6 @@
diff --git a/cmake/modules/buildtools/FindTexturePacker.cmake b/cmake/modules/buildtools/FindTexturePacker.cmake
index 4817d15799..c56630001a 100644
--- a/cmake/modules/buildtools/FindTexturePacker.cmake --- a/cmake/modules/buildtools/FindTexturePacker.cmake
+++ b/cmake/modules/buildtools/FindTexturePacker.cmake +++ b/cmake/modules/buildtools/FindTexturePacker.cmake
@@ -52,15 +52,6 @@ if(NOT TARGET TexturePacker::TexturePacker::Executable) @@ -52,15 +52,6 @@ if(NOT TARGET TexturePacker::TexturePack
endif() endif()
endif() endif()

9
packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch
View File

@ -7,11 +7,9 @@ Subject: [PATCH] refresh /etc/environment on install and uninstall
xbmc/addons/Addon.cpp | 6 ++++++ xbmc/addons/Addon.cpp | 6 ++++++
1 file changed, 6 insertions(+) 1 file changed, 6 insertions(+)
diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
index 496e1fcfa0..da0a5955e0 100644
--- a/xbmc/addons/Addon.cpp --- a/xbmc/addons/Addon.cpp
+++ b/xbmc/addons/Addon.cpp +++ b/xbmc/addons/Addon.cpp
@@ -723,6 +723,9 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal) @@ -725,6 +725,9 @@ void OnPostInstall(const AddonPtr& addon
// OE // OE
addon->OnPostInstall(update, modal); addon->OnPostInstall(update, modal);
@ -21,7 +19,7 @@ index 496e1fcfa0..da0a5955e0 100644
} }
void OnPreUnInstall(const AddonPtr& addon) void OnPreUnInstall(const AddonPtr& addon)
@@ -735,6 +738,9 @@ void OnPreUnInstall(const AddonPtr& addon) @@ -737,6 +740,9 @@ void OnPreUnInstall(const AddonPtr& addo
void OnPostUnInstall(const AddonPtr& addon) void OnPostUnInstall(const AddonPtr& addon)
{ {
addon->OnPostUnInstall(); addon->OnPostUnInstall();
@ -31,6 +29,3 @@ index 496e1fcfa0..da0a5955e0 100644
} }
} // namespace ADDON } // namespace ADDON
--
2.34.1

12
packages/mediacenter/kodi/patches/kodi-100.40-estuary-settings-icon.patch
View File

@ -12,21 +12,18 @@ Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
addons/skin.estuary/xml/Settings.xml | 13 +++++++------ addons/skin.estuary/xml/Settings.xml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-) 1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/addons/skin.estuary/xml/Settings.xml b/addons/skin.estuary/xml/Settings.xml
index fa63b174b8..e25d96dec2 100644
--- a/addons/skin.estuary/xml/Settings.xml --- a/addons/skin.estuary/xml/Settings.xml
+++ b/addons/skin.estuary/xml/Settings.xml +++ b/addons/skin.estuary/xml/Settings.xml
@@ -54,10 +54,17 @@ @@ -55,9 +55,16 @@
<onclick>ActivateWindow(systeminfo)</onclick>
<icon>icons/settings/sysinfo.png</icon> <icon>icons/settings/sysinfo.png</icon>
</item> </item>
+ <item> <item>
+ <label>LibreELEC</label> + <label>LibreELEC</label>
+ <onclick>RunAddon(service.libreelec.settings)</onclick> + <onclick>RunAddon(service.libreelec.settings)</onclick>
+ <icon>icons/settings/libreelec.png</icon> + <icon>icons/settings/libreelec.png</icon>
+ <visible>System.AddonIsEnabled(service.libreelec.settings)</visible> + <visible>System.AddonIsEnabled(service.libreelec.settings)</visible>
+ </item> + </item>
<item> + <item>
<label>$LOCALIZE[31067]</label> <label>$LOCALIZE[31067]</label>
<onclick>ActivateWindow(eventlog)</onclick> <onclick>ActivateWindow(eventlog)</onclick>
<icon>icons/settings/eventlog.png</icon> <icon>icons/settings/eventlog.png</icon>
@ -47,6 +44,3 @@ index fa63b174b8..e25d96dec2 100644
</content> </content>
</control> </control>
</control> </control>
--
2.34.1

26
packages/mediacenter/kodi/patches/kodi-995.21-keymaps-change-remote-poweroff-action-to-show-shutdo.patch
View File

@ -1,26 +0,0 @@
From 5604be6a6701e0bd68cb36fadb05cecba57f7887 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Fri, 22 Sep 2023 23:41:51 +0200
Subject: [PATCH] keymaps: change remote poweroff action to show shutdown menu
Signed-off-by: Matthias Reichl <hias@horus.com>
---
system/keymaps/remote.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml
index c122b99188..baebf679c0 100644
--- a/system/keymaps/remote.xml
+++ b/system/keymaps/remote.xml
@@ -50,7 +50,7 @@
<volumeplus>VolumeUp</volumeplus>
<volumeminus>VolumeDown</volumeminus>
<mute>Mute</mute>
- <power>ShutDown()</power>
+ <power>ActivateWindow(ShutdownMenu)</power>
<myvideo>ActivateWindow(Videos)</myvideo>
<mymusic>ActivateWindow(Music)</mymusic>
<mypictures>ActivateWindow(Pictures)</mypictures>
--
2.39.2

18
packages/mediacenter/kodi/patches/kodi-999.20-headers-only.patch
View File

@ -1,24 +1,22 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5824f0d20b7..cf17e1563a7f 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -45,6 +45,7 @@ include(ExternalProject) @@ -58,6 +58,7 @@ include(CMakeDependentOption)
include(cmake/scripts/common/DependencyOptions.cmake)
# general # general
+option(HEADERS_ONLY "Skip building" OFF) +option(HEADERS_ONLY "Skip building" OFF)
option(VERBOSE "Enable verbose output?" OFF) option(VERBOSE "Enable verbose output?" OFF)
option(ENABLE_CLANGTIDY "Enable clang-tidy support?" OFF) option(ENABLE_CLANGTIDY "Enable clang-tidy support?" OFF)
option(ENABLE_CPPCHECK "Enable cppcheck support?" OFF) option(ENABLE_CPPCHECK "Enable cppcheck support?" OFF)
@@ -95,6 +96,7 @@ endif() @@ -133,6 +134,7 @@ core_find_git_rev(APP_SCMID FULL)
set(AUDIO_BACKENDS_LIST "" CACHE STRING "Available audio backends")
core_find_git_rev(APP_SCMID FULL) set(GL_INTERFACES_LIST "" CACHE STRING "Available GL interfaces")
+if(NOT HEADERS_ONLY) +if(NOT HEADERS_ONLY)
# Dynamically loaded libraries built with the project # Dynamically loaded libraries built with the project
add_custom_target(${APP_NAME_LC}-libraries) add_custom_target(${APP_NAME_LC}-libraries)
set(LIBRARY_FILES "" CACHE STRING "" FORCE) set(LIBRARY_FILES "" CACHE STRING "" FORCE)
@@ -458,6 +460,7 @@ endif() @@ -572,6 +574,7 @@ endif()
if(FFMPEG_CREATE_SHARED_LIBRARY) if(FFMPEG_CREATE_SHARED_LIBRARY)
set(CMAKE_CXX_CREATE_SHARED_LIBRARY "${FFMPEG_CREATE_SHARED_LIBRARY}") set(CMAKE_CXX_CREATE_SHARED_LIBRARY "${FFMPEG_CREATE_SHARED_LIBRARY}")
endif() endif()
@ -26,11 +24,9 @@ index e5824f0d20b7..cf17e1563a7f 100644
# Platform specific additional extra targets # Platform specific additional extra targets
if(EXISTS ${CMAKE_SOURCE_DIR}/cmake/scripts/${CORE_SYSTEM_NAME}/ExtraTargets.cmake) if(EXISTS ${CMAKE_SOURCE_DIR}/cmake/scripts/${CORE_SYSTEM_NAME}/ExtraTargets.cmake)
diff --git a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake
index 331722cb5616..cc00c55fa27c 100644
--- a/cmake/scripts/linux/Install.cmake --- a/cmake/scripts/linux/Install.cmake
+++ b/cmake/scripts/linux/Install.cmake +++ b/cmake/scripts/linux/Install.cmake
@@ -51,6 +51,7 @@ configure_file(${CMAKE_SOURCE_DIR}/tools/Linux/kodi.desktop.in @@ -45,6 +45,7 @@ configure_file(${CMAKE_SOURCE_DIR}/tools
configure_file(${CMAKE_SOURCE_DIR}/tools/Linux/kodi.metainfo.xml.in configure_file(${CMAKE_SOURCE_DIR}/tools/Linux/kodi.metainfo.xml.in
${CORE_BUILD_DIR}/${APP_PACKAGE}.metainfo.xml @ONLY) ${CORE_BUILD_DIR}/${APP_PACKAGE}.metainfo.xml @ONLY)