From 5a2d32a3c64d0a823d1b0616e1004ba2d1182b3d Mon Sep 17 00:00:00 2001 From: CvH Date: Sat, 2 Apr 2022 21:20:53 +0200 Subject: [PATCH 1/4] crossguid: switch to cmake --- packages/devel/crossguid/package.mk | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/packages/devel/crossguid/package.mk b/packages/devel/crossguid/package.mk index 65588fe428..45a0c78be3 100644 --- a/packages/devel/crossguid/package.mk +++ b/packages/devel/crossguid/package.mk @@ -10,16 +10,6 @@ PKG_SITE="https://github.com/graeme-hill/crossguid" PKG_URL="https://github.com/graeme-hill/crossguid/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain util-linux" PKG_LONGDESC="minimal, cross platform, C++ GUID library" -PKG_TOOLCHAIN="manual" -make_target() { - ${CXX} -c ../src/guid.cpp -o guid.o ${CXXFLAGS} -I../include --std=c++17 -DGUID_LIBUUID - ${AR} rvs libcrossguid.a guid.o -} - -makeinstall_target() { - mkdir -p ${SYSROOT_PREFIX}/usr/lib/ - cp libcrossguid.a ${SYSROOT_PREFIX}/usr/lib/ - mkdir -p ${SYSROOT_PREFIX}/usr/include/ - cp ../include/crossguid/guid.hpp ${SYSROOT_PREFIX}/usr/include -} +PKG_CMAKE_OPTS_TARGET="-DCROSSGUID_TESTS=OFF \ + -Wno-dev" From 23ce24f02db074869f9d76275133f0cad53af5bf Mon Sep 17 00:00:00 2001 From: CvH Date: Sat, 2 Apr 2022 21:03:44 +0200 Subject: [PATCH 2/4] kodi: update to 75d8ad5 --- packages/mediacenter/kodi/package.mk | 4 +- .../kodi-100.07-disable-minimize.patch | 2 +- .../patches/kodi-100.10-handle-SIGTERM.patch | 56 +++++++------------ 3 files changed, 24 insertions(+), 38 deletions(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 21ec636dff..6b6a0a7a0f 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="2f11e994f322f7376476b186293a3df34246b9a7" -PKG_SHA256="7268c2900c5b893f331e471b31bfb214ff91473753b78211887247585bb82487" +PKG_VERSION="75d8ad548b4563612b79484576315db1b088dd7b" +PKG_SHA256="cc18facab956c45a8ac5425f8eb6e2ddd32e8858ea2f6624fd0699c47fe45860" 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.07-disable-minimize.patch b/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch index b990626e55..bbc7f371f4 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 -@@ -2092,7 +2092,6 @@ void CApplication::OnApplicationMessage( +@@ -2106,7 +2106,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 581511c582..d576c686a1 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 e658546b32da44813c3a9913fc55c71e1e946b13 Mon Sep 17 00:00:00 2001 +From 244cbd6ac18eb6e2ce2c7a89c95cd33380439caa Mon Sep 17 00:00:00 2001 From: MilhouseVH -Date: Thu, 10 Mar 2022 23:20:09 +0100 +Date: Sun, 3 Apr 2022 11:31:07 +0200 Subject: [PATCH] handle SIGTERM 0. CApplication::Stop cant be trusted. (deadlocks crashes and boo) @@ -16,15 +16,13 @@ so, when shutdown/reboot is requested: 7. KILL --- xbmc/Application.cpp | 24 ++++++++++++++----- - xbmc/Application.h | 1 + - xbmc/XBApplicationEx.cpp | 1 + - xbmc/XBApplicationEx.h | 1 + + xbmc/Application.h | 2 ++ .../powermanagement/LogindUPowerSyscall.cpp | 2 -- - 5 files changed, 21 insertions(+), 8 deletions(-) + 3 files changed, 20 insertions(+), 8 deletions(-) --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -1968,12 +1968,12 @@ void CApplication::OnApplicationMessage( +@@ -1982,12 +1982,12 @@ void CApplication::OnApplicationMessage( switch (msg) { case TMSG_POWERDOWN: @@ -39,7 +37,7 @@ so, when shutdown/reboot is requested: break; case TMSG_SHUTDOWN: -@@ -1994,12 +1994,13 @@ void CApplication::OnApplicationMessage( +@@ -2008,12 +2008,13 @@ void CApplication::OnApplicationMessage( case TMSG_RESTART: case TMSG_RESET: @@ -54,7 +52,7 @@ so, when shutdown/reboot is requested: Stop(EXITCODE_RESTARTAPP); #endif break; -@@ -2530,7 +2531,7 @@ bool CApplication::Stop(int exitCode) +@@ -2598,7 +2599,7 @@ bool CApplication::Stop(int exitCode) m_frameMoveGuard.unlock(); CVariant vExitCode(CVariant::VariantTypeObject); @@ -63,15 +61,15 @@ so, when shutdown/reboot is requested: CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode); // Abort any active screensaver -@@ -2562,7 +2563,6 @@ bool CApplication::Stop(int exitCode) +@@ -2630,7 +2631,6 @@ bool CApplication::Stop(int exitCode) // Needs cleaning up - CApplicationMessenger::GetInstance().Stop(); + CServiceBroker::GetAppMessenger()->Stop(); m_AppFocused = false; - m_ExitCode = exitCode; CLog::Log(LOGINFO, "Stopping all"); // cancel any jobs from the jobmanager -@@ -3149,6 +3149,18 @@ void CApplication::OnQueueNextItem() +@@ -3217,6 +3217,18 @@ void CApplication::OnQueueNextItem() CServiceBroker::GetGUI()->GetWindowManager().SendThreadMessage(msg); } @@ -90,18 +88,18 @@ so, when shutdown/reboot is requested: void CApplication::OnPlayBackStopped() { CLog::LogF(LOGDEBUG, "CApplication::OnPlayBackStopped"); -@@ -4215,7 +4227,7 @@ void CApplication::ProcessSlow() +@@ -4284,7 +4296,7 @@ void CApplication::ProcessSlow() if (CPlatformPosix::TestQuitFlag()) { CLog::Log(LOGINFO, "Quitting due to POSIX signal"); -- CApplicationMessenger::GetInstance().PostMsg(TMSG_QUIT); -+ CApplicationMessenger::GetInstance().PostMsg(TMSG_RESTARTAPP); +- CServiceBroker::GetAppMessenger()->PostMsg(TMSG_QUIT); ++ CServiceBroker::GetAppMessenger()->PostMsg(TMSG_RESTARTAPP); } #endif --- a/xbmc/Application.h +++ b/xbmc/Application.h -@@ -138,6 +138,7 @@ public: +@@ -153,6 +153,7 @@ public: bool InitWindow(RESOLUTION res = RES_INVALID); bool IsCurrentThread() const; @@ -109,26 +107,14 @@ so, when shutdown/reboot is requested: bool Stop(int exitCode); void UnloadSkin(); bool LoadCustomWindows(); ---- a/xbmc/XBApplicationEx.cpp -+++ b/xbmc/XBApplicationEx.cpp -@@ -22,6 +22,7 @@ CXBApplicationEx::CXBApplicationEx() - m_bStop = false; - m_AppFocused = true; - m_ExitCode = EXITCODE_QUIT; -+ m_ExitCodeSet = false; - m_renderGUI = false; - } - ---- a/xbmc/XBApplicationEx.h -+++ b/xbmc/XBApplicationEx.h -@@ -29,6 +29,7 @@ public: - // Variables for timing - bool m_bStop; - int m_ExitCode; -+ bool m_ExitCodeSet; - bool m_AppFocused; - bool m_renderGUI; +@@ -458,6 +459,7 @@ private: + CApplicationStackHelper m_stackHelper; + std::string m_windowing; + int m_ExitCode{EXITCODE_QUIT}; ++ bool m_ExitCodeSet = false; + }; + XBMC_GLOBAL_REF(CApplication,g_application); --- a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp +++ b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp @@ -78,8 +78,6 @@ CLogindUPowerSyscall::~CLogindUPowerSysc From da0463bbf4c45c1364765073d311e29205b370d5 Mon Sep 17 00:00:00 2001 From: CvH Date: Wed, 13 Apr 2022 21:22:08 +0200 Subject: [PATCH 3/4] kodi: update to 70d6b0c --- packages/mediacenter/kodi/package.mk | 4 ++-- .../kodi/patches/kodi-100.03-disable-online-check.patch | 4 ++-- .../mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 6b6a0a7a0f..9b92c04e6f 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="75d8ad548b4563612b79484576315db1b088dd7b" -PKG_SHA256="cc18facab956c45a8ac5425f8eb6e2ddd32e8858ea2f6624fd0699c47fe45860" +PKG_VERSION="70d6b0c2e5a63e8076f7e9cf26331c2441ada371" +PKG_SHA256="6fa01090795b5548db5606e120cade2a93265f65dc4ea3daae5f1ab5701c9fa8" 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 6fef36b352..c07e189fe1 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 @@ -13,7 +13,7 @@ Subject: disable online check {"uptime", SYSTEM_UPTIME}, --- a/xbmc/utils/SystemInfo.cpp +++ b/xbmc/utils/SystemInfo.cpp -@@ -273,7 +273,6 @@ bool CSysInfoJob::DoWork() +@@ -275,7 +275,6 @@ bool CSysInfoJob::DoWork() { m_info.systemUptime = GetSystemUpTime(false); m_info.systemTotalUptime = GetSystemUpTime(true); @@ -21,7 +21,7 @@ Subject: disable online check m_info.videoEncoder = GetVideoEncoder(); m_info.cpuFrequency = StringUtils::Format("{:4.0f} MHz", CServiceBroker::GetCPUInfo()->GetCPUFrequency()); -@@ -1016,9 +1015,7 @@ int CSysInfo::GetXbmcBitness(void) +@@ -1021,9 +1020,7 @@ int CSysInfo::GetXbmcBitness(void) bool CSysInfo::HasInternet() { 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 d576c686a1..acba02f7a7 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch @@ -107,7 +107,7 @@ so, when shutdown/reboot is requested: bool Stop(int exitCode); void UnloadSkin(); bool LoadCustomWindows(); -@@ -458,6 +459,7 @@ private: +@@ -454,6 +455,7 @@ private: CApplicationStackHelper m_stackHelper; std::string m_windowing; int m_ExitCode{EXITCODE_QUIT}; From ac05256265eb6f2bbb090b1d116322d2ba014278 Mon Sep 17 00:00:00 2001 From: CvH Date: Wed, 13 Apr 2022 21:23:14 +0200 Subject: [PATCH 4/4] kodi: change KodiConfig path due upstream change - https://github.com/xbmc/xbmc/commit/70d6b0c2e5a63e8076f7e9cf26331c2441ada371 --- packages/mediacenter/kodi/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 9b92c04e6f..fca3a9b95b 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -348,7 +348,7 @@ post_makeinstall_target() { # more binaddons cross compile badness meh sed -e "s:INCLUDE_DIR /usr/include/kodi:INCLUDE_DIR ${SYSROOT_PREFIX}/usr/include/kodi:g" \ -e "s:CMAKE_MODULE_PATH /usr/lib/kodi /usr/share/kodi/cmake:CMAKE_MODULE_PATH ${SYSROOT_PREFIX}/usr/share/kodi/cmake:g" \ - -i ${SYSROOT_PREFIX}/usr/share/kodi/cmake/KodiConfig.cmake + -i ${SYSROOT_PREFIX}/usr/lib/kodi/cmake/KodiConfig.cmake if [ "${KODI_EXTRA_FONTS}" = yes ]; then mkdir -p ${INSTALL}/usr/share/kodi/media/Fonts