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

kodi: rebase and rename OE specific patches

Browse Source 
those wont be sent upstream. add README.patches
This commit is contained in:
Stefan Saraev 2015-04-18 15:59:12 +03:00
parent acf36ec4cb
commit 5e4673b973
16 changed files with 137 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/mediacenter/kodi/patches/README.patches Normal file
View File

@ -0,0 +1,3 @@
100.* - OpenELEC specific patches that wont go upstream
995.* - OpenELEC specific patches that should be send upstream
999.* - patches backported from upstream

16
packages/mediacenter/kodi/patches/kodi-501-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch → packages/mediacenter/kodi/patches/kodi-100.01-enable-PYTHONOPTIMIZE-with-external-Python.patch
View File

@ -1,8 +1,17 @@
From eed67c881eddd1f522e02b7b410d92fae7e39325 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 18 Apr 2015 15:12:49 +0300
Subject: [PATCH 01/12] enable PYTHONOPTIMIZE with external Python
---
xbmc/interfaces/python/XBPython.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/xbmc/interfaces/python/XBPython.cpp b/xbmc/interfaces/python/XBPython.cpp
index f179b12..4a4ddd1 100644
index 695c6db..fe8b157 100644
--- a/xbmc/interfaces/python/XBPython.cpp
+++ b/xbmc/interfaces/python/XBPython.cpp
@@ -571,10 +571,9 @@ bool XBPython::OnScriptInitialized(ILanguageInvoker *invoker)
@@ -572,10 +572,9 @@ bool XBPython::OnScriptInitialized(ILanguageInvoker *invoker)
// at http://docs.python.org/using/cmdline.html#environment-variables
#if !defined(TARGET_WINDOWS) && !defined(TARGET_ANDROID)
@ -16,3 +25,6 @@ index f179b12..4a4ddd1 100644
// check if we are running as real xbmc.app or just binary
if (!CUtil::GetFrameworksPath(true).empty())
{
--
2.1.4

24
packages/mediacenter/kodi/patches/kodi-100.02-add-openelec.tv-RSS-news.patch Normal file
View File

@ -0,0 +1,24 @@
From 2896398cc05ebc58fe512f02919b1189dcb04062 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 18 Apr 2015 15:23:51 +0300
Subject: [PATCH 02/12] add openelec.tv RSS news
---
userdata/RssFeeds.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/userdata/RssFeeds.xml b/userdata/RssFeeds.xml
index 6169113..631aafb 100644
--- a/userdata/RssFeeds.xml
+++ b/userdata/RssFeeds.xml
@@ -3,6 +3,7 @@
<!-- RSS feeds. To have multiple feeds, just add a feed to the set. You can also have multiple sets. !-->
<!-- To use different sets in your skin, each must be called from skin with a unique id. !-->
<set id="1">
+ <feed updateinterval="30">http://feeds.openelec.tv/news</feed>
<feed updateinterval="30">http://feeds.xbmc.org/xbmc</feed>
<feed updateinterval="30">http://feeds.xbmc.org/latest_xbmc_addons</feed>
<feed updateinterval="30">http://feeds.xbmc.org/updated_xbmc_addons</feed>
--
2.1.4

22
packages/mediacenter/kodi/patches/kodi-103-disable-online-check.patch → packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch
View File

@ -1,7 +1,7 @@
From 1716ffbf57a8d812f3bc7b26752e867066c36c44 Mon Sep 17 00:00:00 2001
From c547dcc2826e3337f5ff10d0f21485eb480d3351 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 7 Jun 2014 12:40:57 +0300
Subject: [PATCH] disable online check
Date: Sat, 18 Apr 2015 15:03:31 +0300
Subject: [PATCH 03/12] disable online check
---
xbmc/GUIInfoManager.cpp | 1 -
@ -10,10 +10,10 @@ Subject: [PATCH] disable online check
3 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
index 456c733..0c20ae2 100644
index 2c99f6b..bb66399 100644
--- a/xbmc/GUIInfoManager.cpp
+++ b/xbmc/GUIInfoManager.cpp
@@ -273,7 +273,6 @@ const infomap system_labels[] = {{ "hasnetwork", SYSTEM_ETHERNET_LINK_ACT
@@ -274,7 +274,6 @@ const infomap system_labels[] = {{ "hasnetwork", SYSTEM_ETHERNET_LINK_ACT
{ "currentwindow", SYSTEM_CURRENT_WINDOW },
{ "currentcontrol", SYSTEM_CURRENT_CONTROL },
{ "dvdlabel", SYSTEM_DVD_LABEL },
@ -22,10 +22,10 @@ index 456c733..0c20ae2 100644
{ "kernelversion", SYSTEM_OS_VERSION_INFO }, // old, not correct name
{ "uptime", SYSTEM_UPTIME },
diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
index 55ed760..aefeb70 100644
index b322191..35555de 100644
--- a/xbmc/utils/SystemInfo.cpp
+++ b/xbmc/utils/SystemInfo.cpp
@@ -240,7 +240,6 @@ bool CSysInfoJob::DoWork()
@@ -248,7 +248,6 @@ bool CSysInfoJob::DoWork()
{
m_info.systemUptime = GetSystemUpTime(false);
m_info.systemTotalUptime = GetSystemUpTime(true);
@ -33,7 +33,7 @@ index 55ed760..aefeb70 100644
m_info.videoEncoder = GetVideoEncoder();
m_info.cpuFrequency = GetCPUFreqInfo();
m_info.osVersionInfo = CSysInfo::GetOsPrettyNameWithVersion() + " (kernel: " + CSysInfo::GetKernelName() + " " + CSysInfo::GetKernelVersionFull() + ")";
@@ -963,9 +962,7 @@ int CSysInfo::GetXbmcBitness(void)
@@ -1016,9 +1015,7 @@ int CSysInfo::GetXbmcBitness(void)
bool CSysInfo::HasInternet()
{
@ -43,9 +43,9 @@ index 55ed760..aefeb70 100644
+ return m_info.internetState == CSysData::UNKNOWN;
}
CStdString CSysInfo::GetHddSpaceInfo(int drive, bool shortText)
std::string CSysInfo::GetHddSpaceInfo(int drive, bool shortText)
diff --git a/xbmc/windows/GUIWindowSystemInfo.cpp b/xbmc/windows/GUIWindowSystemInfo.cpp
index 03a23e3..1528939 100644
index 68f3a43..7159d82 100644
--- a/xbmc/windows/GUIWindowSystemInfo.cpp
+++ b/xbmc/windows/GUIWindowSystemInfo.cpp
@@ -126,7 +126,6 @@ void CGUIWindowSystemInfo::FrameMove()
@ -57,5 +57,5 @@ index 03a23e3..1528939 100644
else if (m_section == CONTROL_BT_VIDEO)
{
--
1.9.1
2.1.4

4
packages/mediacenter/kodi/patches/kodi-104-use-udevil-to-umount.patch → packages/mediacenter/kodi/patches/kodi-100.04-use-udevil-to-umount.patch
View File

@ -1,7 +1,7 @@
From a3795cdc78a56b73875ce862227114bdf2871591 Mon Sep 17 00:00:00 2001
From 4ed7aee5ab898e2050ceeff74fa4cf0eb846e28f Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 17 Apr 2014 12:12:50 +0300
Subject: [PATCH 1/6] use udevil to umount
Subject: [PATCH 04/12] use udevil to umount
---
xbmc/linux/PosixMountProvider.cpp | 2 +-

10
packages/mediacenter/kodi/patches/kodi-200-make-binary-addons-executable.patch → packages/mediacenter/kodi/patches/kodi-100.05-make-binary-addons-executable.patch
View File

@ -1,15 +1,15 @@
From 06ebc448041c43b8c13ac61b7bda20cb6120c588 Mon Sep 17 00:00:00 2001
From c39ded1793ba6839bc53cd9a28956d8cc8630c82 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 2 Mar 2015 23:50:40 +0200
Subject: [PATCH] make binary addons executable
Subject: [PATCH 05/12] make binary addons executable
add executable mode to all files in addon's bin folder
---
xbmc/addons/AddonInstaller.cpp | 23 +++++++++++++++++++++++
xbmc/addons/AddonInstaller.cpp | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/xbmc/addons/AddonInstaller.cpp b/xbmc/addons/AddonInstaller.cpp
index f4a241c..f6d88f2 100644
index 2af33a3..b8ec673 100644
--- a/xbmc/addons/AddonInstaller.cpp
+++ b/xbmc/addons/AddonInstaller.cpp
@@ -40,6 +40,9 @@
@ -50,5 +50,5 @@ index f4a241c..f6d88f2 100644
CGUIDialogKaiToast::QueueNotification(m_addon->Icon(), m_addon->Name(),
g_localizeStrings.Get(m_update ? 24065 : 24064),
--
1.7.10.4
2.1.4

13
packages/mediacenter/kodi/patches/kodi-995.02-dont-set-_NET_WM_STATE_FULLSCREEN.patch → packages/mediacenter/kodi/patches/kodi-100.06-dont-set-_NET_WM_STATE_FULLSCREEN.patch
View File

@ -1,10 +1,15 @@
From cab997df6a39ec87dcfa04215715aa5bbd44d947 Mon Sep 17 00:00:00 2001
From 000912d45613e278d7279bc3624aff906fd8d91b Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 11 Mar 2015 20:56:15 +0200
Subject: [PATCH] dont set _NET_WM_STATE_FULLSCREEN
Subject: [PATCH 06/12] dont set _NET_WM_STATE_FULLSCREEN
I dont remember why I added this. I guess it was for
some 3rdparty stuff that needed to go fullscreen but
xbmc was acting weird..
this should probably be removed after OE 6
---
xbmc/windowing/X11/WinSystemX11.cpp | 2 --
xbmc/windowing/X11/WinSystemX11.cpp | 2 --
1 file changed, 2 deletions(-)
diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
@ -21,5 +26,5 @@ index 05f36ee..1714422 100644
int one = 1;
XChangeProperty(m_dpy, m_mainWindow, XInternAtom(m_dpy, "_KDE_NET_WM_BLOCK_COMPOSITING", True), XA_CARDINAL, 32,
--
1.7.10.4
2.1.4

24
packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch Normal file
View File

@ -0,0 +1,24 @@
From 01f08b891c24d60c3e4ea5f44b6ce0f6d650e068 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 18 Apr 2015 14:59:29 +0300
Subject: [PATCH 07/12] disable minimize
---
xbmc/Application.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 135b466..da6aa6e 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -4696,7 +4696,6 @@ bool CApplication::SwitchToFullScreen()
void CApplication::Minimize()
{
- g_Windowing.Minimize();
}
PLAYERCOREID CApplication::GetCurrentPlayer()
--
2.1.4

4
packages/mediacenter/kodi/patches/kodi-995.12-openelec-setup-timezone.patch → packages/mediacenter/kodi/patches/kodi-100.08-setup-timezone.patch
View File

@ -1,7 +1,7 @@
From 3cfa580493f7a57109d19d99373a455852388e0d Mon Sep 17 00:00:00 2001
From f212e2b8d9bfcacc02affd8bc396bd0aeb3a210f Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 18 Aug 2014 17:46:54 +0300
Subject: [PATCH 3/6] setup timezone
Subject: [PATCH 08/12] setup timezone
on TZ country setting change, store the value in format
TIMEZONE=Xx/Yyy to /storage/.cache/timezone to be used with

10
packages/mediacenter/kodi/patches/kodi-999.00-service-addons-use-a-wrapper-to-setup-systemd.patch → packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-systemd-services.patch
View File

@ -1,7 +1,7 @@
From 4672bee097751d04098b5989516ecdc2ee80391e Mon Sep 17 00:00:00 2001
From 0a2ae6dd9fe63c713e1ea2336ca3263c00fa9bfc Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Fri, 8 Aug 2014 18:22:44 +0300
Subject: [PATCH 2/6] use a wrapper to setup systemd services
Subject: [PATCH 09/12] use a wrapper to setup systemd services
---
xbmc/addons/Service.cpp | 22 ++++++++++++++++++++++
@ -9,7 +9,7 @@ Subject: [PATCH 2/6] use a wrapper to setup systemd services
2 files changed, 23 insertions(+)
diff --git a/xbmc/addons/Service.cpp b/xbmc/addons/Service.cpp
index 2f5c38c..4fc8d5f 100644
index 2fc7670..9126ce7 100644
--- a/xbmc/addons/Service.cpp
+++ b/xbmc/addons/Service.cpp
@@ -53,6 +53,10 @@ AddonPtr CService::Clone() const
@ -48,7 +48,7 @@ index 2f5c38c..4fc8d5f 100644
Start();
}
@@ -145,13 +160,20 @@ void CService::OnPostInstall(bool restart, bool update)
@@ -145,13 +160,20 @@ void CService::OnPostInstall(bool restart, bool update, bool modal)
{
std::shared_ptr<CService> service = std::dynamic_pointer_cast<CService>(localAddon);
if (service)
@ -70,7 +70,7 @@ index 2f5c38c..4fc8d5f 100644
}
diff --git a/xbmc/addons/Service.h b/xbmc/addons/Service.h
index 98ec8b6..683ae60 100644
index f7394de..1ba3f27 100644
--- a/xbmc/addons/Service.h
+++ b/xbmc/addons/Service.h
@@ -47,6 +47,7 @@ namespace ADDON

12
packages/mediacenter/kodi/patches/kodi-999.03-handle-SIGTERM.patch → packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch
View File

@ -1,7 +1,7 @@
From ec3a12fb4708e9319c18af1b851a7a324294bc6c Mon Sep 17 00:00:00 2001
From d70e7c8826a95852a05ef3de0fea71c8b85accb1 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 15 Dec 2014 21:28:54 +0200
Subject: [PATCH 6/6] handle SIGTERM
Subject: [PATCH 10/12] handle SIGTERM
In some situations, due to deadlocks or crashes, xbmc fails to exit properly in
CApplication::Stop(), so g_powerManager.Reboot() / g_powerManager.Powerdown() never gets
@ -31,10 +31,10 @@ is requested externaly (ssh, 3rdparty script).
6 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 69b1cd7..f1f60cd 100644
index da6aa6e..b39c906 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -2543,12 +2543,19 @@ bool CApplication::Cleanup()
@@ -2583,12 +2583,19 @@ bool CApplication::Cleanup()
}
}
@ -55,7 +55,7 @@ index 69b1cd7..f1f60cd 100644
CAnnouncementManager::Get().Announce(System, "xbmc", "OnQuit", vExitCode);
SaveFileState(true);
@@ -2572,7 +2579,6 @@ void CApplication::Stop(int exitCode)
@@ -2612,7 +2619,6 @@ void CApplication::Stop(int exitCode)
m_bStop = true;
m_AppFocused = false;
@ -64,7 +64,7 @@ index 69b1cd7..f1f60cd 100644
// cancel any jobs from the jobmanager
diff --git a/xbmc/Application.h b/xbmc/Application.h
index ec5dfac..96cbf71 100644
index b4da8f2..b5fdae6 100644
--- a/xbmc/Application.h
+++ b/xbmc/Application.h
@@ -154,6 +154,7 @@ public:

13
packages/mediacenter/kodi/patches/kodi-999.91-PR5306.patch → packages/mediacenter/kodi/patches/kodi-100.11-add-support-to-read-frequency-output-if-using-intel-.patch
View File

@ -1,18 +1,18 @@
From 0be29d9a6e30b1cf1c50e12a9dea28f7dce6f1f7 Mon Sep 17 00:00:00 2001
From 0f9d760243da06c2a0d258e30033a8c980baf1fc Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 1 Sep 2014 03:16:37 +0200
Subject: [PATCH] add support to read frequency output if using intel's pstate
driver
Subject: [PATCH 11/12] add support to read frequency output if using intel's
pstate driver
---
xbmc/utils/CPUInfo.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/xbmc/utils/CPUInfo.cpp b/xbmc/utils/CPUInfo.cpp
index 93ca784..31b27ba 100644
index 7c5b9f8..0536036 100644
--- a/xbmc/utils/CPUInfo.cpp
+++ b/xbmc/utils/CPUInfo.cpp
@@ -267,6 +267,8 @@ CCPUInfo::CCPUInfo(void)
@@ -269,6 +269,8 @@ CCPUInfo::CCPUInfo(void)
m_fProcTemperature = fopen("/sys/class/thermal/thermal_zone0/temp", "r"); // On Raspberry PIs
m_fCPUFreq = fopen ("/sys/devices/system/cpu/cpu0/cpufreq/scaling_cur_freq", "r");
@ -21,3 +21,6 @@ index 93ca784..31b27ba 100644
if (!m_fCPUFreq)
{
m_cpuInfoForFreq = true;
--
2.1.4

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

@ -0,0 +1,24 @@
From 24c4341104c2fe70c39e703c98698c3025382659 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sat, 18 Apr 2015 15:45:54 +0300
Subject: [PATCH 12/12] prevent kodi switching to windowed mode
---
xbmc/windowing/X11/WinSystemX11.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/xbmc/windowing/X11/WinSystemX11.h b/xbmc/windowing/X11/WinSystemX11.h
index 5ac2482..cb84940 100644
--- a/xbmc/windowing/X11/WinSystemX11.h
+++ b/xbmc/windowing/X11/WinSystemX11.h
@@ -54,6 +54,7 @@ public:
virtual bool ResizeWindow(int newWidth, int newHeight, int newLeft, int newTop);
virtual bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays);
virtual void UpdateResolutions();
+ virtual bool CanDoWindowed() { return false; }
virtual int GetNumScreens() { return 1; }
virtual int GetCurrentScreen() { return m_nScreen; }
virtual void ShowOSMouse(bool show);
--
2.1.4

11
packages/mediacenter/kodi/patches/kodi-502-add_openelec.tv_RSS_news-0.1.patch
View File

@ -1,11 +0,0 @@
diff -Naur xbmc-12.0.7/userdata/RssFeeds.xml xbmc-12.0.7.patch/userdata/RssFeeds.xml
--- xbmc-12.0.7/userdata/RssFeeds.xml 2013-03-15 14:25:26.000000000 +0100
+++ xbmc-12.0.7.patch/userdata/RssFeeds.xml 2013-03-15 14:40:54.695338102 +0100
@@ -3,6 +3,7 @@
<!-- RSS feeds. To have multiple feeds, just add a feed to the set. You can also have multiple sets. !-->
<!-- To use different sets in your skin, each must be called from skin with a unique id. !-->
<set id="1">
+ <feed updateinterval="30">http://feeds.openelec.tv/news</feed>
<feed updateinterval="30">http://feeds.xbmc.org/xbmc</feed>
</set>
</rssfeeds>

18
packages/mediacenter/kodi/patches/kodi-995.10-disable-minimize.patch
View File

@ -1,18 +0,0 @@
commit 17807066bc04cd28bba89fd176d4d0f69ead9728
Author: Stefan Saraev <stefan@saraev.ca>
Date: Sat Oct 12 16:18:50 2013 +0300
disable minimize
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index b5d40c0..18bea9d 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -5448,7 +5448,6 @@ bool CApplication::SwitchToFullScreen()
void CApplication::Minimize()
{
- g_Windowing.Minimize();
}
PLAYERCOREID CApplication::GetCurrentPlayer()

11
packages/mediacenter/kodi/patches/kodi-999.93-fullscreen.patch
View File

@ -1,11 +0,0 @@
diff -Naur xbmc-14-a29b21a/xbmc/windowing/X11/WinSystemX11.h xbmc-14-a29b21a.patch/xbmc/windowing/X11/WinSystemX11.h
--- xbmc-14-a29b21a/xbmc/windowing/X11/WinSystemX11.h 2014-08-24 17:41:42.000000000 +0200
+++ xbmc-14-a29b21a.patch/xbmc/windowing/X11/WinSystemX11.h 2014-08-31 13:44:50.250774848 +0200
@@ -47,6 +47,7 @@
virtual bool ResizeWindow(int newWidth, int newHeight, int newLeft, int newTop);
virtual bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays);
virtual void UpdateResolutions();
+ virtual bool CanDoWindowed() { return false; }
virtual int GetNumScreens() { return 1; }
virtual int GetCurrentScreen() { return m_nScreen; }
virtual void ShowOSMouse(bool show);