From c9b851faeedc6ec151164576aa37f33f20f6f5ea Mon Sep 17 00:00:00 2001 From: CvH <1355173+CvH@users.noreply.github.com> Date: Tue, 9 Jan 2024 17:51:55 +0100 Subject: [PATCH] kodi: update to f6e78bf --- packages/mediacenter/kodi/package.mk | 4 ++-- .../patches/kodi-100.03-disable-online-check.patch | 4 ++-- .../kodi/patches/kodi-100.07-disable-minimize.patch | 2 +- .../kodi/patches/kodi-100.10-handle-SIGTERM.patch | 12 ++++++------ .../kodi/patches/kodi-999.20-headers-only.patch | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 95bf362b83..2020acbb14 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="bdc4ab89ae787d359f47a0148ef95d512e0be4a9" -PKG_SHA256="805d43803c758b7ee8096ae6605f44e4326509c6e998ddffd8ae978d14fadf42" +PKG_VERSION="f6e78bff33d97e0de5ae5894d80d7f72b9b72f7d" +PKG_SHA256="e4a17223b021ff7c2fd7eab9a7502601bfca9250a014ea02664aaa5128a7697c" 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.03-disable-online-check.patch b/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch index 8697d6ae03..1f5d899d20 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch @@ -3,7 +3,7 @@ Subject: disable online check --- --- a/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp -@@ -1936,7 +1936,6 @@ const infomap system_labels[] = { +@@ -1953,7 +1953,6 @@ const infomap system_labels[] = { {"currentcontrol", SYSTEM_CURRENT_CONTROL}, {"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID}, {"dvdlabel", SYSTEM_DVD_LABEL}, @@ -21,7 +21,7 @@ Subject: disable online check m_info.videoEncoder = GetVideoEncoder(); m_info.cpuFrequency = StringUtils::Format("{:4.0f} MHz", CServiceBroker::GetCPUInfo()->GetCPUFrequency()); -@@ -1105,9 +1104,7 @@ int CSysInfo::GetXbmcBitness(void) +@@ -1107,9 +1106,7 @@ int CSysInfo::GetXbmcBitness(void) bool CSysInfo::HasInternet() { 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 ef0243eaab..87bc9a9aa0 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch @@ -9,7 +9,7 @@ Subject: [PATCH] disable minimize --- a/xbmc/application/Application.cpp +++ b/xbmc/application/Application.cpp -@@ -1579,7 +1579,6 @@ void CApplication::OnApplicationMessage( +@@ -1591,7 +1591,6 @@ void CApplication::OnApplicationMessage( break; case TMSG_MINIMIZE: 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 6a13338bcc..c4d2c6cda7 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch @@ -22,7 +22,7 @@ so, when shutdown/reboot is requested: --- a/xbmc/application/Application.cpp +++ b/xbmc/application/Application.cpp -@@ -1447,12 +1447,12 @@ void CApplication::OnApplicationMessage( +@@ -1459,12 +1459,12 @@ void CApplication::OnApplicationMessage( switch (msg) { case TMSG_POWERDOWN: @@ -37,7 +37,7 @@ so, when shutdown/reboot is requested: break; case TMSG_SHUTDOWN: -@@ -1473,12 +1473,13 @@ void CApplication::OnApplicationMessage( +@@ -1485,12 +1485,13 @@ void CApplication::OnApplicationMessage( case TMSG_RESTART: case TMSG_RESET: @@ -52,7 +52,7 @@ so, when shutdown/reboot is requested: Stop(EXITCODE_RESTARTAPP); #endif break; -@@ -2063,7 +2064,7 @@ bool CApplication::Stop(int exitCode) +@@ -2086,7 +2087,7 @@ bool CApplication::Stop(int exitCode) m_frameMoveGuard.unlock(); CVariant vExitCode(CVariant::VariantTypeObject); @@ -61,7 +61,7 @@ so, when shutdown/reboot is requested: CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode); // Abort any active screensaver -@@ -2095,7 +2096,6 @@ bool CApplication::Stop(int exitCode) +@@ -2118,7 +2119,6 @@ bool CApplication::Stop(int exitCode) // Needs cleaning up CServiceBroker::GetAppMessenger()->Stop(); m_AppFocused = false; @@ -69,7 +69,7 @@ so, when shutdown/reboot is requested: CLog::Log(LOGINFO, "Stopping all"); // cancel any jobs from the jobmanager -@@ -2641,6 +2641,18 @@ void CApplication::StopPlaying() +@@ -2675,6 +2675,18 @@ void CApplication::StopPlaying() } } @@ -88,7 +88,7 @@ so, when shutdown/reboot is requested: bool CApplication::OnMessage(CGUIMessage& message) { switch (message.GetMessage()) -@@ -3128,7 +3140,7 @@ void CApplication::ProcessSlow() +@@ -3245,7 +3257,7 @@ void CApplication::ProcessSlow() if (CPlatformPosix::TestQuitFlag()) { CLog::Log(LOGINFO, "Quitting due to POSIX signal"); diff --git a/packages/mediacenter/kodi/patches/kodi-999.20-headers-only.patch b/packages/mediacenter/kodi/patches/kodi-999.20-headers-only.patch index 8bb89fc7fe..f529dd4a21 100644 --- a/packages/mediacenter/kodi/patches/kodi-999.20-headers-only.patch +++ b/packages/mediacenter/kodi/patches/kodi-999.20-headers-only.patch @@ -1,6 +1,6 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -62,6 +62,7 @@ include(CMakeDependentOption) +@@ -68,6 +68,7 @@ include(CMakeDependentOption) include(cmake/scripts/common/DependencyOptions.cmake) # general @@ -8,7 +8,7 @@ option(VERBOSE "Enable verbose output?" OFF) option(ENABLE_CLANGTIDY "Enable clang-tidy support?" OFF) option(ENABLE_CPPCHECK "Enable cppcheck support?" OFF) -@@ -138,6 +139,7 @@ core_find_git_rev(APP_SCMID FULL) +@@ -144,6 +145,7 @@ core_find_git_rev(APP_SCMID FULL) set(AUDIO_BACKENDS_LIST "" CACHE STRING "Available audio backends") set(GL_INTERFACES_LIST "" CACHE STRING "Available GL interfaces") @@ -16,7 +16,7 @@ # Dynamically loaded libraries built with the project add_custom_target(${APP_NAME_LC}-libraries) set(LIBRARY_FILES "" CACHE STRING "" FORCE) -@@ -582,6 +584,7 @@ endif() +@@ -588,6 +590,7 @@ endif() if(FFMPEG_CREATE_SHARED_LIBRARY) set(CMAKE_CXX_CREATE_SHARED_LIBRARY "${FFMPEG_CREATE_SHARED_LIBRARY}") endif()