From 99a47205208548fb3b675f9666f9bf139975a7c0 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 1 Jan 2018 14:32:24 +0000 Subject: [PATCH] kodi: fixup patches after PR13190 --- .../patches/kodi-100.10-handle-SIGTERM.patch | 38 +++++++++---------- .../kodi-999.99-detect-intel-gpus.patch | 18 ++++----- 2 files changed, 28 insertions(+), 28 deletions(-) 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 2d78501032..45b33db04a 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch @@ -1,6 +1,6 @@ -From f7b15b94254a0af6009ed38cc45bcf63cb1b510d Mon Sep 17 00:00:00 2001 +From 006bcc66f7bc25f0df8aa52efa3b151766f9a5ec Mon Sep 17 00:00:00 2001 From: MilhouseVH -Date: Tue, 4 Jul 2017 20:51:08 +0100 +Date: Wed, 20 Dec 2017 07:26:55 +0000 Subject: [PATCH] handle SIGTERM 0. CApplication::Stop cant be trusted. (deadlocks crashes and boo) @@ -23,16 +23,16 @@ so, when shutdown/reboot is requested: 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index ee50f37..28034c8 100644 +index 334ecec..e3101ff 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2355,12 +2355,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) - switch (pMsg->dwMessage) +@@ -2373,12 +2373,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) + switch (msg) { case TMSG_POWERDOWN: - Stop(EXITCODE_POWERDOWN); + SetExitCode(EXITCODE_POWERDOWN); - g_powerManager.Powerdown(); + CServiceBroker::GetPowerManager().Powerdown(); break; case TMSG_QUIT: @@ -41,13 +41,13 @@ index ee50f37..28034c8 100644 break; case TMSG_SHUTDOWN: -@@ -2381,12 +2381,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) +@@ -2399,12 +2399,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) case TMSG_RESTART: case TMSG_RESET: - Stop(EXITCODE_REBOOT); + SetExitCode(EXITCODE_REBOOT); - g_powerManager.Reboot(); + CServiceBroker::GetPowerManager().Reboot(); break; case TMSG_RESTARTAPP: @@ -56,7 +56,7 @@ index ee50f37..28034c8 100644 Stop(EXITCODE_RESTARTAPP); #endif break; -@@ -2805,6 +2806,17 @@ bool CApplication::Cleanup() +@@ -2821,6 +2822,17 @@ bool CApplication::Cleanup() } } @@ -74,7 +74,7 @@ index ee50f37..28034c8 100644 void CApplication::Stop(int exitCode) { try -@@ -2812,7 +2824,7 @@ void CApplication::Stop(int exitCode) +@@ -2828,7 +2840,7 @@ void CApplication::Stop(int exitCode) m_frameMoveGuard.unlock(); CVariant vExitCode(CVariant::VariantTypeObject); @@ -83,7 +83,7 @@ index ee50f37..28034c8 100644 CAnnouncementManager::GetInstance().Announce(System, "xbmc", "OnQuit", vExitCode); // Abort any active screensaver -@@ -2846,7 +2858,6 @@ void CApplication::Stop(int exitCode) +@@ -2860,7 +2872,6 @@ void CApplication::Stop(int exitCode) // Needs cleaning up CApplicationMessenger::GetInstance().Stop(); m_AppFocused = false; @@ -92,22 +92,22 @@ index ee50f37..28034c8 100644 // cancel any jobs from the jobmanager diff --git a/xbmc/Application.h b/xbmc/Application.h -index 1402787..c21ab93 100644 +index 9d0b2d4..7b0e18b 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h -@@ -147,6 +147,7 @@ public: +@@ -153,6 +153,7 @@ public: bool StartServer(enum ESERVERS eServer, bool bStart, bool bWait = false); bool IsCurrentThread() const; + void SetExitCode(int exitCode); void Stop(int exitCode); - void RestartApp(); void UnloadSkin(bool forReload = false); + bool LoadCustomWindows(); diff --git a/xbmc/XBApplicationEx.cpp b/xbmc/XBApplicationEx.cpp -index 035aed2..34102f5 100644 +index edfea4f..96f245f 100644 --- a/xbmc/XBApplicationEx.cpp +++ b/xbmc/XBApplicationEx.cpp -@@ -46,6 +46,7 @@ CXBApplicationEx::CXBApplicationEx() +@@ -42,6 +42,7 @@ CXBApplicationEx::CXBApplicationEx() m_bStop = false; m_AppFocused = true; m_ExitCode = EXITCODE_QUIT; @@ -116,7 +116,7 @@ index 035aed2..34102f5 100644 } diff --git a/xbmc/XBApplicationEx.h b/xbmc/XBApplicationEx.h -index 3c8dffd..e96bd5e 100644 +index 6fb2f6c..4bc11fc 100644 --- a/xbmc/XBApplicationEx.h +++ b/xbmc/XBApplicationEx.h @@ -42,6 +42,7 @@ public: @@ -128,7 +128,7 @@ index 3c8dffd..e96bd5e 100644 bool m_renderGUI; diff --git a/xbmc/platform/posix/main.cpp b/xbmc/platform/posix/main.cpp -index bee93da..e36af76 100644 +index fccef84..88e928f 100644 --- a/xbmc/platform/posix/main.cpp +++ b/xbmc/platform/posix/main.cpp @@ -63,7 +63,7 @@ protected: @@ -141,5 +141,5 @@ index bee93da..e36af76 100644 }; -- -2.7.4 +2.14.1 diff --git a/packages/mediacenter/kodi/patches/kodi-999.99-detect-intel-gpus.patch b/packages/mediacenter/kodi/patches/kodi-999.99-detect-intel-gpus.patch index e8d6a3fdbf..935885b446 100644 --- a/packages/mediacenter/kodi/patches/kodi-999.99-detect-intel-gpus.patch +++ b/packages/mediacenter/kodi/patches/kodi-999.99-detect-intel-gpus.patch @@ -1,17 +1,17 @@ -From f040af300925c03a1547ff02d71921bde9893330 Mon Sep 17 00:00:00 2001 +From 94476cdec9d11160e201ba431fb4e4d6a7c481c8 Mon Sep 17 00:00:00 2001 From: fritsch Date: Sat, 14 Jan 2017 10:23:11 +0100 Subject: [PATCH] VAAPI/VDPAU: Integration specific to LibreELEC --- - xbmc/settings/Settings.cpp | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) + xbmc/settings/Settings.cpp | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) diff --git a/xbmc/settings/Settings.cpp b/xbmc/settings/Settings.cpp -index 9940b6a..d7575f0 100644 +index 96a1e95..78545a0 100644 --- a/xbmc/settings/Settings.cpp +++ b/xbmc/settings/Settings.cpp -@@ -77,6 +77,7 @@ +@@ -76,6 +76,7 @@ #include "utils/log.h" #include "utils/RssManager.h" #include "utils/StringUtils.h" @@ -19,12 +19,11 @@ index 9940b6a..d7575f0 100644 #include "utils/SystemInfo.h" #include "utils/Weather.h" #include "utils/XBMCTinyXML.h" -@@ -914,8 +915,24 @@ void CSettings::InitializeDefaults() +@@ -666,6 +667,21 @@ void CSettings::InitializeDefaults() if (g_application.IsStandAlone()) std::static_pointer_cast(GetSettingsManager()->GetSetting(CSettings::SETTING_POWERMANAGEMENT_SHUTDOWNSTATE))->SetDefault(POWERSTATE_SHUTDOWN); + -+ +// LibreELEC integration patch. We ship a special limited range intel kernel patch +// that enables us to control the full / limited / clamping with just altering +// the kodi limitedrange setting. @@ -39,8 +38,9 @@ index 9940b6a..d7575f0 100644 + std::static_pointer_cast(GetSettingsManager()->GetSetting(CSettings::SETTING_VIDEOPLAYER_USEVAAPI))->SetDefault(isIntel); + std::static_pointer_cast(GetSettingsManager()->GetSetting(CSettings::SETTING_VIDEOPLAYER_USEVDPAU))->SetDefault(!isIntel); +#endif - - g_powerManager.SetDefaults(); } void CSettings::InitializeOptionFillers() +-- +2.14.1 +