kodi: refresh patches

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2022-02-11 23:58:35 +01:00
parent 97134f3085
commit e02bcdd143
5 changed files with 15 additions and 19 deletions

View File

@ -14,7 +14,7 @@ this should probably be removed after OE 6
--- a/xbmc/windowing/X11/WinSystemX11.cpp
+++ b/xbmc/windowing/X11/WinSystemX11.cpp
@@ -759,8 +759,6 @@ bool CWinSystemX11::SetWindow(int width,
@@ -764,8 +764,6 @@ bool CWinSystemX11::SetWindow(int width,
if (fullscreen && hasWM)
{

View File

@ -9,7 +9,7 @@ Subject: [PATCH 07/13] disable minimize
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -2053,7 +2053,6 @@ void CApplication::OnApplicationMessage(
@@ -2090,7 +2090,6 @@ void CApplication::OnApplicationMessage(
break;
case TMSG_MINIMIZE:

View File

@ -76,15 +76,15 @@
public:
--- a/xbmc/addons/AddonManager.cpp
+++ b/xbmc/addons/AddonManager.cpp
@@ -829,6 +829,7 @@ bool CAddonMgr::DisableAddon(const std::
@@ -839,6 +839,7 @@ bool CAddonMgr::DisableAddon(const std::
AddonPtr addon;
if (GetAddon(id, addon, ADDON_UNKNOWN, OnlyEnabled::NO) && addon != NULL)
if (GetAddon(id, addon, ADDON_UNKNOWN, OnlyEnabled::CHOICE_NO) && addon != NULL)
{
+ ADDON::LEAddonHook(addon, ADDON::LE_ADDON_DISABLED);
auto eventLog = CServiceBroker::GetEventLog();
if (eventLog)
eventLog->Add(EventPtr(new CAddonManagementEvent(addon, 24141)));
@@ -880,6 +881,7 @@ bool CAddonMgr::EnableSingle(const std::
@@ -890,6 +891,7 @@ bool CAddonMgr::EnableSingle(const std::
if (!m_database.EnableAddon(id))
return false;
m_disabled.erase(id);

View File

@ -24,7 +24,7 @@ so, when shutdown/reboot is requested:
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -1933,12 +1933,12 @@ void CApplication::OnApplicationMessage(
@@ -1966,12 +1966,12 @@ void CApplication::OnApplicationMessage(
switch (msg)
{
case TMSG_POWERDOWN:
@ -39,7 +39,7 @@ so, when shutdown/reboot is requested:
break;
case TMSG_SHUTDOWN:
@@ -1959,12 +1959,13 @@ void CApplication::OnApplicationMessage(
@@ -1992,12 +1992,13 @@ void CApplication::OnApplicationMessage(
case TMSG_RESTART:
case TMSG_RESET:
@ -54,7 +54,7 @@ so, when shutdown/reboot is requested:
Stop(EXITCODE_RESTARTAPP);
#endif
break;
@@ -2454,6 +2455,17 @@ bool CApplication::Cleanup()
@@ -2491,6 +2492,17 @@ bool CApplication::Cleanup()
}
}
@ -72,7 +72,7 @@ so, when shutdown/reboot is requested:
void CApplication::Stop(int exitCode)
{
CLog::Log(LOGINFO, "Stopping player");
@@ -2480,7 +2492,7 @@ void CApplication::Stop(int exitCode)
@@ -2517,7 +2529,7 @@ void CApplication::Stop(int exitCode)
m_frameMoveGuard.unlock();
CVariant vExitCode(CVariant::VariantTypeObject);
@ -81,7 +81,7 @@ so, when shutdown/reboot is requested:
CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode);
// Abort any active screensaver
@@ -2512,7 +2524,6 @@ void CApplication::Stop(int exitCode)
@@ -2549,7 +2561,6 @@ void CApplication::Stop(int exitCode)
// Needs cleaning up
CApplicationMessenger::GetInstance().Stop();
m_AppFocused = false;
@ -89,7 +89,7 @@ so, when shutdown/reboot is requested:
CLog::Log(LOGINFO, "Stopping all");
// cancel any jobs from the jobmanager
@@ -4155,7 +4166,7 @@ void CApplication::ProcessSlow()
@@ -4199,7 +4210,7 @@ void CApplication::ProcessSlow()
if (CPlatformPosix::TestQuitFlag())
{
CLog::Log(LOGINFO, "Quitting due to POSIX signal");

View File

@ -21,11 +21,9 @@ Fixes: #20629
xbmc/windowing/wayland/WinSystemWayland.cpp | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/xbmc/windowing/GraphicContext.cpp b/xbmc/windowing/GraphicContext.cpp
index 6a90ee28fc05c..83fedbabe1856 100644
--- a/xbmc/windowing/GraphicContext.cpp
+++ b/xbmc/windowing/GraphicContext.cpp
@@ -409,7 +409,7 @@ void CGraphicContext::SetVideoResolutionInternal(RESOLUTION res, bool forceUpdat
@@ -409,7 +409,7 @@ void CGraphicContext::SetVideoResolution
return;
}
@ -34,11 +32,9 @@ index 6a90ee28fc05c..83fedbabe1856 100644
{
CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_fullScreen = true;
m_bFullScreenRoot = true;
diff --git a/xbmc/windowing/wayland/WinSystemWayland.cpp b/xbmc/windowing/wayland/WinSystemWayland.cpp
index bd17b44a19e50..02ba323d64817 100644
--- a/xbmc/windowing/wayland/WinSystemWayland.cpp
+++ b/xbmc/windowing/wayland/WinSystemWayland.cpp
@@ -343,7 +343,7 @@ bool CWinSystemWayland::CreateNewWindow(const std::string& name,
@@ -343,7 +343,7 @@ bool CWinSystemWayland::CreateNewWindow(
// Update resolution with real size as it could have changed due to configure()
UpdateDesktopResolution(res, res.strOutput, m_bufferSize.Width(), m_bufferSize.Height(), res.fRefreshRate, 0);
@ -47,7 +43,7 @@ index bd17b44a19e50..02ba323d64817 100644
// Now start processing events
//
@@ -787,7 +787,7 @@ void CWinSystemWayland::OnConfigure(std::uint32_t serial, CSizeInt size, IShellS
@@ -787,7 +787,7 @@ void CWinSystemWayland::OnConfigure(std:
CLog::LogF(LOGDEBUG, "Initial configure serial {}: size {}x{} state {}", serial, size.Width(),
size.Height(), IShellSurface::StateToString(state));
m_shellSurfaceState = state;
@ -56,7 +52,7 @@ index bd17b44a19e50..02ba323d64817 100644
{
UpdateSizeVariables(size, m_scale, m_shellSurfaceState, true);
}
@@ -1015,6 +1015,7 @@ CWinSystemWayland::SizeUpdateInformation CWinSystemWayland::UpdateSizeVariables(
@@ -1015,6 +1015,7 @@ CWinSystemWayland::SizeUpdateInformation
m_surfaceSize = sizes.surfaceSize;
m_bufferSize = sizes.bufferSize;
m_configuredSize = sizes.configuredSize;