mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-30 06:06:43 +00:00
Merge pull request #6449 from CvH/11.0/kodi_0105
kodi: update to latest
This commit is contained in:
commit
b75264b25d
@ -5,4 +5,4 @@
|
|||||||
OS_VERSION="11.0"
|
OS_VERSION="11.0"
|
||||||
|
|
||||||
# ADDON_VERSION: Addon version
|
# ADDON_VERSION: Addon version
|
||||||
ADDON_VERSION="10.80.5"
|
ADDON_VERSION="10.80.6"
|
||||||
|
@ -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="6f05bd92a217b3313ae8009a8e668cb84854404b"
|
PKG_VERSION="ee3663fd468ec417ea0bba20b0d18f3448c8980c"
|
||||||
PKG_SHA256="2ed25005f3970d7fd478eb4b12902ed279d0ddc1a5883420536ff3959d45f3b3"
|
PKG_SHA256="609e49b0eaa3deb5f85828f8220e5734cdb316889926dcd4d7d312c4772c7898"
|
||||||
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"
|
||||||
|
@ -10,7 +10,7 @@ Subject: [PATCH] use udevil to mount
|
|||||||
|
|
||||||
--- a/xbmc/platform/linux/storage/UDevProvider.cpp
|
--- a/xbmc/platform/linux/storage/UDevProvider.cpp
|
||||||
+++ b/xbmc/platform/linux/storage/UDevProvider.cpp
|
+++ b/xbmc/platform/linux/storage/UDevProvider.cpp
|
||||||
@@ -194,7 +194,7 @@ bool CUDevProvider::Eject(const std::str
|
@@ -202,7 +202,7 @@ bool CUDevProvider::Eject(const std::str
|
||||||
{
|
{
|
||||||
// just go ahead and try to umount the disk
|
// just go ahead and try to umount the disk
|
||||||
// if it does umount, life is good, if not, no loss.
|
// if it does umount, life is good, if not, no loss.
|
||||||
|
@ -9,7 +9,7 @@ Subject: [PATCH 07/13] disable minimize
|
|||||||
|
|
||||||
--- a/xbmc/Application.cpp
|
--- a/xbmc/Application.cpp
|
||||||
+++ b/xbmc/Application.cpp
|
+++ b/xbmc/Application.cpp
|
||||||
@@ -2106,7 +2106,6 @@ void CApplication::OnApplicationMessage(
|
@@ -2171,7 +2171,6 @@ void CApplication::OnApplicationMessage(
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TMSG_MINIMIZE:
|
case TMSG_MINIMIZE:
|
||||||
|
@ -22,7 +22,7 @@ so, when shutdown/reboot is requested:
|
|||||||
|
|
||||||
--- a/xbmc/Application.cpp
|
--- a/xbmc/Application.cpp
|
||||||
+++ b/xbmc/Application.cpp
|
+++ b/xbmc/Application.cpp
|
||||||
@@ -1982,12 +1982,12 @@ void CApplication::OnApplicationMessage(
|
@@ -2047,12 +2047,12 @@ void CApplication::OnApplicationMessage(
|
||||||
switch (msg)
|
switch (msg)
|
||||||
{
|
{
|
||||||
case TMSG_POWERDOWN:
|
case TMSG_POWERDOWN:
|
||||||
@ -37,7 +37,7 @@ so, when shutdown/reboot is requested:
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case TMSG_SHUTDOWN:
|
case TMSG_SHUTDOWN:
|
||||||
@@ -2008,12 +2008,13 @@ void CApplication::OnApplicationMessage(
|
@@ -2073,12 +2073,13 @@ void CApplication::OnApplicationMessage(
|
||||||
|
|
||||||
case TMSG_RESTART:
|
case TMSG_RESTART:
|
||||||
case TMSG_RESET:
|
case TMSG_RESET:
|
||||||
@ -52,7 +52,7 @@ so, when shutdown/reboot is requested:
|
|||||||
Stop(EXITCODE_RESTARTAPP);
|
Stop(EXITCODE_RESTARTAPP);
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
@@ -2598,7 +2599,7 @@ bool CApplication::Stop(int exitCode)
|
@@ -2666,7 +2667,7 @@ bool CApplication::Stop(int exitCode)
|
||||||
m_frameMoveGuard.unlock();
|
m_frameMoveGuard.unlock();
|
||||||
|
|
||||||
CVariant vExitCode(CVariant::VariantTypeObject);
|
CVariant vExitCode(CVariant::VariantTypeObject);
|
||||||
@ -61,7 +61,7 @@ so, when shutdown/reboot is requested:
|
|||||||
CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode);
|
CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode);
|
||||||
|
|
||||||
// Abort any active screensaver
|
// Abort any active screensaver
|
||||||
@@ -2630,7 +2631,6 @@ bool CApplication::Stop(int exitCode)
|
@@ -2698,7 +2699,6 @@ bool CApplication::Stop(int exitCode)
|
||||||
// Needs cleaning up
|
// Needs cleaning up
|
||||||
CServiceBroker::GetAppMessenger()->Stop();
|
CServiceBroker::GetAppMessenger()->Stop();
|
||||||
m_AppFocused = false;
|
m_AppFocused = false;
|
||||||
@ -69,7 +69,7 @@ so, when shutdown/reboot is requested:
|
|||||||
CLog::Log(LOGINFO, "Stopping all");
|
CLog::Log(LOGINFO, "Stopping all");
|
||||||
|
|
||||||
// cancel any jobs from the jobmanager
|
// cancel any jobs from the jobmanager
|
||||||
@@ -3217,6 +3217,18 @@ void CApplication::OnQueueNextItem()
|
@@ -3285,6 +3285,18 @@ void CApplication::OnQueueNextItem()
|
||||||
CServiceBroker::GetGUI()->GetWindowManager().SendThreadMessage(msg);
|
CServiceBroker::GetGUI()->GetWindowManager().SendThreadMessage(msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -88,7 +88,7 @@ so, when shutdown/reboot is requested:
|
|||||||
void CApplication::OnPlayBackStopped()
|
void CApplication::OnPlayBackStopped()
|
||||||
{
|
{
|
||||||
CLog::LogF(LOGDEBUG, "CApplication::OnPlayBackStopped");
|
CLog::LogF(LOGDEBUG, "CApplication::OnPlayBackStopped");
|
||||||
@@ -4284,7 +4296,7 @@ void CApplication::ProcessSlow()
|
@@ -4352,7 +4364,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");
|
||||||
@ -107,9 +107,9 @@ so, when shutdown/reboot is requested:
|
|||||||
bool Stop(int exitCode);
|
bool Stop(int exitCode);
|
||||||
void UnloadSkin();
|
void UnloadSkin();
|
||||||
bool LoadCustomWindows();
|
bool LoadCustomWindows();
|
||||||
@@ -454,6 +455,7 @@ private:
|
@@ -447,6 +448,7 @@ private:
|
||||||
|
CEvent m_playerEvent;
|
||||||
CApplicationStackHelper m_stackHelper;
|
CApplicationStackHelper m_stackHelper;
|
||||||
std::string m_windowing;
|
|
||||||
int m_ExitCode{EXITCODE_QUIT};
|
int m_ExitCode{EXITCODE_QUIT};
|
||||||
+ bool m_ExitCodeSet = false;
|
+ bool m_ExitCodeSet = false;
|
||||||
};
|
};
|
||||||
|
@ -9,7 +9,7 @@ Subject: [PATCH] udevprovider: filter out OE specific mounts
|
|||||||
|
|
||||||
--- a/xbmc/platform/linux/storage/UDevProvider.cpp
|
--- a/xbmc/platform/linux/storage/UDevProvider.cpp
|
||||||
+++ b/xbmc/platform/linux/storage/UDevProvider.cpp
|
+++ b/xbmc/platform/linux/storage/UDevProvider.cpp
|
||||||
@@ -139,6 +139,20 @@ void CUDevProvider::GetDisks(VECSOURCES&
|
@@ -147,6 +147,20 @@ void CUDevProvider::GetDisks(VECSOURCES&
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -9,5 +9,5 @@
|
|||||||
- set(INTERNAL_TEXTUREPACKER_INSTALLABLE TRUE)
|
- set(INTERNAL_TEXTUREPACKER_INSTALLABLE TRUE)
|
||||||
- endif()
|
- endif()
|
||||||
|
|
||||||
# Use it during build if build architecture is same as host
|
# Use it during build if build architecture can be executed on host
|
||||||
# (not cross-compiling) and TEXTUREPACKER_EXECUTABLE is not found
|
# and TEXTUREPACKER_EXECUTABLE is not found
|
||||||
|
Loading…
x
Reference in New Issue
Block a user