jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

xbmc: update to xbmc-14-bb86c12

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-08-05 03:27:08 +02:00
parent d0da3b8a54
commit 6e4ceaaef6
5 changed files with 204 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/mediacenter/xbmc-theme-Confluence/package.mk
View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc-theme-Confluence" PKG_NAME="xbmc-theme-Confluence"
PKG_VERSION="14-3f20fb2" PKG_VERSION="14-bb86c12"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

40
packages/mediacenter/xbmc-theme-Confluence/patches/xbmc-theme-Confluence-995.01-fernetmenta.patch
View File

@ -1,40 +0,0 @@
From 8f5e61d2c7ccd99622568039165ab2d620a58b97 Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de>
Date: Mon, 21 Jul 2014 08:45:51 +0200
Subject: [PATCH 25/28] skin confluence: change channel group by clicking on
channels or guide
---
720p/IncludesPVR.xml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/720p/IncludesPVR.xml b/720p/IncludesPVR.xml
index b6d9700..1b31fba 100644
--- a/720p/IncludesPVR.xml
+++ b/720p/IncludesPVR.xml
@@ -101,8 +101,9 @@
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
<label>19019</label>
- <onclick condition="IsEmpty(Window.Property(IsRadio))">ActivateWindow(TVChannels)</onclick>
- <onclick condition="!IsEmpty(Window.Property(IsRadio))">ActivateWindow(RadioChannels)</onclick>
+ <onclick condition="Window.IsActive(TVChannels) | Window.IsActive(RadioChannels)">NextChannelGroup</onclick>
+ <onclick condition="!Window.IsActive(TVChannels) + IsEmpty(Window.Property(IsRadio))">ActivateWindow(TVChannels)</onclick>
+ <onclick condition="!Window.IsActive(RadioChannels) + !IsEmpty(Window.Property(IsRadio))">ActivateWindow(RadioChannels)</onclick>
</control>
<control type="button" id="101">
<description>TV Guide</description>
@@ -111,8 +112,9 @@
<textwidth>235</textwidth>
<include>ButtonCommonValues</include>
<label>22020</label>
- <onclick condition="IsEmpty(Window.Property(IsRadio))">ActivateWindow(TVGuide)</onclick>
- <onclick condition="!IsEmpty(Window.Property(IsRadio))">ActivateWindow(RadioGuide)</onclick>
+ <onclick condition="Window.IsActive(TVGuide) | Window.IsActive(RadioGuide)">NextChannelGroup</onclick>
+ <onclick condition="!Window.IsActive(TVGuide) + IsEmpty(Window.Property(IsRadio))">ActivateWindow(TVGuide)</onclick>
+ <onclick condition="!Window.IsActive(RadioGuide) + !IsEmpty(Window.Property(IsRadio))">ActivateWindow(RadioGuide)</onclick>
</control>
<control type="button" id="102">
<description>Recordings</description>
--
1.9.3

3
packages/mediacenter/xbmc/package.mk
View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="xbmc" PKG_NAME="xbmc"
PKG_VERSION="14-3f20fb2" PKG_VERSION="14-bb86c12"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
@ -336,7 +336,6 @@ PKG_CONFIGURE_OPTS_TARGET="gl_cv_func_gettimeofday_clobber=no \
--disable-libcap \ --disable-libcap \
$XBMC_DVDCSS \ $XBMC_DVDCSS \
--disable-mid \ --disable-mid \
--disable-hal \
$XBMC_AVAHI \ $XBMC_AVAHI \
$XBMC_UPNP \ $XBMC_UPNP \
$XBMC_MYSQL \ $XBMC_MYSQL \

68
packages/mediacenter/xbmc/patches/xbmc-995.01-fernetmenta.patch
View File

@ -7442,74 +7442,6 @@ index d38bfab..e388ecf 100644
2.0.3 2.0.3
From eac4c134fa62021edabfeba52a3a680c7722deb0 Mon Sep 17 00:00:00 2001
From: xhaggi <sascha.woo@gmail.com>
Date: Tue, 22 Jul 2014 11:45:53 +0200
Subject: [PATCH 27/29] [builtins] don't activate an already active window
---
xbmc/interfaces/Builtins.cpp | 36 +++++++++++++++++++++---------------
1 file changed, 21 insertions(+), 15 deletions(-)
diff --git a/xbmc/interfaces/Builtins.cpp b/xbmc/interfaces/Builtins.cpp
index 1816851..af6a6fd 100644
--- a/xbmc/interfaces/Builtins.cpp
+++ b/xbmc/interfaces/Builtins.cpp
@@ -391,9 +391,12 @@ int CBuiltins::Execute(const std::string& execString)
int iWindow = CButtonTranslator::TranslateWindow(strWindow);
if (iWindow != WINDOW_INVALID)
{
- // disable the screensaver
- g_application.WakeUpScreenSaverAndDPMS();
- g_windowManager.ActivateWindow(iWindow, params, execute != "activatewindow");
+ if (iWindow != g_windowManager.GetActiveWindow())
+ {
+ // disable the screensaver
+ g_application.WakeUpScreenSaverAndDPMS();
+ g_windowManager.ActivateWindow(iWindow, params, execute != "activatewindow");
+ }
}
else
{
@@ -416,19 +419,22 @@ int CBuiltins::Execute(const std::string& execString)
int iWindow = CButtonTranslator::TranslateWindow(strWindow);
if (iWindow != WINDOW_INVALID)
{
- // disable the screensaver
- g_application.WakeUpScreenSaverAndDPMS();
- vector<string> dummy;
- g_windowManager.ActivateWindow(iWindow, dummy, execute != "activatewindowandfocus");
-
- unsigned int iPtr = 1;
- while (params.size() > iPtr + 1)
+ if (iWindow != g_windowManager.GetActiveWindow())
{
- CGUIMessage msg(GUI_MSG_SETFOCUS, g_windowManager.GetFocusedWindow(),
- atol(params[iPtr].c_str()),
- (params.size() >= iPtr + 2) ? atol(params[iPtr + 1].c_str())+1 : 0);
- g_windowManager.SendMessage(msg);
- iPtr += 2;
+ // disable the screensaver
+ g_application.WakeUpScreenSaverAndDPMS();
+ vector<string> dummy;
+ g_windowManager.ActivateWindow(iWindow, dummy, execute != "activatewindowandfocus");
+
+ unsigned int iPtr = 1;
+ while (params.size() > iPtr + 1)
+ {
+ CGUIMessage msg(GUI_MSG_SETFOCUS, g_windowManager.GetFocusedWindow(),
+ atol(params[iPtr].c_str()),
+ (params.size() >= iPtr + 2) ? atol(params[iPtr + 1].c_str())+1 : 0);
+ g_windowManager.SendMessage(msg);
+ iPtr += 2;
+ }
}
}
else
--
2.0.3
From 172d51ad45e6469724ca7a16502e8bce4c3dd28f Mon Sep 17 00:00:00 2001 From 172d51ad45e6469724ca7a16502e8bce4c3dd28f Mon Sep 17 00:00:00 2001
From: Rainer Hochecker <fernetmenta@online.de> From: Rainer Hochecker <fernetmenta@online.de>
Date: Sat, 26 Jul 2014 09:54:06 +0200 Date: Sat, 26 Jul 2014 09:54:06 +0200

405
projects/RPi/patches/xbmc/xbmc-001-newclock3.patch
View File

File diff suppressed because it is too large Load Diff