mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Merge pull request #8295 from CvH/12.0/kodi_up_051123
kodi: update to fdb4025
This commit is contained in:
commit
390bf71be3
@ -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="c5d20b27537a7375613250318050a74ab9d8953f"
|
PKG_VERSION="fdb402572451ed58b0d54f7b605cccea1d1d7aac"
|
||||||
PKG_SHA256="01dd203fa802cdeb06ec2f8b556ab728bfdcba5ac24c9aaa68faf2cfe6129490"
|
PKG_SHA256="8d49efefa8e3968e9fa417982dbf56d477f35754e8d12d0be94c04fe31a7ea3b"
|
||||||
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"
|
||||||
|
@ -3,7 +3,7 @@ Subject: disable online check
|
|||||||
---
|
---
|
||||||
--- a/xbmc/GUIInfoManager.cpp
|
--- a/xbmc/GUIInfoManager.cpp
|
||||||
+++ b/xbmc/GUIInfoManager.cpp
|
+++ b/xbmc/GUIInfoManager.cpp
|
||||||
@@ -1922,7 +1922,6 @@ const infomap system_labels[] = {
|
@@ -1936,7 +1936,6 @@ const infomap system_labels[] = {
|
||||||
{"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},
|
||||||
|
@ -88,7 +88,7 @@ so, when shutdown/reboot is requested:
|
|||||||
bool CApplication::OnMessage(CGUIMessage& message)
|
bool CApplication::OnMessage(CGUIMessage& message)
|
||||||
{
|
{
|
||||||
switch (message.GetMessage())
|
switch (message.GetMessage())
|
||||||
@@ -3151,7 +3163,7 @@ void CApplication::ProcessSlow()
|
@@ -3128,7 +3140,7 @@ void CApplication::ProcessSlow()
|
||||||
if (CPlatformPosix::TestQuitFlag())
|
if (CPlatformPosix::TestQuitFlag())
|
||||||
{
|
{
|
||||||
CLog::Log(LOGINFO, "Quitting due to POSIX signal");
|
CLog::Log(LOGINFO, "Quitting due to POSIX signal");
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -58,6 +58,7 @@ include(CMakeDependentOption)
|
@@ -62,6 +62,7 @@ include(CMakeDependentOption)
|
||||||
include(cmake/scripts/common/DependencyOptions.cmake)
|
include(cmake/scripts/common/DependencyOptions.cmake)
|
||||||
|
|
||||||
# general
|
# general
|
||||||
@ -8,7 +8,7 @@
|
|||||||
option(VERBOSE "Enable verbose output?" OFF)
|
option(VERBOSE "Enable verbose output?" OFF)
|
||||||
option(ENABLE_CLANGTIDY "Enable clang-tidy support?" OFF)
|
option(ENABLE_CLANGTIDY "Enable clang-tidy support?" OFF)
|
||||||
option(ENABLE_CPPCHECK "Enable cppcheck support?" OFF)
|
option(ENABLE_CPPCHECK "Enable cppcheck support?" OFF)
|
||||||
@@ -133,6 +134,7 @@ core_find_git_rev(APP_SCMID FULL)
|
@@ -138,6 +139,7 @@ core_find_git_rev(APP_SCMID FULL)
|
||||||
set(AUDIO_BACKENDS_LIST "" CACHE STRING "Available audio backends")
|
set(AUDIO_BACKENDS_LIST "" CACHE STRING "Available audio backends")
|
||||||
set(GL_INTERFACES_LIST "" CACHE STRING "Available GL interfaces")
|
set(GL_INTERFACES_LIST "" CACHE STRING "Available GL interfaces")
|
||||||
|
|
||||||
@ -16,7 +16,7 @@
|
|||||||
# Dynamically loaded libraries built with the project
|
# Dynamically loaded libraries built with the project
|
||||||
add_custom_target(${APP_NAME_LC}-libraries)
|
add_custom_target(${APP_NAME_LC}-libraries)
|
||||||
set(LIBRARY_FILES "" CACHE STRING "" FORCE)
|
set(LIBRARY_FILES "" CACHE STRING "" FORCE)
|
||||||
@@ -572,6 +574,7 @@ endif()
|
@@ -582,6 +584,7 @@ endif()
|
||||||
if(FFMPEG_CREATE_SHARED_LIBRARY)
|
if(FFMPEG_CREATE_SHARED_LIBRARY)
|
||||||
set(CMAKE_CXX_CREATE_SHARED_LIBRARY "${FFMPEG_CREATE_SHARED_LIBRARY}")
|
set(CMAKE_CXX_CREATE_SHARED_LIBRARY "${FFMPEG_CREATE_SHARED_LIBRARY}")
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user