Merge pull request #6673 from HiassofT/le11-kodi-20a1+

kodi: update to 20.0a2-Nexus

packages/mediacenter/kodi/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="kodi"
-PKG_VERSION="20.0a1-Nexus"
+PKG_VERSION="20.0a2-Nexus"
-PKG_SHA256="8c99bc18e982a55f55b10f643ceb873b79eeea47d5090a75ad594335d10a3b50"
+PKG_SHA256="f178c6ff41ba79421c422e7ea1803d446bcbba20d08e84e547cb107e2d485e8b"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.kodi.tv"
 PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz"
@@ -233,6 +233,7 @@ configure_package() {
                          -DENABLE_TESTING=OFF \
                          -DENABLE_INTERNAL_FLATBUFFERS=OFF \
                          -DENABLE_LCMS2=OFF \
+                         -DADDONS_CONFIGURE_AT_STARTUP=OFF \
                          ${PKG_KODI_USE_LTO} \
                          ${KODI_ARCH} \
                          ${KODI_NEON} \

packages/mediacenter/kodi/patches/0001-CPlatformLinux-ifdef-alsa-support.patch

@@ -1,62 +0,0 @@
-From 4839aa9e65478bab3a1f61bab06419348daa061c Mon Sep 17 00:00:00 2001
-From: Lukas Rusak <lorusak@gmail.com>
-Date: Tue, 17 May 2022 10:43:44 -0700
-Subject: [PATCH] CPlatformLinux: ifdef alsa support
-
----
- xbmc/platform/linux/PlatformLinux.cpp | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/xbmc/platform/linux/PlatformLinux.cpp b/xbmc/platform/linux/PlatformLinux.cpp
-index dd2e35f2e2..4a1e104eb9 100644
---- a/xbmc/platform/linux/PlatformLinux.cpp
-+++ b/xbmc/platform/linux/PlatformLinux.cpp
-@@ -8,11 +8,17 @@
- 
- #include "PlatformLinux.h"
- 
-+#if defined(HAS_ALSA)
- #include "cores/AudioEngine/Sinks/alsa/ALSADeviceMonitor.h"
- #include "cores/AudioEngine/Sinks/alsa/ALSAHControlMonitor.h"
-+#endif
-+
- #include "utils/StringUtils.h"
- 
-+#if defined(HAS_ALSA)
- #include "platform/linux/FDEventMonitor.h"
-+#endif
-+
- #include "platform/linux/powermanagement/LinuxPowerSyscall.h"
- 
- // clang-format off
-@@ -122,6 +128,7 @@ bool CPlatformLinux::InitStageOne()
- 
-   m_lirc.reset(OPTIONALS::LircRegister());
- 
-+#if defined(HAS_ALSA)
-   RegisterService(std::make_shared<CFDEventMonitor>());
- #if defined(HAVE_LIBUDEV)
-   RegisterService(std::make_shared<CALSADeviceMonitor>());
-@@ -129,11 +136,13 @@ bool CPlatformLinux::InitStageOne()
- #if !defined(HAVE_X11)
-   RegisterService(std::make_shared<CALSAHControlMonitor>());
- #endif
-+#endif // HAS_ALSA
-   return true;
- }
- 
- void CPlatformLinux::DeinitStageOne()
- {
-+#if defined(HAS_ALSA)
- #if !defined(HAVE_X11)
-   DeregisterService(typeid(CALSAHControlMonitor));
- #endif
-@@ -141,4 +150,5 @@ void CPlatformLinux::DeinitStageOne()
-   DeregisterService(typeid(CALSADeviceMonitor));
- #endif
-   DeregisterService(typeid(CFDEventMonitor));
-+#endif // HAS_ALSA
- }
--- 
-2.35.3
-

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 <milhouseVH.github@nmacleod.com>
 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};

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

@@ -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)
+-        set(INTERNAL_TEXTUREPACKER_INSTALLABLE TRUE CACHE BOOL "" FORCE)
 -      endif()
+     endif()
  
      # Use it during build if build architecture can be executed on host
-     # and TEXTUREPACKER_EXECUTABLE is not found

packages/mediacenter/kodi/patches/kodi-100.31.le-addons-no-startupenable.patch

@@ -1,22 +0,0 @@
-Date: Tue, 25 May 2021 19:32:28 +0200
-Subject: [PATCH] Remove "disable addon dialog at startup" for LibreELEC.
-
-The feature is not only not needed for LE but as well does enable the DVB
-driver addons.
-
-See https://github.com/LibreELEC/LibreELEC.tv/issues/5397 and
-https://github.com/xbmc/xbmc/pull/19091
----
- xbmc/platform/linux/PlatformLinux.h | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/xbmc/platform/linux/PlatformLinux.h
-+++ b/xbmc/platform/linux/PlatformLinux.h
-@@ -23,7 +23,6 @@ public:
-   bool InitStageOne() override;
-   void DeinitStageOne() override;
- 
--  bool IsConfigureAddonsAtStartupEnabled() override { return true; }
- 
- private:
-   std::unique_ptr<OPTIONALS::CLircContainer, OPTIONALS::delete_CLircContainer> m_lirc;

packages/multimedia/libdvdcss/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libdvdcss"
-PKG_VERSION="1.4.2-Leia-Beta-5"
+PKG_VERSION="1.4.3-Next-Nexus-Alpha2-2"
-PKG_SHA256="38816f8373e243bc5950449b4f3b18938c4e1c59348e3411e23f31db4072e40d"
+PKG_SHA256="f38c4a4e7a4f4da6d8e83b8852489aa3bb6588a915dc41f5ee89d9aad305a06e"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/xbmc/libdvdcss"
 PKG_URL="https://github.com/xbmc/libdvdcss/archive/${PKG_VERSION}.tar.gz"

packages/multimedia/libdvdnav/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libdvdnav"
-PKG_VERSION="6.0.0-Leia-Alpha-3"
+PKG_VERSION="6.1.1-Next-Nexus-Alpha2-2"
-PKG_SHA256="071e414e61b795f2ff9015b21a85fc009dde967f27780d23092643916538a57a"
+PKG_SHA256="584f62a3896794408d46368e2ecf2c6217ab9c676ce85921b2d68b8961f49dfc"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/xbmc/libdvdnav"
 PKG_URL="https://github.com/xbmc/libdvdnav/archive/${PKG_VERSION}.tar.gz"

packages/multimedia/libdvdread/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libdvdread"
-PKG_VERSION="6.0.0-Leia-Alpha-3"
+PKG_VERSION="6.1.3-Next-Nexus-Alpha2-2"
-PKG_SHA256="a30b6aa0aad0f2c505bc77948af2d5531a80b6e68112addb4c123fca24d5d3bf"
+PKG_SHA256="719130091e3adc9725ba72df808f24a14737a009dca5a4c38c601c0c76449b62"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/xbmc/libdvdread"
 PKG_URL="https://github.com/xbmc/libdvdread/archive/${PKG_VERSION}.tar.gz"