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 c2f33e09b3..0c807be744 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch @@ -1,4 +1,4 @@ -From c76c93444a0f7a87530c51ff9ec6ca6a35554a41 Mon Sep 17 00:00:00 2001 +From f0bca779d21f12be077d97891aa321f02064a089 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 3 Apr 2022 11:31:07 +0200 Subject: [PATCH] handle SIGTERM @@ -21,10 +21,10 @@ so, when shutdown/reboot is requested: 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp -index f20d05f50b..fd0781ed38 100644 +index bc5b15523d..3049d6ca61 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -1700,12 +1700,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) +@@ -1432,12 +1432,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) switch (msg) { case TMSG_POWERDOWN: @@ -39,7 +39,7 @@ index f20d05f50b..fd0781ed38 100644 break; case TMSG_SHUTDOWN: -@@ -1726,12 +1726,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) +@@ -1458,12 +1458,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) case TMSG_RESTART: case TMSG_RESET: @@ -54,7 +54,7 @@ index f20d05f50b..fd0781ed38 100644 Stop(EXITCODE_RESTARTAPP); #endif break; -@@ -2292,7 +2293,7 @@ bool CApplication::Stop(int exitCode) +@@ -2024,7 +2025,7 @@ bool CApplication::Stop(int exitCode) m_frameMoveGuard.unlock(); CVariant vExitCode(CVariant::VariantTypeObject); @@ -63,7 +63,7 @@ index f20d05f50b..fd0781ed38 100644 CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode); // Abort any active screensaver -@@ -2324,7 +2325,6 @@ bool CApplication::Stop(int exitCode) +@@ -2056,7 +2057,6 @@ bool CApplication::Stop(int exitCode) // Needs cleaning up CServiceBroker::GetAppMessenger()->Stop(); m_AppFocused = false; @@ -71,7 +71,7 @@ index f20d05f50b..fd0781ed38 100644 CLog::Log(LOGINFO, "Stopping all"); // cancel any jobs from the jobmanager -@@ -2817,6 +2817,18 @@ void CApplication::StopPlaying() +@@ -2580,6 +2580,18 @@ void CApplication::StopPlaying() } } @@ -90,7 +90,7 @@ index f20d05f50b..fd0781ed38 100644 bool CApplication::OnMessage(CGUIMessage& message) { switch ( message.GetMessage() ) -@@ -3293,7 +3305,7 @@ void CApplication::ProcessSlow() +@@ -3056,7 +3068,7 @@ void CApplication::ProcessSlow() if (CPlatformPosix::TestQuitFlag()) { CLog::Log(LOGINFO, "Quitting due to POSIX signal"); @@ -100,18 +100,18 @@ index f20d05f50b..fd0781ed38 100644 #endif diff --git a/xbmc/Application.h b/xbmc/Application.h -index fb3e65cc69..33a37519d4 100644 +index c938d0a9b3..2fe138b437 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h -@@ -152,6 +152,7 @@ public: +@@ -135,6 +135,7 @@ public: + bool CreateGUI(); bool InitWindow(RESOLUTION res = RES_INVALID); - bool IsCurrentThread() const; + bool SetExitCode(int exitCode); bool Stop(int exitCode); void ReloadSkin(bool confirm = false); const std::string& CurrentFile(); -@@ -339,6 +340,7 @@ private: +@@ -286,6 +287,7 @@ private: CApplicationPlayer m_appPlayer; CApplicationStackHelper m_stackHelper; int m_ExitCode{EXITCODE_QUIT}; 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 96299cdd98..e7a8996751 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,13 +1,16 @@ ---- a/cmake/modules/FindTexturePacker.cmake -+++ b/cmake/modules/FindTexturePacker.cmake -@@ -52,10 +52,6 @@ if(NOT TARGET TexturePacker::TexturePack +diff --git a/cmake/modules/buildtools/FindTexturePacker.cmake b/cmake/modules/buildtools/FindTexturePacker.cmake +index a4acf6453a..c56630001a 100644 +--- a/cmake/modules/buildtools/FindTexturePacker.cmake ++++ b/cmake/modules/buildtools/FindTexturePacker.cmake +@@ -50,11 +50,6 @@ if(NOT TARGET TexturePacker::TexturePacker::Executable) + # and unset TEXTUREPACKER_EXECUTABLE variable + message(WARNING "Could not find '${APP_NAME_LC}-TexturePacker' or 'TexturePacker' executable in ${_tppath} supplied by -DWITH_TEXTUREPACKER. Make sure the executable file name matches these names!") endif() +- else() +- # Ship TexturePacker only on Linux and FreeBSD +- if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux") +- set(INTERNAL_TEXTUREPACKER_INSTALLABLE TRUE CACHE BOOL "" FORCE) +- endif() endif() -- # Ship TexturePacker only on Linux and FreeBSD -- if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "Linux") -- set(INTERNAL_TEXTUREPACKER_INSTALLABLE TRUE) -- endif() - # Use it during build if build architecture can be executed on host - # and TEXTUREPACKER_EXECUTABLE is not found