Merge pull request #6222 from HiassofT/le11-kodi-22.02

kodi: update to lastest master version
This commit is contained in:
CvH 2022-02-16 20:29:20 +01:00 committed by GitHub
commit b80d92c51a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 21 additions and 25 deletions

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="e976cd0e3ad9ed0e4ff80e2f97e2fce1922717be" PKG_VERSION="cdb14802e55d6ad12085059419ce515844364d45"
PKG_SHA256="a2ebdddcba17906429252355018403b1ab668c943214e05575d7c9b967ee57fe" PKG_SHA256="ef56c01a8b0052204c99b56039fa5737b99e46d5b58a4a23fc54e910af68b140"
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"

View File

@ -14,7 +14,7 @@ this should probably be removed after OE 6
--- a/xbmc/windowing/X11/WinSystemX11.cpp --- a/xbmc/windowing/X11/WinSystemX11.cpp
+++ b/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) if (fullscreen && hasWM)
{ {

View File

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

View File

@ -76,15 +76,15 @@
public: public:
--- a/xbmc/addons/AddonManager.cpp --- a/xbmc/addons/AddonManager.cpp
+++ b/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; 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); + ADDON::LEAddonHook(addon, ADDON::LE_ADDON_DISABLED);
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)));
@@ -880,6 +881,7 @@ bool CAddonMgr::EnableSingle(const std:: @@ -890,6 +891,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);

View File

@ -24,7 +24,7 @@ so, when shutdown/reboot is requested:
--- a/xbmc/Application.cpp --- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp +++ b/xbmc/Application.cpp
@@ -1933,12 +1933,12 @@ void CApplication::OnApplicationMessage( @@ -1966,12 +1966,12 @@ void CApplication::OnApplicationMessage(
switch (msg) switch (msg)
{ {
case TMSG_POWERDOWN: case TMSG_POWERDOWN:
@ -39,7 +39,7 @@ so, when shutdown/reboot is requested:
break; break;
case TMSG_SHUTDOWN: case TMSG_SHUTDOWN:
@@ -1959,12 +1959,13 @@ void CApplication::OnApplicationMessage( @@ -1992,12 +1992,13 @@ void CApplication::OnApplicationMessage(
case TMSG_RESTART: case TMSG_RESTART:
case TMSG_RESET: case TMSG_RESET:
@ -54,7 +54,7 @@ so, when shutdown/reboot is requested:
Stop(EXITCODE_RESTARTAPP); Stop(EXITCODE_RESTARTAPP);
#endif #endif
break; 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) void CApplication::Stop(int exitCode)
{ {
CLog::Log(LOGINFO, "Stopping player"); 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(); m_frameMoveGuard.unlock();
CVariant vExitCode(CVariant::VariantTypeObject); CVariant vExitCode(CVariant::VariantTypeObject);
@ -81,7 +81,7 @@ so, when shutdown/reboot is requested:
CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode); CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode);
// Abort any active screensaver // 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 // Needs cleaning up
CApplicationMessenger::GetInstance().Stop(); CApplicationMessenger::GetInstance().Stop();
m_AppFocused = false; m_AppFocused = false;
@ -89,7 +89,7 @@ so, when shutdown/reboot is requested:
CLog::Log(LOGINFO, "Stopping all"); CLog::Log(LOGINFO, "Stopping all");
// cancel any jobs from the jobmanager // cancel any jobs from the jobmanager
@@ -4155,7 +4166,7 @@ void CApplication::ProcessSlow() @@ -4199,7 +4210,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");

View File

@ -21,11 +21,9 @@ Fixes: #20629
xbmc/windowing/wayland/WinSystemWayland.cpp | 5 +++-- xbmc/windowing/wayland/WinSystemWayland.cpp | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-) 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 --- a/xbmc/windowing/GraphicContext.cpp
+++ b/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; return;
} }
@ -34,11 +32,9 @@ index 6a90ee28fc05c..83fedbabe1856 100644
{ {
CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_fullScreen = true; CServiceBroker::GetSettingsComponent()->GetAdvancedSettings()->m_fullScreen = true;
m_bFullScreenRoot = 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 --- a/xbmc/windowing/wayland/WinSystemWayland.cpp
+++ b/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() // 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); 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 // 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(), CLog::LogF(LOGDEBUG, "Initial configure serial {}: size {}x{} state {}", serial, size.Width(),
size.Height(), IShellSurface::StateToString(state)); size.Height(), IShellSurface::StateToString(state));
m_shellSurfaceState = state; m_shellSurfaceState = state;
@ -56,7 +52,7 @@ index bd17b44a19e50..02ba323d64817 100644
{ {
UpdateSizeVariables(size, m_scale, m_shellSurfaceState, true); 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_surfaceSize = sizes.surfaceSize;
m_bufferSize = sizes.bufferSize; m_bufferSize = sizes.bufferSize;
m_configuredSize = sizes.configuredSize; m_configuredSize = sizes.configuredSize;

View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libdvdnav" PKG_NAME="libdvdnav"
PKG_VERSION="9277007ce2263b908e9ce3091cc31b3dd87c351c" PKG_VERSION="6.0.0-Leia-Alpha-3"
PKG_SHA256="e50db40a823ddc795d1fe5f18db2517fb3e05fe0c4a88abf1578d95d7a1cce63" PKG_SHA256="071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="https://github.com/xbmc/libdvdnav" PKG_SITE="https://github.com/xbmc/libdvdnav"
PKG_URL="https://github.com/xbmc/libdvdnav/archive/${PKG_VERSION}.tar.gz" PKG_URL="https://github.com/xbmc/libdvdnav/archive/${PKG_VERSION}.tar.gz"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libdvdread" PKG_NAME="libdvdread"
PKG_VERSION="bd6b329f0137ab6a9f779a28dd96f04713735e17" PKG_VERSION="6.0.0-Leia-Alpha-3"
PKG_SHA256="2d9d6d185dd25a983d6dfc2a00207cafdc396a969c227d5edd84b6215b2fba89" PKG_SHA256="a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="https://github.com/xbmc/libdvdread" PKG_SITE="https://github.com/xbmc/libdvdread"
PKG_URL="https://github.com/xbmc/libdvdread/archive/${PKG_VERSION}.tar.gz" PKG_URL="https://github.com/xbmc/libdvdread/archive/${PKG_VERSION}.tar.gz"