diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 6a991dd35a..e03a124f3e 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="kodi" -PKG_VERSION="bb0699db41d50a613de88f2bbe8124d4edf269d3" -PKG_SHA256="28bd28a85e47995d4965ac402228374662bb85ba0644c94c52f371d97c87db1b" +PKG_VERSION="19.0b1-Matrix" +PKG_SHA256="9bc8c94aa60eb4012b8f18dd8fd8eed20fd9a9e8c655fcc922998d7df654c8b5" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz" diff --git a/packages/mediacenter/kodi/patches/kodi-100.06-dont-set-_NET_WM_STATE_FULLSCREEN.patch b/packages/mediacenter/kodi/patches/kodi-100.06-dont-set-_NET_WM_STATE_FULLSCREEN.patch index 715bd0905a..401eb6256e 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.06-dont-set-_NET_WM_STATE_FULLSCREEN.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.06-dont-set-_NET_WM_STATE_FULLSCREEN.patch @@ -13,10 +13,10 @@ this should probably be removed after OE 6 1 file changed, 2 deletions(-) diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp -index 9e6bdc445f..9af86dd393 100644 +index 8a18288fd8..7f2c7022c0 100644 --- a/xbmc/windowing/X11/WinSystemX11.cpp +++ b/xbmc/windowing/X11/WinSystemX11.cpp -@@ -750,8 +750,6 @@ bool CWinSystemX11::SetWindow(int width, int height, bool fullscreen, const std: +@@ -753,8 +753,6 @@ bool CWinSystemX11::SetWindow(int width, int height, bool fullscreen, const std: if (fullscreen && hasWM) { 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 6f40e213ec..2cd15bb17d 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch @@ -8,10 +8,10 @@ Subject: [PATCH 07/13] disable minimize 1 file changed, 1 deletion(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 4bc60d41f6..62267b2cab 100644 +index 35de935a74..5e2bfad695 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -4696,7 +4696,6 @@ bool CApplication::SwitchToFullScreen(bool force /* = false */) +@@ -4681,7 +4681,6 @@ bool CApplication::SwitchToFullScreen(bool force /* = false */) void CApplication::Minimize() { @@ -20,5 +20,5 @@ index 4bc60d41f6..62267b2cab 100644 std::string CApplication::GetCurrentPlayer() -- -2.5.0 +2.25.1 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 af215cd763..00db335923 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 @@ -1,8 +1,8 @@ diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp -index 294c99a76f..52ac89a688 100644 +index 11d304662d..a685ac568a 100644 --- a/xbmc/addons/Addon.cpp +++ b/xbmc/addons/Addon.cpp -@@ -371,6 +371,37 @@ AddonVersion CAddon::GetDependencyVersion(const std::string &dependencyID) const +@@ -375,6 +375,37 @@ AddonVersion CAddon::GetDependencyVersion(const std::string &dependencyID) const return m_addonInfo->DependencyVersion(dependencyID); } @@ -48,9 +48,9 @@ index 294c99a76f..52ac89a688 100644 + if (update) + LEAddonHook(addon, LE_ADDON_POST_UPDATE); // OE - + addon->OnPostInstall(update, modal); -@@ -385,6 +416,8 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal) +@@ -411,6 +445,8 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal) void OnPreUnInstall(const AddonPtr& addon) { @@ -60,7 +60,7 @@ index 294c99a76f..52ac89a688 100644 } diff --git a/xbmc/addons/Addon.h b/xbmc/addons/Addon.h -index 6b72ca62c2..88a5096a7e 100644 +index 9715387588..0f6b23de95 100644 --- a/xbmc/addons/Addon.h +++ b/xbmc/addons/Addon.h @@ -27,6 +27,15 @@ namespace ADDON @@ -80,10 +80,10 @@ index 6b72ca62c2..88a5096a7e 100644 { public: diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp -index d454177cfa..afea05c99d 100644 +index 7606c6f95e..eb65d918cd 100644 --- a/xbmc/addons/AddonManager.cpp +++ b/xbmc/addons/AddonManager.cpp -@@ -780,6 +780,7 @@ bool CAddonMgr::DisableAddon(const std::string& id, AddonDisabledReason disabled +@@ -788,6 +788,7 @@ bool CAddonMgr::DisableAddon(const std::string& id, AddonDisabledReason disabled AddonPtr addon; if (GetAddon(id, addon, ADDON_UNKNOWN, false) && addon != NULL) { @@ -91,7 +91,7 @@ index d454177cfa..afea05c99d 100644 CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(addon, 24141))); } -@@ -808,6 +809,7 @@ bool CAddonMgr::EnableSingle(const std::string& id) +@@ -816,6 +817,7 @@ bool CAddonMgr::EnableSingle(const std::string& id) if (!m_database.EnableAddon(id)) return false; m_disabled.erase(id); 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 9ab3ffa43a..f3f83ecacc 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch @@ -23,10 +23,10 @@ so, when shutdown/reboot is requested: 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index 62267b2cab..1a05196d11 100644 +index 35de935a74..1754152782 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2075,12 +2075,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) +@@ -2060,12 +2060,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) switch (msg) { case TMSG_POWERDOWN: @@ -41,7 +41,7 @@ index 62267b2cab..1a05196d11 100644 break; case TMSG_SHUTDOWN: -@@ -2101,12 +2101,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) +@@ -2086,12 +2086,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) case TMSG_RESTART: case TMSG_RESET: @@ -56,7 +56,7 @@ index 62267b2cab..1a05196d11 100644 Stop(EXITCODE_RESTARTAPP); #endif break; -@@ -2585,6 +2586,17 @@ bool CApplication::Cleanup() +@@ -2570,6 +2571,17 @@ bool CApplication::Cleanup() } } @@ -74,7 +74,7 @@ index 62267b2cab..1a05196d11 100644 void CApplication::Stop(int exitCode) { CLog::Log(LOGINFO, "Stopping player"); -@@ -2611,7 +2623,7 @@ void CApplication::Stop(int exitCode) +@@ -2596,7 +2608,7 @@ void CApplication::Stop(int exitCode) m_frameMoveGuard.unlock(); CVariant vExitCode(CVariant::VariantTypeObject); @@ -83,7 +83,7 @@ index 62267b2cab..1a05196d11 100644 CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode); // Abort any active screensaver -@@ -2643,7 +2655,6 @@ void CApplication::Stop(int exitCode) +@@ -2628,7 +2640,6 @@ void CApplication::Stop(int exitCode) // Needs cleaning up CApplicationMessenger::GetInstance().Stop(); m_AppFocused = false; @@ -91,7 +91,7 @@ index 62267b2cab..1a05196d11 100644 CLog::Log(LOGINFO, "Stopping all"); // cancel any jobs from the jobmanager -@@ -4225,7 +4236,7 @@ void CApplication::ProcessSlow() +@@ -4210,7 +4221,7 @@ void CApplication::ProcessSlow() if (CPlatformPosix::TestQuitFlag()) { CLog::Log(LOGINFO, "Quitting due to POSIX signal"); @@ -101,7 +101,7 @@ index 62267b2cab..1a05196d11 100644 #endif diff --git a/xbmc/Application.h b/xbmc/Application.h -index 5babd5a8fd..421d1f4ea3 100644 +index 050f11afc0..a25af7e93b 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h @@ -156,6 +156,7 @@ public: @@ -110,7 +110,7 @@ index 5babd5a8fd..421d1f4ea3 100644 bool IsCurrentThread() const; + void SetExitCode(int exitCode); void Stop(int exitCode); - void UnloadSkin(bool forReload = false); + void UnloadSkin(); bool LoadCustomWindows(); diff --git a/xbmc/XBApplicationEx.cpp b/xbmc/XBApplicationEx.cpp index 8982725b35..95070fbe9f 100644 @@ -150,5 +150,5 @@ index 5e400772b1..6dc2cbbc4d 100644 } -- -2.20.1 +2.25.1 diff --git a/packages/mediacenter/kodi/patches/kodi-100.12-prevent-kodi-switching-to-windowed-mode.patch b/packages/mediacenter/kodi/patches/kodi-100.12-prevent-kodi-switching-to-windowed-mode.patch index 687b46cfcc..4443acf93a 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.12-prevent-kodi-switching-to-windowed-mode.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.12-prevent-kodi-switching-to-windowed-mode.patch @@ -8,10 +8,10 @@ Subject: [PATCH] prevent kodi switching to windowed mode 1 file changed, 1 insertion(+) diff --git a/xbmc/windowing/X11/WinSystemX11.h b/xbmc/windowing/X11/WinSystemX11.h -index 632f35b6f9..1dac05fa98 100644 +index dec8e81b74..44e4e02ba1 100644 --- a/xbmc/windowing/X11/WinSystemX11.h +++ b/xbmc/windowing/X11/WinSystemX11.h -@@ -46,6 +46,7 @@ public: +@@ -48,6 +48,7 @@ public: void FinishWindowResize(int newWidth, int newHeight) override; bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays) override; void UpdateResolutions() override; @@ -20,5 +20,5 @@ index 632f35b6f9..1dac05fa98 100644 void NotifyAppActiveChange(bool bActivated) override; -- -2.14.1 +2.25.1 diff --git a/packages/mediacenter/kodi/patches/kodi-100.15-rename-default-pulse-device.patch b/packages/mediacenter/kodi/patches/kodi-100.15-rename-default-pulse-device.patch index 51556de2c7..0c44f5c561 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.15-rename-default-pulse-device.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.15-rename-default-pulse-device.patch @@ -9,10 +9,10 @@ Subject: [PATCH] [PATCH] change pulseaudio default device name to Bluetooth 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp -index f2db9226f5..c16114f6d0 100644 +index 8b548046aa..087ed5d2e6 100644 --- a/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp +++ b/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp -@@ -482,13 +482,15 @@ static void SinkInfoRequestCallback(pa_context *c, const pa_sink_info *i, int eo +@@ -481,13 +481,15 @@ static void SinkInfoRequestCallback(pa_context *c, const pa_sink_info *i, int eo CAEDeviceInfo defaultDevice; defaultDevice.m_deviceName = std::string("Default"); defaultDevice.m_displayName = std::string("Default"); @@ -30,5 +30,5 @@ index f2db9226f5..c16114f6d0 100644 if (i && i->name) { -- -2.5.0 +2.25.1 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 ea4c0117e4..f2e1339b40 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 @@ -8,10 +8,10 @@ Subject: [PATCH] refresh /etc/environment on install and uninstall 1 file changed, 6 insertions(+) diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp -index e57f6894cc..3926dc2d1e 100644 +index a685ac568a..f41258a2c2 100644 --- a/xbmc/addons/Addon.cpp +++ b/xbmc/addons/Addon.cpp -@@ -438,6 +438,9 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal) +@@ -441,6 +441,9 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal) // OE addon->OnPostInstall(update, modal); @@ -21,7 +21,7 @@ index e57f6894cc..3926dc2d1e 100644 } void OnPreUnInstall(const AddonPtr& addon) -@@ -450,6 +453,9 @@ void OnPreUnInstall(const AddonPtr& addon) +@@ -453,6 +456,9 @@ void OnPreUnInstall(const AddonPtr& addon) void OnPostUnInstall(const AddonPtr& addon) { addon->OnPostUnInstall();