diff --git a/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch b/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch index c07e189fe1..63f27931de 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch @@ -3,7 +3,7 @@ Subject: disable online check --- --- a/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp -@@ -1840,7 +1840,6 @@ const infomap system_labels[] = { +@@ -1919,7 +1919,6 @@ const infomap system_labels[] = { {"currentcontrol", SYSTEM_CURRENT_CONTROL}, {"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID}, {"dvdlabel", SYSTEM_DVD_LABEL}, @@ -34,7 +34,7 @@ Subject: disable online check std::string CSysInfo::GetHddSpaceInfo(int drive, bool shortText) --- a/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++, "{}: {}", 13161, NETWORK_DNS1_ADDRESS); SetControlLabel(i++, "{}: {}", 20307, NETWORK_DNS2_ADDRESS); diff --git a/packages/mediacenter/kodi/patches/kodi-100.05-make-binary-addons-executable.patch b/packages/mediacenter/kodi/patches/kodi-100.05-make-binary-addons-executable.patch index 66abd04aa7..d00641023c 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.05-make-binary-addons-executable.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.05-make-binary-addons-executable.patch @@ -10,8 +10,6 @@ credits to vpeter4 for the patch xbmc/addons/Addon.cpp | 26 ++++++++++++++++++++++++++ 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 +++ b/xbmc/addons/Addon.cpp @@ -29,6 +29,10 @@ @@ -54,6 +52,3 @@ index 90669bb10e..f6aabfc615 100644 addon->OnPostInstall(update, modal); } --- -2.34.1 - diff --git a/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch b/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch index b2e61e45e3..2508ba42d2 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch @@ -7,11 +7,9 @@ Subject: [PATCH] disable minimize xbmc/application/Application.cpp | 1 - 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 +++ b/xbmc/application/Application.cpp -@@ -1572,7 +1572,6 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) +@@ -1609,7 +1609,6 @@ void CApplication::OnApplicationMessage( break; case TMSG_MINIMIZE: @@ -19,6 +17,3 @@ index 27b7bc80cb..bafb5de064 100644 break; case TMSG_EXECUTE_OS: --- -2.34.1 - diff --git a/packages/mediacenter/kodi/patches/kodi-100.08-setup-timezone.patch b/packages/mediacenter/kodi/patches/kodi-100.08-setup-timezone.patch index b982f28834..f6f383240b 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.08-setup-timezone.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.08-setup-timezone.patch @@ -12,7 +12,7 @@ tz-data.service --- a/xbmc/platform/posix/PosixTimezone.cpp +++ b/xbmc/platform/posix/PosixTimezone.cpp -@@ -26,6 +26,8 @@ +@@ -25,6 +25,8 @@ #include @@ -21,7 +21,7 @@ tz-data.service CPosixTimezone::CPosixTimezone() { char* line = NULL; -@@ -143,6 +145,16 @@ void CPosixTimezone::OnSettingChanged(co +@@ -142,6 +144,16 @@ void CPosixTimezone::OnSettingChanged(co const std::string &settingId = setting->GetId(); if (settingId == CSettings::SETTING_LOCALE_TIMEZONE) { diff --git a/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch b/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch index 639ed811bd..836e0e984c 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch @@ -9,11 +9,9 @@ Subject: [PATCH] Use a wrapper to setup service addons xbmc/addons/AddonManager.cpp | 3 +++ 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 +++ b/xbmc/addons/Addon.cpp -@@ -658,6 +658,37 @@ CAddonVersion CAddon::GetDependencyVersion(const std::string& dependencyID) cons +@@ -658,6 +658,37 @@ CAddonVersion CAddon::GetDependencyVersi return m_addonInfo->DependencyVersion(dependencyID); } @@ -51,7 +49,7 @@ index f6aabfc615..496e1fcfa0 100644 void OnPreInstall(const AddonPtr& addon) { //Fallback to the pre-install callback in the addon. -@@ -687,6 +718,8 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal) +@@ -687,6 +718,8 @@ void OnPostInstall(const AddonPtr& addon } closedir(addonsDir); } @@ -60,7 +58,7 @@ index f6aabfc615..496e1fcfa0 100644 // OE addon->OnPostInstall(update, modal); -@@ -694,6 +727,8 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal) +@@ -694,6 +727,8 @@ void OnPostInstall(const AddonPtr& addon void OnPreUnInstall(const AddonPtr& addon) { @@ -69,11 +67,9 @@ index f6aabfc615..496e1fcfa0 100644 addon->OnPreUnInstall(); } -diff --git a/xbmc/addons/Addon.h b/xbmc/addons/Addon.h -index a09b8db80f..629f028584 100644 --- a/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 OnPostUnInstall(const AddonPtr& addon); @@ -89,8 +85,6 @@ index a09b8db80f..629f028584 100644 class CAddon : public IAddon { public: -diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp -index bb0b510378..0524caa5a9 100644 --- a/xbmc/addons/AddonManager.cpp +++ b/xbmc/addons/AddonManager.cpp @@ -12,6 +12,7 @@ @@ -101,7 +95,7 @@ index bb0b510378..0524caa5a9 100644 #include "addons/AddonBuilder.h" #include "addons/AddonDatabase.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; if (GetAddon(id, addon, AddonType::UNKNOWN, OnlyEnabled::CHOICE_NO) && addon != nullptr) { @@ -109,7 +103,7 @@ index bb0b510378..0524caa5a9 100644 auto eventLog = CServiceBroker::GetEventLog(); if (eventLog) 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)) return false; 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 (addon->HasType(AddonType::REPOSITORY) && addon->Origin().empty()) --- -2.34.1 - diff --git a/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch b/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch index 3cc65d5eff..33cfc08fdc 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch @@ -20,11 +20,9 @@ so, when shutdown/reboot is requested: .../powermanagement/LogindUPowerSyscall.cpp | 2 -- 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 +++ b/xbmc/application/Application.cpp -@@ -1444,12 +1444,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) +@@ -1481,12 +1481,12 @@ void CApplication::OnApplicationMessage( switch (msg) { case TMSG_POWERDOWN: @@ -39,7 +37,7 @@ index bafb5de064..c5f39217cc 100644 break; case TMSG_SHUTDOWN: -@@ -1470,12 +1470,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) +@@ -1507,12 +1507,13 @@ void CApplication::OnApplicationMessage( case TMSG_RESTART: case TMSG_RESET: @@ -54,7 +52,7 @@ index bafb5de064..c5f39217cc 100644 Stop(EXITCODE_RESTARTAPP); #endif break; -@@ -2039,7 +2040,7 @@ bool CApplication::Stop(int exitCode) +@@ -2083,7 +2084,7 @@ bool CApplication::Stop(int exitCode) m_frameMoveGuard.unlock(); CVariant vExitCode(CVariant::VariantTypeObject); @@ -63,7 +61,7 @@ index bafb5de064..c5f39217cc 100644 CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode); // Abort any active screensaver -@@ -2071,7 +2072,6 @@ bool CApplication::Stop(int exitCode) +@@ -2115,7 +2116,6 @@ bool CApplication::Stop(int exitCode) // Needs cleaning up CServiceBroker::GetAppMessenger()->Stop(); m_AppFocused = false; @@ -71,7 +69,7 @@ index bafb5de064..c5f39217cc 100644 CLog::Log(LOGINFO, "Stopping all"); // cancel any jobs from the jobmanager -@@ -2602,6 +2602,18 @@ void CApplication::StopPlaying() +@@ -2658,6 +2658,18 @@ void CApplication::StopPlaying() } } @@ -89,8 +87,8 @@ index bafb5de064..c5f39217cc 100644 + bool CApplication::OnMessage(CGUIMessage& message) { - switch ( message.GetMessage() ) -@@ -3114,7 +3126,7 @@ void CApplication::ProcessSlow() + switch (message.GetMessage()) +@@ -3178,7 +3190,7 @@ void CApplication::ProcessSlow() if (CPlatformPosix::TestQuitFlag()) { CLog::Log(LOGINFO, "Quitting due to POSIX signal"); @@ -99,31 +97,27 @@ index bafb5de064..c5f39217cc 100644 } #endif -diff --git a/xbmc/application/Application.h b/xbmc/application/Application.h -index 710ea9923b..59763464ab 100644 --- a/xbmc/application/Application.h +++ b/xbmc/application/Application.h -@@ -120,6 +120,7 @@ public: +@@ -113,6 +113,7 @@ public: bool CreateGUI(); bool InitWindow(RESOLUTION res = RES_INVALID); + bool SetExitCode(int exitCode); bool Stop(int exitCode); - void ReloadSkin(bool confirm = false); const std::string& CurrentFile(); -@@ -274,6 +275,7 @@ private: - CApplicationPlayer m_appPlayer; - CApplicationStackHelper m_stackHelper; + CFileItem& CurrentFileItem(); +@@ -251,6 +252,7 @@ private: + 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}; + bool m_ExitCodeSet = false; }; 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 +++ b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp -@@ -78,8 +78,6 @@ CLogindUPowerSyscall::~CLogindUPowerSyscall() +@@ -79,8 +79,6 @@ CLogindUPowerSyscall::~CLogindUPowerSysc bool CLogindUPowerSyscall::Powerdown() { @@ -132,6 +126,3 @@ index 34eed6e41b..c374dbdbd3 100644 return LogindSetPowerState("PowerOff"); } --- -2.34.1 - diff --git a/packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch b/packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch index d918dc0744..ab42cafc05 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch @@ -1,6 +1,6 @@ --- a/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++, "{}: {}", 12390, SYSTEM_UPTIME); SetControlLabel(i++, "{}: {}", 12394, SYSTEM_TOTALUPTIME); diff --git a/packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch b/packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch index f090fbda1e..e1327b021b 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch @@ -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 +++ 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() diff --git a/packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch b/packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch index 05e91134a3..f98488ef61 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch @@ -7,11 +7,9 @@ Subject: [PATCH] refresh /etc/environment on install and uninstall xbmc/addons/Addon.cpp | 6 ++++++ 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 +++ b/xbmc/addons/Addon.cpp -@@ -723,6 +723,9 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal) +@@ -723,6 +723,9 @@ void OnPostInstall(const AddonPtr& addon // OE addon->OnPostInstall(update, modal); @@ -21,7 +19,7 @@ index 496e1fcfa0..da0a5955e0 100644 } void OnPreUnInstall(const AddonPtr& addon) -@@ -735,6 +738,9 @@ void OnPreUnInstall(const AddonPtr& addon) +@@ -735,6 +738,9 @@ void OnPreUnInstall(const AddonPtr& addo void OnPostUnInstall(const AddonPtr& addon) { addon->OnPostUnInstall(); @@ -31,6 +29,3 @@ index 496e1fcfa0..da0a5955e0 100644 } } // namespace ADDON --- -2.34.1 - diff --git a/packages/mediacenter/kodi/patches/kodi-100.40-estuary-settings-icon.patch b/packages/mediacenter/kodi/patches/kodi-100.40-estuary-settings-icon.patch index 43fc9f6490..9d3a3b764b 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.40-estuary-settings-icon.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.40-estuary-settings-icon.patch @@ -12,21 +12,18 @@ Signed-off-by: Christian Hewitt addons/skin.estuary/xml/Settings.xml | 13 +++++++------ 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 +++ b/addons/skin.estuary/xml/Settings.xml -@@ -54,10 +54,17 @@ - ActivateWindow(systeminfo) +@@ -55,9 +55,16 @@ icons/settings/sysinfo.png -+ + + + RunAddon(service.libreelec.settings) + icons/settings/libreelec.png + System.AddonIsEnabled(service.libreelec.settings) + - ++ ActivateWindow(eventlog) icons/settings/eventlog.png @@ -47,6 +44,3 @@ index fa63b174b8..e25d96dec2 100644 --- -2.34.1 - diff --git a/packages/mediacenter/kodi/patches/kodi-999.20-headers-only.patch b/packages/mediacenter/kodi/patches/kodi-999.20-headers-only.patch index 6ea97a4797..827db8e60d 100644 --- a/packages/mediacenter/kodi/patches/kodi-999.20-headers-only.patch +++ b/packages/mediacenter/kodi/patches/kodi-999.20-headers-only.patch @@ -1,16 +1,14 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e5824f0d20b7..cf17e1563a7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -45,6 +45,7 @@ include(ExternalProject) - +@@ -47,6 +47,7 @@ include(CMakeDependentOption) + include(cmake/scripts/common/DependencyOptions.cmake) # general +option(HEADERS_ONLY "Skip building" OFF) option(VERBOSE "Enable verbose output?" OFF) option(ENABLE_CLANGTIDY "Enable clang-tidy support?" OFF) option(ENABLE_CPPCHECK "Enable cppcheck support?" OFF) -@@ -95,6 +96,7 @@ endif() +@@ -107,6 +108,7 @@ endif() core_find_git_rev(APP_SCMID FULL) @@ -18,7 +16,7 @@ index e5824f0d20b7..cf17e1563a7f 100644 # Dynamically loaded libraries built with the project add_custom_target(${APP_NAME_LC}-libraries) set(LIBRARY_FILES "" CACHE STRING "" FORCE) -@@ -458,6 +460,7 @@ endif() +@@ -478,6 +480,7 @@ endif() if(FFMPEG_CREATE_SHARED_LIBRARY) set(CMAKE_CXX_CREATE_SHARED_LIBRARY "${FFMPEG_CREATE_SHARED_LIBRARY}") endif() @@ -26,11 +24,9 @@ index e5824f0d20b7..cf17e1563a7f 100644 # Platform specific additional extra targets 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 +++ b/cmake/scripts/linux/Install.cmake -@@ -51,6 +51,7 @@ configure_file(${CMAKE_SOURCE_DIR}/tools/Linux/kodi.desktop.in +@@ -51,6 +51,7 @@ configure_file(${CMAKE_SOURCE_DIR}/tools configure_file(${CMAKE_SOURCE_DIR}/tools/Linux/kodi.metainfo.xml.in ${CORE_BUILD_DIR}/${APP_PACKAGE}.metainfo.xml @ONLY)