From f126d4d3263f564d5bfdb53515ee4bdd60bf52e8 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 15 Jan 2022 13:08:48 +0100 Subject: [PATCH 1/3] kodi: update to 7d4d6e9 Signed-off-by: Matthias Reichl --- 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 86a241dcaf..0651d291e5 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="19.3-Matrix" -PKG_SHA256="440f47e475dd8a48e0a6d41349e83b74890f3fbe8275d3e401d3c50f5b9ea09b" +PKG_VERSION="e8cdc30b9da3125c62094b062c6c2f0f6b5acfb1" +PKG_SHA256="cbc896cda55a31731e4a7d512466e3aafd730aac937ba157eb86e92cdb5ffb6e" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz" From 497b6f554d3859a42e7df6698f3e7505cfa62fd2 Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 21 Nov 2021 15:15:58 +0100 Subject: [PATCH 2/3] kodi: don't build internal TexturePacker - idea taken from https://github.com/CoreELEC/CoreELEC/commit/c7752a688930307b9e5880a2198885cee1d721b4 --- ...kodi-100.26-disable-internal-texturepacker.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch 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 new file mode 100644 index 0000000000..c25234c2ad --- /dev/null +++ b/packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch @@ -0,0 +1,13 @@ +--- a/cmake/modules/FindTexturePacker.cmake ++++ b/cmake/modules/FindTexturePacker.cmake +@@ -52,10 +52,6 @@ if(NOT TARGET TexturePacker::TexturePack + 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 is same as host + # (not cross-compiling) and TEXTUREPACKER_EXECUTABLE is not found From 70986b046eb9721239d141c2a4bc994985152bda Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sat, 15 Jan 2022 13:09:01 +0100 Subject: [PATCH 3/3] kodi: refresh patches Signed-off-by: Matthias Reichl --- .../kodi/patches/kodi-100.03-disable-online-check.patch | 2 +- .../patches/kodi-100.26-disable-internal-texturepacker.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 8a3b1f2fa7..db9c994baa 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 @@ -21,7 +21,7 @@ Subject: disable online check m_info.videoEncoder = GetVideoEncoder(); m_info.cpuFrequency = StringUtils::Format("%4.0f MHz", CServiceBroker::GetCPUInfo()->GetCPUFrequency()); -@@ -1007,9 +1006,7 @@ int CSysInfo::GetXbmcBitness(void) +@@ -1012,9 +1011,7 @@ int CSysInfo::GetXbmcBitness(void) bool CSysInfo::HasInternet() { 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..f7014fb845 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 @@ -1,6 +1,6 @@ --- a/cmake/modules/FindTexturePacker.cmake +++ b/cmake/modules/FindTexturePacker.cmake -@@ -52,10 +52,6 @@ if(NOT TARGET TexturePacker::TexturePack +@@ -53,10 +53,6 @@ if(NOT TARGET TexturePacker::TexturePack endif() endif()