From 66d647c0eb62a8071d3a9f9bf510a74bea34fb26 Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 1 May 2022 20:02:53 +0200 Subject: [PATCH 1/3] kodi: update to 8cea05c --- packages/mediacenter/kodi/package.mk | 4 ++-- .../kodi-100.04-use-udevil-to-umount.patch | 2 +- .../patches/kodi-100.07-disable-minimize.patch | 2 +- .../patches/kodi-100.10-handle-SIGTERM.patch | 16 ++++++++-------- ...vprovider-filter-out-OE-specific-mounts.patch | 2 +- ...i-100.26-disable-internal-texturepacker.patch | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 0b239daba1..d6963f7aec 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="6f05bd92a217b3313ae8009a8e668cb84854404b" -PKG_SHA256="2ed25005f3970d7fd478eb4b12902ed279d0ddc1a5883420536ff3959d45f3b3" +PKG_VERSION="8cea05c45d1369d6e0cd8cba0e31e58534a494ce" +PKG_SHA256="e952a4829681afeac060870d4aa7e1e136343d39c5e7f339e44ec52804259c10" 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.04-use-udevil-to-umount.patch b/packages/mediacenter/kodi/patches/kodi-100.04-use-udevil-to-umount.patch index fb312e7ff8..542d94091c 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.04-use-udevil-to-umount.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.04-use-udevil-to-umount.patch @@ -10,7 +10,7 @@ Subject: [PATCH] use udevil to mount --- a/xbmc/platform/linux/storage/UDevProvider.cpp +++ b/xbmc/platform/linux/storage/UDevProvider.cpp -@@ -194,7 +194,7 @@ bool CUDevProvider::Eject(const std::str +@@ -202,7 +202,7 @@ bool CUDevProvider::Eject(const std::str { // just go ahead and try to umount the disk // if it does umount, life is good, if not, no loss. 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 bbc7f371f4..fcb94d79f4 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 07/13] disable minimize --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2106,7 +2106,6 @@ void CApplication::OnApplicationMessage( +@@ -2171,7 +2171,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 acba02f7a7..6ef23ee2a7 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.cpp +++ b/xbmc/Application.cpp -@@ -1982,12 +1982,12 @@ void CApplication::OnApplicationMessage( +@@ -2047,12 +2047,12 @@ void CApplication::OnApplicationMessage( switch (msg) { case TMSG_POWERDOWN: @@ -37,7 +37,7 @@ so, when shutdown/reboot is requested: break; case TMSG_SHUTDOWN: -@@ -2008,12 +2008,13 @@ void CApplication::OnApplicationMessage( +@@ -2073,12 +2073,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; -@@ -2598,7 +2599,7 @@ bool CApplication::Stop(int exitCode) +@@ -2666,7 +2667,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 -@@ -2630,7 +2631,6 @@ bool CApplication::Stop(int exitCode) +@@ -2698,7 +2699,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 -@@ -3217,6 +3217,18 @@ void CApplication::OnQueueNextItem() +@@ -3285,6 +3285,18 @@ void CApplication::OnQueueNextItem() CServiceBroker::GetGUI()->GetWindowManager().SendThreadMessage(msg); } @@ -88,7 +88,7 @@ so, when shutdown/reboot is requested: void CApplication::OnPlayBackStopped() { CLog::LogF(LOGDEBUG, "CApplication::OnPlayBackStopped"); -@@ -4284,7 +4296,7 @@ void CApplication::ProcessSlow() +@@ -4352,7 +4364,7 @@ void CApplication::ProcessSlow() if (CPlatformPosix::TestQuitFlag()) { CLog::Log(LOGINFO, "Quitting due to POSIX signal"); @@ -107,9 +107,9 @@ so, when shutdown/reboot is requested: bool Stop(int exitCode); void UnloadSkin(); bool LoadCustomWindows(); -@@ -454,6 +455,7 @@ private: +@@ -447,6 +448,7 @@ private: + CEvent m_playerEvent; CApplicationStackHelper m_stackHelper; - std::string m_windowing; int m_ExitCode{EXITCODE_QUIT}; + bool m_ExitCodeSet = false; }; diff --git a/packages/mediacenter/kodi/patches/kodi-100.13-udevprovider-filter-out-OE-specific-mounts.patch b/packages/mediacenter/kodi/patches/kodi-100.13-udevprovider-filter-out-OE-specific-mounts.patch index 42d152f514..d3d686cfc9 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.13-udevprovider-filter-out-OE-specific-mounts.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.13-udevprovider-filter-out-OE-specific-mounts.patch @@ -9,7 +9,7 @@ Subject: [PATCH] udevprovider: filter out OE specific mounts --- a/xbmc/platform/linux/storage/UDevProvider.cpp +++ b/xbmc/platform/linux/storage/UDevProvider.cpp -@@ -139,6 +139,20 @@ void CUDevProvider::GetDisks(VECSOURCES& +@@ -147,6 +147,20 @@ void CUDevProvider::GetDisks(VECSOURCES& continue; } 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 c25234c2ad..96299cdd98 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 @@ -9,5 +9,5 @@ - set(INTERNAL_TEXTUREPACKER_INSTALLABLE TRUE) - endif() - # Use it during build if build architecture is same as host - # (not cross-compiling) and TEXTUREPACKER_EXECUTABLE is not found + # Use it during build if build architecture can be executed on host + # and TEXTUREPACKER_EXECUTABLE is not found From 53f1d2ff507cb0e79bc5f9c4c35f438fb2ba58b1 Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 3 May 2022 17:09:29 +0200 Subject: [PATCH 2/3] kodi: update to ee3663f --- packages/mediacenter/kodi/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index d6963f7aec..c41f162fa6 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="8cea05c45d1369d6e0cd8cba0e31e58534a494ce" -PKG_SHA256="e952a4829681afeac060870d4aa7e1e136343d39c5e7f339e44ec52804259c10" +PKG_VERSION="ee3663fd468ec417ea0bba20b0d18f3448c8980c" +PKG_SHA256="609e49b0eaa3deb5f85828f8220e5734cdb316889926dcd4d7d312c4772c7898" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz" From b278427d126cdf142811597a6e347962f989591e Mon Sep 17 00:00:00 2001 From: CvH Date: Tue, 3 May 2022 17:10:33 +0200 Subject: [PATCH 3/3] distro: bump ADDON_VERSION to 10.80.6 --- distributions/LibreELEC/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributions/LibreELEC/version b/distributions/LibreELEC/version index 4728f5f9ff..4435ee16dd 100644 --- a/distributions/LibreELEC/version +++ b/distributions/LibreELEC/version @@ -5,4 +5,4 @@ OS_VERSION="11.0" # ADDON_VERSION: Addon version - ADDON_VERSION="10.80.5" + ADDON_VERSION="10.80.6"