jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-05 17:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

kodi: fix patches

Browse Source 
Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2022-07-03 10:23:11 +02:00
parent 4abde5dbb3
commit e8aa60f46e
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch
View File

@ -1,4 +1,4 @@
From c76c93444a0f7a87530c51ff9ec6ca6a35554a41 Mon Sep 17 00:00:00 2001 From f0bca779d21f12be077d97891aa321f02064a089 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com> From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sun, 3 Apr 2022 11:31:07 +0200 Date: Sun, 3 Apr 2022 11:31:07 +0200
Subject: [PATCH] handle SIGTERM Subject: [PATCH] handle SIGTERM
@ -21,10 +21,10 @@ so, when shutdown/reboot is requested:
3 files changed, 20 insertions(+), 8 deletions(-) 3 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index f20d05f50b..fd0781ed38 100644 index bc5b15523d..3049d6ca61 100644
--- a/xbmc/Application.cpp --- a/xbmc/Application.cpp
+++ b/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) switch (msg)
{ {
case TMSG_POWERDOWN: case TMSG_POWERDOWN:
@ -39,7 +39,7 @@ index f20d05f50b..fd0781ed38 100644
break; break;
case TMSG_SHUTDOWN: 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_RESTART:
case TMSG_RESET: case TMSG_RESET:
@ -54,7 +54,7 @@ index f20d05f50b..fd0781ed38 100644
Stop(EXITCODE_RESTARTAPP); Stop(EXITCODE_RESTARTAPP);
#endif #endif
break; break;
@@ -2292,7 +2293,7 @@ bool CApplication::Stop(int exitCode) @@ -2024,7 +2025,7 @@ bool CApplication::Stop(int exitCode)
m_frameMoveGuard.unlock(); m_frameMoveGuard.unlock();
CVariant vExitCode(CVariant::VariantTypeObject); CVariant vExitCode(CVariant::VariantTypeObject);
@ -63,7 +63,7 @@ index f20d05f50b..fd0781ed38 100644
CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode); CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode);
// Abort any active screensaver // 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 // Needs cleaning up
CServiceBroker::GetAppMessenger()->Stop(); CServiceBroker::GetAppMessenger()->Stop();
m_AppFocused = false; m_AppFocused = false;
@ -71,7 +71,7 @@ index f20d05f50b..fd0781ed38 100644
CLog::Log(LOGINFO, "Stopping all"); CLog::Log(LOGINFO, "Stopping all");
// cancel any jobs from the jobmanager // 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) bool CApplication::OnMessage(CGUIMessage& message)
{ {
switch ( message.GetMessage() ) switch ( message.GetMessage() )
@@ -3293,7 +3305,7 @@ void CApplication::ProcessSlow() @@ -3056,7 +3068,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");
@ -100,18 +100,18 @@ index f20d05f50b..fd0781ed38 100644
#endif #endif
diff --git a/xbmc/Application.h b/xbmc/Application.h diff --git a/xbmc/Application.h b/xbmc/Application.h
index fb3e65cc69..33a37519d4 100644 index c938d0a9b3..2fe138b437 100644
--- a/xbmc/Application.h --- a/xbmc/Application.h
+++ b/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 InitWindow(RESOLUTION res = RES_INVALID);
bool IsCurrentThread() const;
+ bool SetExitCode(int exitCode); + bool SetExitCode(int exitCode);
bool Stop(int exitCode); bool Stop(int exitCode);
void ReloadSkin(bool confirm = false); void ReloadSkin(bool confirm = false);
const std::string& CurrentFile(); const std::string& CurrentFile();
@@ -339,6 +340,7 @@ private: @@ -286,6 +287,7 @@ private:
CApplicationPlayer m_appPlayer; CApplicationPlayer m_appPlayer;
CApplicationStackHelper m_stackHelper; CApplicationStackHelper m_stackHelper;
int m_ExitCode{EXITCODE_QUIT}; int m_ExitCode{EXITCODE_QUIT};

21
packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch
View File

@ -1,13 +1,16 @@
--- a/cmake/modules/FindTexturePacker.cmake diff --git a/cmake/modules/buildtools/FindTexturePacker.cmake b/cmake/modules/buildtools/FindTexturePacker.cmake
+++ b/cmake/modules/FindTexturePacker.cmake index a4acf6453a..c56630001a 100644
@@ -52,10 +52,6 @@ if(NOT TARGET TexturePacker::TexturePack --- 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() 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() 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 # Use it during build if build architecture can be executed on host
# and TEXTUREPACKER_EXECUTABLE is not found