jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-03 16:07:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

kodi: rebased patches

Browse Source
This commit is contained in:
CvH 2020-09-04 21:18:58 +02:00
parent cfb0971540
commit 3e489bf694
14 changed files with 62 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@ diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
index 5b1d89ed2011..4a39f1122bca 100644
--- a/xbmc/utils/SystemInfo.cpp
+++ b/xbmc/utils/SystemInfo.cpp
@@ -250,7 +250,6 @@ bool CSysInfoJob::DoWork()
@@ -271,7 +271,6 @@ bool CSysInfoJob::DoWork()
{
m_info.systemUptime = GetSystemUpTime(false);
m_info.systemTotalUptime = GetSystemUpTime(true);
@ -25,7 +25,7 @@ index 5b1d89ed2011..4a39f1122bca 100644
m_info.videoEncoder = GetVideoEncoder();
m_info.cpuFrequency =
StringUtils::Format("%4.0f MHz", CServiceBroker::GetCPUInfo()->GetCPUFrequency());
@@ -948,9 +948,7 @@ int CSysInfo::GetXbmcBitness(void)
@@ -1000,9 +999,7 @@ int CSysInfo::GetXbmcBitness(void)
bool CSysInfo::HasInternet()
{

10
packages/mediacenter/kodi/patches/kodi-100.04-use-udevil-to-umount.patch
View File

@ -9,10 +9,10 @@ Subject: [PATCH] use udevil to mount
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/xbmc/platform/linux/storage/UDevProvider.cpp b/xbmc/platform/linux/storage/UDevProvider.cpp
index d71e2d9..0387e55 100644
index 3a9a2632bd..1fec95d637 100644
--- a/xbmc/platform/linux/storage/UDevProvider.cpp
+++ b/xbmc/platform/linux/storage/UDevProvider.cpp
@@ -192,7 +192,7 @@ bool CUDevProvider::Eject(const std::string& mountpath)
@@ -194,7 +194,7 @@ bool CUDevProvider::Eject(const std::string& mountpath)
{
// just go ahead and try to umount the disk
// if it does umount, life is good, if not, no loss.
@ -22,11 +22,11 @@ index d71e2d9..0387e55 100644
if (status == 0)
diff --git a/xbmc/platform/posix/PosixMountProvider.cpp b/xbmc/platform/posix/PosixMountProvider.cpp
index c22d7f8..69d8e10 100644
index d139be1827..7646d66794 100644
--- a/xbmc/platform/posix/PosixMountProvider.cpp
+++ b/xbmc/platform/posix/PosixMountProvider.cpp
@@ -123,7 +123,7 @@ bool CPosixMountProvider::Eject(const std::string& mountpath)
#if !defined(TARGET_DARWIN_IOS)
@@ -124,7 +124,7 @@ bool CPosixMountProvider::Eject(const std::string& mountpath)
#if !defined(TARGET_DARWIN_EMBEDDED)
// just go ahead and try to umount the disk
// if it does umount, life is good, if not, no loss.
- std::string cmd = "umount \"" + mountpath + "\"";

8
packages/mediacenter/kodi/patches/kodi-100.05-make-binary-addons-executable.patch
View File

@ -11,10 +11,10 @@ credits to vpeter4 for the patch
1 file changed, 26 insertions(+)
diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
index 07fd5bf..639ee5c 100644
index 294c99a76f..11d304662d 100644
--- a/xbmc/addons/Addon.cpp
+++ b/xbmc/addons/Addon.cpp
@@ -26,6 +26,10 @@
@@ -14,6 +14,10 @@
#include <utility>
#include <vector>
@ -23,9 +23,9 @@ index 07fd5bf..639ee5c 100644
+#include <sys/stat.h>
+
#include "AddonManager.h"
#include "addons/Service.h"
#include "addons/settings/AddonSettings.h"
#include "filesystem/Directory.h"
@@ -417,6 +421,28 @@ void OnPreInstall(const AddonPtr& addon)
@@ -380,6 +384,28 @@ void OnPreInstall(const AddonPtr& addon)
void OnPostInstall(const AddonPtr& addon, bool update, bool modal)
{

6
packages/mediacenter/kodi/patches/kodi-100.06-dont-set-_NET_WM_STATE_FULLSCREEN.patch
View File

@ -13,10 +13,10 @@ this should probably be removed after OE 6
1 file changed, 2 deletions(-)
diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
index af25621..17d7f59 100644
index 34d3138977..0cdc91a8ba 100644
--- a/xbmc/windowing/X11/WinSystemX11.cpp
+++ b/xbmc/windowing/X11/WinSystemX11.cpp
@@ -1142,8 +1142,6 @@ bool CWinSystemX11::SetWindow(int width, int height, bool fullscreen, const std:
@@ -743,8 +743,6 @@ bool CWinSystemX11::SetWindow(int width, int height, bool fullscreen, const std:
if (fullscreen && hasWM)
{
@ -24,7 +24,7 @@ index af25621..17d7f59 100644
- XChangeProperty(m_dpy, m_mainWindow, XInternAtom(m_dpy, "_NET_WM_STATE", True), XA_ATOM, 32, PropModeReplace, (unsigned char *) &fs, 1);
// disable desktop compositing for KDE, when Kodi is in full-screen mode
int one = 1;
XChangeProperty(m_dpy, m_mainWindow, XInternAtom(m_dpy, "_KDE_NET_WM_BLOCK_COMPOSITING", True), XA_CARDINAL, 32,
Atom composite = XInternAtom(m_dpy, "_KDE_NET_WM_BLOCK_COMPOSITING", True);
--
2.5.0

6
packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch
View File

@ -8,17 +8,17 @@ Subject: [PATCH 07/13] disable minimize
1 file changed, 1 deletion(-)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 95ae98c..9aca1e3 100644
index a6f6119b81..adf77074e0 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -5044,7 +5044,6 @@ bool CApplication::SwitchToFullScreen(bool force /* = false */)
@@ -4695,7 +4695,6 @@ bool CApplication::SwitchToFullScreen(bool force /* = false */)
void CApplication::Minimize()
{
- CServiceBroker::GetWinSystem()->Minimize();
}
PLAYERCOREID CApplication::GetCurrentPlayer()
std::string CApplication::GetCurrentPlayer()
--
2.5.0

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

@ -1,9 +1,9 @@
diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
index 8343101b96..8130d99b83 100644
index 11d304662d..a685ac568a 100644
--- a/xbmc/addons/Addon.cpp
+++ b/xbmc/addons/Addon.cpp
@@ -397,6 +397,37 @@ AddonVersion CAddon::GetDependencyVersion(const std::string &dependencyID) const
return AddonVersion("0.0.0");
@@ -375,6 +375,37 @@ AddonVersion CAddon::GetDependencyVersion(const std::string &dependencyID) const
return m_addonInfo->DependencyVersion(dependencyID);
}
+void LEAddonHook(const AddonPtr& addon, const LE_ADDON_CONTEXT context) {
@ -40,7 +40,7 @@ index 8343101b96..8130d99b83 100644
void OnPreInstall(const AddonPtr& addon)
{
//Fallback to the pre-install callback in the addon.
@@ -426,6 +457,9 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal)
@@ -404,6 +435,9 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal)
}
closedir(addonsDir);
}
@ -50,7 +50,7 @@ index 8343101b96..8130d99b83 100644
// OE
addon->OnPostInstall(update, modal);
@@ -433,6 +466,8 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal)
@@ -411,6 +445,8 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal)
void OnPreUnInstall(const AddonPtr& addon)
{
@ -60,10 +60,10 @@ index 8343101b96..8130d99b83 100644
}
diff --git a/xbmc/addons/Addon.h b/xbmc/addons/Addon.h
index b877839848..f7c0b717f6 100644
index e8fed4e5bc..e8be365b44 100644
--- a/xbmc/addons/Addon.h
+++ b/xbmc/addons/Addon.h
@@ -41,6 +41,15 @@ namespace ADDON
@@ -27,6 +27,15 @@ namespace ADDON
void OnPreUnInstall(const AddonPtr& addon);
void OnPostUnInstall(const AddonPtr& addon);
@ -80,10 +80,10 @@ index b877839848..f7c0b717f6 100644
{
public:
diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
index e015f0755e..92879f19c1 100644
index f9a133474c..f4f7906765 100644
--- a/xbmc/addons/AddonManager.cpp
+++ b/xbmc/addons/AddonManager.cpp
@@ -836,6 +836,7 @@ bool CAddonMgr::DisableAddon(const std::string& id)
@@ -735,6 +735,7 @@ bool CAddonMgr::DisableAddon(const std::string& id, AddonDisabledReason disabled
AddonPtr addon;
if (GetAddon(id, addon, ADDON_UNKNOWN, false) && addon != NULL)
{
@ -91,8 +91,8 @@ index e015f0755e..92879f19c1 100644
CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(addon, 24141)));
}
@@ -864,6 +865,7 @@ bool CAddonMgr::EnableSingle(const std::string& id)
if (!m_database.DisableAddon(id, false))
@@ -763,6 +764,7 @@ bool CAddonMgr::EnableSingle(const std::string& id)
if (!m_database.EnableAddon(id))
return false;
m_disabled.erase(id);
+ ADDON::LEAddonHook(addon, ADDON::LE_ADDON_ENABLED);

24
packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch
View File

@ -23,10 +23,10 @@ so, when shutdown/reboot is requested:
5 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 1b623d0..bfae2a9 100644
index a6f6119b81..6b24f6bfe9 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -2024,12 +2024,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
@@ -2073,12 +2073,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
switch (msg)
{
case TMSG_POWERDOWN:
@ -41,7 +41,7 @@ index 1b623d0..bfae2a9 100644
break;
case TMSG_SHUTDOWN:
@@ -2050,12 +2050,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
@@ -2099,12 +2099,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
case TMSG_RESTART:
case TMSG_RESET:
@ -56,7 +56,7 @@ index 1b623d0..bfae2a9 100644
Stop(EXITCODE_RESTARTAPP);
#endif
break;
@@ -2533,6 +2534,17 @@ bool CApplication::Cleanup()
@@ -2582,6 +2583,17 @@ bool CApplication::Cleanup()
}
}
@ -74,7 +74,7 @@ index 1b623d0..bfae2a9 100644
void CApplication::Stop(int exitCode)
{
CLog::Log(LOGINFO, "Stopping player");
@@ -2559,7 +2571,7 @@ void CApplication::Stop(int exitCode)
@@ -2608,7 +2620,7 @@ void CApplication::Stop(int exitCode)
m_frameMoveGuard.unlock();
CVariant vExitCode(CVariant::VariantTypeObject);
@ -83,7 +83,7 @@ index 1b623d0..bfae2a9 100644
CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "xbmc", "OnQuit", vExitCode);
// Abort any active screensaver
@@ -2591,7 +2603,6 @@ void CApplication::Stop(int exitCode)
@@ -2640,7 +2652,6 @@ void CApplication::Stop(int exitCode)
// Needs cleaning up
CApplicationMessenger::GetInstance().Stop();
m_AppFocused = false;
@ -91,7 +91,7 @@ index 1b623d0..bfae2a9 100644
CLog::Log(LOGINFO, "Stopping all");
// cancel any jobs from the jobmanager
@@ -4163,7 +4174,7 @@ void CApplication::ProcessSlow()
@@ -4225,7 +4236,7 @@ void CApplication::ProcessSlow()
if (CPlatformPosix::TestQuitFlag())
{
CLog::Log(LOGINFO, "Quitting due to POSIX signal");
@ -101,10 +101,10 @@ index 1b623d0..bfae2a9 100644
#endif
diff --git a/xbmc/Application.h b/xbmc/Application.h
index 09a4564..60493dc 100644
index 5f94dd3e07..3d11c4fa37 100644
--- a/xbmc/Application.h
+++ b/xbmc/Application.h
@@ -155,6 +155,7 @@ public:
@@ -156,6 +156,7 @@ public:
bool StartServer(enum ESERVERS eServer, bool bStart, bool bWait = false);
bool IsCurrentThread() const;
@ -113,7 +113,7 @@ index 09a4564..60493dc 100644
void UnloadSkin(bool forReload = false);
bool LoadCustomWindows();
diff --git a/xbmc/XBApplicationEx.cpp b/xbmc/XBApplicationEx.cpp
index 8982725..95070fb 100644
index 8982725b35..95070fbe9f 100644
--- a/xbmc/XBApplicationEx.cpp
+++ b/xbmc/XBApplicationEx.cpp
@@ -23,6 +23,7 @@ CXBApplicationEx::CXBApplicationEx()
@ -125,7 +125,7 @@ index 8982725..95070fb 100644
}
diff --git a/xbmc/XBApplicationEx.h b/xbmc/XBApplicationEx.h
index e7534b8..8f45f04 100644
index e7534b8c05..8f45f04ec8 100644
--- a/xbmc/XBApplicationEx.h
+++ b/xbmc/XBApplicationEx.h
@@ -29,6 +29,7 @@ public:
@ -137,7 +137,7 @@ index e7534b8..8f45f04 100644
bool m_renderGUI;
diff --git a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp
index 5e40077..6dc2cbb 100644
index 5e400772b1..6dc2cbbc4d 100644
--- a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp
+++ b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp
@@ -78,8 +78,6 @@ CLogindUPowerSyscall::~CLogindUPowerSyscall()

4
packages/mediacenter/kodi/patches/kodi-100.12-prevent-kodi-switching-to-windowed-mode.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] prevent kodi switching to windowed mode
1 file changed, 1 insertion(+)
diff --git a/xbmc/windowing/X11/WinSystemX11.h b/xbmc/windowing/X11/WinSystemX11.h
index 6f8d443..3739b92 100644
index 3f207d3ffa..3b3ff9b62c 100644
--- a/xbmc/windowing/X11/WinSystemX11.h
+++ b/xbmc/windowing/X11/WinSystemX11.h
@@ -49,6 +49,7 @@ public:
@@ -38,6 +38,7 @@ public:
void FinishWindowResize(int newWidth, int newHeight) override;
bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays) override;
void UpdateResolutions() override;

4
packages/mediacenter/kodi/patches/kodi-100.13-udevprovider-filter-out-OE-specific-mounts.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] udevprovider: filter out OE specific mounts
1 file changed, 14 insertions(+)
diff --git a/xbmc/platform/linux/storage/UDevProvider.cpp b/xbmc/platform/linux/storage/UDevProvider.cpp
index daf0d58..31e574f 100644
index 3a9a2632bd..9ae1846b81 100644
--- a/xbmc/platform/linux/storage/UDevProvider.cpp
+++ b/xbmc/platform/linux/storage/UDevProvider.cpp
@@ -150,6 +150,20 @@ void CUDevProvider::GetDisks(VECSOURCES& disks, bool removable)
@@ -139,6 +139,20 @@ void CUDevProvider::GetDisks(VECSOURCES& disks, bool removable)
continue;
}

4
packages/mediacenter/kodi/patches/kodi-100.15-rename-default-pulse-device.patch
View File

@ -9,10 +9,10 @@ Subject: [PATCH] [PATCH] change pulseaudio default device name to Bluetooth
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp
index 7c669b7..043d0d5 100644
index f2db9226f5..c16114f6d0 100644
--- a/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp
+++ b/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp
@@ -394,13 +394,15 @@ static void SinkInfoRequestCallback(pa_context *c, const pa_sink_info *i, int eo
@@ -482,13 +482,15 @@ static void SinkInfoRequestCallback(pa_context *c, const pa_sink_info *i, int eo
CAEDeviceInfo defaultDevice;
defaultDevice.m_deviceName = std::string("Default");
defaultDevice.m_displayName = std::string("Default");

10
packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch
View File

@ -1,10 +1,10 @@
--- a/xbmc/windows/GUIWindowSystemInfo.cpp 2013-02-21 22:09:04.765734381 +0400
+++ b/xbmc/windows/GUIWindowSystemInfo.cpp 2013-02-22 16:12:57.942164800 +0400
@@ -100,7 +100,6 @@
#endif
--- a/xbmc/windows/GUIWindowSystemInfo.cpp
+++ b/xbmc/windows/GUIWindowSystemInfo.cpp
@@ -99,7 +99,6 @@ void CGUIWindowSystemInfo::FrameMove()
SetControlLabel(i++, "%s %s", 13283, SYSTEM_OS_VERSION_INFO);
SetControlLabel(i++, "%s: %s", 12390, SYSTEM_UPTIME);
SetControlLabel(i++, "%s: %s", 12394, SYSTEM_TOTALUPTIME);
- SetControlLabel(i++, "%s: %s", 12395, SYSTEM_BATTERY_LEVEL);
}
else if (m_section == CONTROL_BT_STORAGE)
{

6
packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] refresh /etc/environment on install and uninstall
1 file changed, 6 insertions(+)
diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
index 8a4bd0b..1046ab4 100644
index a685ac568a..f41258a2c2 100644
--- a/xbmc/addons/Addon.cpp
+++ b/xbmc/addons/Addon.cpp
@@ -443,6 +443,9 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal)
@@ -441,6 +441,9 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal)
// OE
addon->OnPostInstall(update, modal);
@ -21,7 +21,7 @@ index 8a4bd0b..1046ab4 100644
}
void OnPreUnInstall(const AddonPtr& addon)
@@ -455,6 +458,9 @@ void OnPreUnInstall(const AddonPtr& addon)
@@ -453,6 +456,9 @@ void OnPreUnInstall(const AddonPtr& addon)
void OnPostUnInstall(const AddonPtr& addon)
{
addon->OnPostUnInstall();

9
packages/mediacenter/kodi/patches/kodi-999.15-disable-using-tv-menu-language-by-default.patch
View File

@ -1,9 +1,10 @@
diff -Naur a/system/peripherals.xml b/system/peripherals.xml
--- a/system/peripherals.xml 2016-03-19 01:20:46.000000000 -0700
+++ b/system/peripherals.xml 2016-04-13 11:07:51.605221474 -0700
diff --git a/system/peripherals.xml b/system/peripherals.xml
index ff303e99ae..1978f07703 100644
--- a/system/peripherals.xml
+++ b/system/peripherals.xml
@@ -18,7 +18,7 @@
<setting key="cec_wake_screensaver" type="bool" value="1" label="36010" order="7" />
<setting key="standby_pc_on_tv_standby" type="enum" value="13011" label="36029" order="8" lvalues="36028|13005|13011" />
<setting key="standby_pc_on_tv_standby" type="enum" value="13011" label="36029" order="8" lvalues="36028|13005|13011|13010|13009|36044|36045" />
<setting key="standby_tv_on_pc_standby" type="bool" value="1" label="36026" order="9" />
- <setting key="use_tv_menu_language" type="bool" value="1" label="36018" order="10" />
+ <setting key="use_tv_menu_language" type="bool" value="0" label="36018" order="10" />

6
packages/mediacenter/kodi/patches/kodi-999.99.framebuffer-reset.patch
View File

@ -2,9 +2,9 @@ diff --git a/xbmc/XBApplicationEx.cpp b/xbmc/XBApplicationEx.cpp
index f6fffd8..6eeacf6 100644
--- a/xbmc/XBApplicationEx.cpp
+++ b/xbmc/XBApplicationEx.cpp
@@ -85,6 +85,10 @@ INT CXBApplicationEx::Run()
unsigned int frameTime = 0;
const unsigned int noRenderFrameTime = 15; // Simulates ~66fps
@@ -53,6 +53,10 @@ int CXBApplicationEx::Run(const CAppParamParser &params)
KODI::MESSAGING::CApplicationMessenger::GetInstance().PostMsg(TMSG_PLAYLISTPLAYER_PLAY, -1);
}
+#ifdef TARGET_RASPBERRY_PI
+ system("/sbin/fbset -g 1 1 1 1 32");