mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 21:26:49 +00:00
Merge pull request #8733 from CvH/12.0/kodi_21rc2
kodi: update to 21.0rc2-Omega
This commit is contained in:
commit
071238a901
@ -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="21.0rc1-Omega"
|
PKG_VERSION="21.0rc2-Omega"
|
||||||
PKG_SHA256="28ec05068437fd1223d92375e8b9f79448dc19280c79d3f611496748cde9b146"
|
PKG_SHA256="52580a3b293443da3b560fce822c7c08871bc0089156a6b4f83ea26d54662af4"
|
||||||
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"
|
||||||
|
@ -9,7 +9,7 @@ Subject: [PATCH] disable minimize
|
|||||||
|
|
||||||
--- a/xbmc/application/Application.cpp
|
--- a/xbmc/application/Application.cpp
|
||||||
+++ b/xbmc/application/Application.cpp
|
+++ b/xbmc/application/Application.cpp
|
||||||
@@ -1591,7 +1591,6 @@ void CApplication::OnApplicationMessage(
|
@@ -1605,7 +1605,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/Application.cpp
|
--- a/xbmc/application/Application.cpp
|
||||||
+++ b/xbmc/application/Application.cpp
|
+++ b/xbmc/application/Application.cpp
|
||||||
@@ -1459,12 +1459,12 @@ void CApplication::OnApplicationMessage(
|
@@ -1473,12 +1473,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:
|
||||||
@@ -1485,12 +1485,13 @@ void CApplication::OnApplicationMessage(
|
@@ -1499,12 +1499,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;
|
||||||
@@ -2086,7 +2087,7 @@ bool CApplication::Stop(int exitCode)
|
@@ -2100,7 +2101,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
|
||||||
@@ -2118,7 +2119,6 @@ bool CApplication::Stop(int exitCode)
|
@@ -2132,7 +2133,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
|
||||||
@@ -2675,6 +2675,18 @@ void CApplication::StopPlaying()
|
@@ -2689,6 +2689,18 @@ void CApplication::StopPlaying()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -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())
|
||||||
@@ -3245,7 +3257,7 @@ void CApplication::ProcessSlow()
|
@@ -3269,7 +3281,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,5 +1,5 @@
|
|||||||
--- a/version.txt
|
--- a/version.txt
|
||||||
+++ b/version.txt
|
+++ b/version.txt
|
||||||
@@ -10 +10 @@
|
@@ -14 +14 @@
|
||||||
-ADDON_REPOS repository.xbmc.org|https://mirrors.kodi.tv
|
-ADDON_REPOS repository.xbmc.org|https://mirrors.kodi.tv
|
||||||
+ADDON_REPOS repository.xbmc.org|https://mirrors.kodi.tv,repository.libreelec.tv|https://addons.libreelec.tv
|
+ADDON_REPOS repository.xbmc.org|https://mirrors.kodi.tv,repository.libreelec.tv|https://addons.libreelec.tv
|
||||||
|
@ -8,8 +8,6 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
|
|||||||
system/keymaps/remote.xml | 2 +-
|
system/keymaps/remote.xml | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml
|
|
||||||
index 5c0baf7e9d22..10f802d0357d 100644
|
|
||||||
--- a/system/keymaps/remote.xml
|
--- a/system/keymaps/remote.xml
|
||||||
+++ b/system/keymaps/remote.xml
|
+++ b/system/keymaps/remote.xml
|
||||||
@@ -50,7 +50,7 @@
|
@@ -50,7 +50,7 @@
|
||||||
@ -21,6 +19,3 @@ index 5c0baf7e9d22..10f802d0357d 100644
|
|||||||
<myvideo>ActivateWindow(Videos)</myvideo>
|
<myvideo>ActivateWindow(Videos)</myvideo>
|
||||||
<mymusic>ActivateWindow(Music)</mymusic>
|
<mymusic>ActivateWindow(Music)</mymusic>
|
||||||
<mypictures>ActivateWindow(Pictures)</mypictures>
|
<mypictures>ActivateWindow(Pictures)</mypictures>
|
||||||
--
|
|
||||||
2.39.2
|
|
||||||
|
|
||||||
|
@ -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)
|
||||||
@@ -588,6 +590,7 @@ endif()
|
@@ -587,6 +589,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()
|
||||||
@ -34,7 +34,7 @@
|
|||||||
# Install app
|
# Install app
|
||||||
install(TARGETS ${APP_NAME_LC}
|
install(TARGETS ${APP_NAME_LC}
|
||||||
DESTINATION ${libdir}/${APP_NAME_LC}
|
DESTINATION ${libdir}/${APP_NAME_LC}
|
||||||
@@ -160,6 +161,7 @@ if(INTERNAL_TEXTUREPACKER_INSTALLABLE)
|
@@ -164,6 +165,7 @@ if(INTERNAL_TEXTUREPACKER_INSTALLABLE)
|
||||||
RENAME "${APP_NAME_LC}-TexturePacker"
|
RENAME "${APP_NAME_LC}-TexturePacker"
|
||||||
COMPONENT kodi-tools-texturepacker)
|
COMPONENT kodi-tools-texturepacker)
|
||||||
endif()
|
endif()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user