jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5898 from CvH/11.0/kodi_1311

Browse Source 
kodi: update to latest
This commit is contained in:
Matthias Reichl 2021-11-21 19:10:37 +01:00 committed by GitHub
commit ddc03f6ad4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/mediacenter/kodi/package.mk
View File

@ -3,8 +3,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="kodi" PKG_NAME="kodi"
PKG_VERSION="aff7e96baad0cadabb378817a078166cc2031cdf" PKG_VERSION="08b7599d63e063545e34a24bb17fc3738cd4dde7"
PKG_SHA256="f5136e1e225c134c3e58680a2c864776927d3181d564d1418e7a27913e1fe9b8" PKG_SHA256="b673a0a0e0db95ead29387b3c1273e77de160b69ff39c18f040c142614314e6a"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv" PKG_SITE="http://www.kodi.tv"
PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz" PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz"

4
packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch
View File

@ -3,7 +3,7 @@ Subject: disable online check
--- ---
--- a/xbmc/GUIInfoManager.cpp --- a/xbmc/GUIInfoManager.cpp
+++ b/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp
@@ -1774,7 +1774,6 @@ const infomap system_labels[] = {{"hasne @@ -1782,7 +1782,6 @@ const infomap system_labels[] = {{"hasne
{"currentcontrol", SYSTEM_CURRENT_CONTROL}, {"currentcontrol", SYSTEM_CURRENT_CONTROL},
{"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID}, {"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID},
{"dvdlabel", SYSTEM_DVD_LABEL}, {"dvdlabel", SYSTEM_DVD_LABEL},
@ -21,7 +21,7 @@ Subject: disable online check
m_info.videoEncoder = GetVideoEncoder(); m_info.videoEncoder = GetVideoEncoder();
m_info.cpuFrequency = m_info.cpuFrequency =
StringUtils::Format("{:4.0f} MHz", CServiceBroker::GetCPUInfo()->GetCPUFrequency()); StringUtils::Format("{:4.0f} MHz", CServiceBroker::GetCPUInfo()->GetCPUFrequency());
@@ -1011,9 +1010,7 @@ int CSysInfo::GetXbmcBitness(void) @@ -1016,9 +1015,7 @@ int CSysInfo::GetXbmcBitness(void)
bool CSysInfo::HasInternet() bool CSysInfo::HasInternet()
{ {

8
packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch
View File

@ -81,10 +81,10 @@
if (GetAddon(id, addon, ADDON_UNKNOWN, OnlyEnabled::NO) && addon != NULL) if (GetAddon(id, addon, ADDON_UNKNOWN, OnlyEnabled::NO) && addon != NULL)
{ {
+ ADDON::LEAddonHook(addon, ADDON::LE_ADDON_DISABLED); + ADDON::LEAddonHook(addon, ADDON::LE_ADDON_DISABLED);
CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(addon, 24141))); auto eventLog = CServiceBroker::GetEventLog();
} if (eventLog)
eventLog->Add(EventPtr(new CAddonManagementEvent(addon, 24141)));
@@ -874,6 +875,7 @@ bool CAddonMgr::EnableSingle(const std:: @@ -880,6 +881,7 @@ bool CAddonMgr::EnableSingle(const std::
if (!m_database.EnableAddon(id)) if (!m_database.EnableAddon(id))
return false; return false;
m_disabled.erase(id); m_disabled.erase(id);

13
packages/mediacenter/kodi/patches/kodi-100.26-disable-internal-texturepacker.patch Normal file
View File

@ -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

4
packages/mediacenter/kodi/patches/kodi-995.01-fix-missing-wayland-scanner-pkg-config.patch
View File

@ -7,11 +7,9 @@ Subject: [PATCH] cmake: allow providing WAYLANDPP_SCANNER in a cross compile
cmake/modules/FindWaylandpp.cmake | 2 ++ cmake/modules/FindWaylandpp.cmake | 2 ++
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/cmake/modules/FindWaylandpp.cmake b/cmake/modules/FindWaylandpp.cmake
index ba229d7ffcb3f..b874cd0ba3218 100644
--- a/cmake/modules/FindWaylandpp.cmake --- a/cmake/modules/FindWaylandpp.cmake
+++ b/cmake/modules/FindWaylandpp.cmake +++ b/cmake/modules/FindWaylandpp.cmake
@@ -22,6 +22,8 @@ pkg_check_modules(PC_WAYLANDPP_SCANNER wayland-scanner++ QUIET) @@ -22,6 +22,8 @@ pkg_check_modules(PC_WAYLANDPP_SCANNER w
if(PC_WAYLANDPP_SCANNER_FOUND) if(PC_WAYLANDPP_SCANNER_FOUND)
pkg_get_variable(PC_WAYLANDPP_SCANNER wayland-scanner++ wayland_scannerpp) pkg_get_variable(PC_WAYLANDPP_SCANNER wayland-scanner++ wayland_scannerpp)