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

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

Browse Source
This commit is contained in:
Stephan Raue 2013-03-28 22:56:24 +01:00
commit 68cfe97e32
12 changed files with 22 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/3rdparty/download/CouchPotatoServer/meta vendored
View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="CouchPotatoServer"
PKG_VERSION="a49a00a"
PKG_VERSION="5a23be2"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

0
packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-a49a00a-move-cache.patch → packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-move-cache.patch vendored
View File

2
packages/3rdparty/download/SickBeard/meta vendored
View File

@ -20,7 +20,7 @@
################################################################################
PKG_NAME="SickBeard"
PKG_VERSION="4e57625"
PKG_VERSION="ebec1de"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="OSS"

0
packages/3rdparty/download/SickBeard/patches/SickBeard-4e57625-001-remove_logo_update-header_and_donate_button-0.1.patch → packages/3rdparty/download/SickBeard/patches/SickBeard-001-remove_logo_update-header_and_donate_button-0.1.patch vendored
View File

12
packages/3rdparty/download/SickBeard/patches/SickBeard-4e57625-002-remove_default_settings-0.3.patch → packages/3rdparty/download/SickBeard/patches/SickBeard-002-remove_default_settings-0.3.patch vendored
View File

@ -1,8 +1,8 @@
diff --git a/data/interfaces/default/config_notifications.tmpl b/data/interfaces/default/config_notifications.tmpl
index 826cf0a..02f14af 100755
index 2144a0f..703c99e 100755
--- a/data/interfaces/default/config_notifications.tmpl
+++ b/data/interfaces/default/config_notifications.tmpl
@@ -547,45 +547,6 @@
@@ -639,45 +639,6 @@
<div class="component-group clearfix">
<div class="component-group-desc">
@ -12,7 +12,7 @@ index 826cf0a..02f14af 100755
- </div>
- <fieldset class="component-group-list">
- <div class="field-pair">
- <input type="checkbox" class="enabler" name="use_libnotify" id="use_libnotify" #if $sickbeard.USE_LIBNOTIFY then "checked=\"checked\"" else ""# />
- <input type="checkbox" class="enabler" name="use_libnotify" id="use_libnotify" #if $sickbeard.USE_LIBNOTIFY then "checked=\"checked\"" else ""# />
- <label class="clearfix" for="use_libnotify">
- <span class="component-title">Enable</span>
- <span class="component-desc">Should Sick Beard send Libnotify notifications?</span>
@ -21,7 +21,7 @@ index 826cf0a..02f14af 100755
-
- <div id="content_use_libnotify">
- <div class="field-pair">
- <input type="checkbox" name="libnotify_notify_onsnatch" id="libnotify_notify_onsnatch" #if $sickbeard.LIBNOTIFY_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# />
- <input type="checkbox" name="libnotify_notify_onsnatch" id="libnotify_notify_onsnatch" #if $sickbeard.LIBNOTIFY_NOTIFY_ONSNATCH then "checked=\"checked\"" else ""# />
- <label class="clearfix" for="libnotify_notify_onsnatch">
- <span class="component-title">Notify on Snatch</span>
- <span class="component-desc">Send notification when we start a download?</span>
@ -62,10 +62,10 @@ index fb38f17..4ead36f 100644
<li class="divider"></li>
<li><a href="$sbRoot/config/providers/"><i class="icon-cog"></i> Search Providers</a></li>
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 20f0dfc..b0bf6a6 100644
index da9ff7f..36b608e 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -609,7 +609,6 @@ class History:
@@ -613,7 +613,6 @@ class History:
ConfigMenu = [

5
packages/addons/service/downloadmanager/SABnzbd-Suite/changelog.txt
View File

@ -1,3 +1,8 @@
3.0.7
- update to CouchPotatoServe-5a23be2
- update to SickBeard-ebec1de
- fix executehttpapi startup error
3.0.6
- fix configobj error n startup

2
packages/addons/service/downloadmanager/SABnzbd-Suite/meta
View File

@ -20,7 +20,7 @@
PKG_NAME="SABnzbd-Suite"
PKG_VERSION="3.0"
PKG_REV="6"
PKG_REV="7"
PKG_ARCH="any"
PKG_LICENSE="OSS"
PKG_SITE="http://www.openelec.tv"

11
packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py
View File

@ -98,14 +98,9 @@ while (not xbmc.abortRequested):
# reset idle timer when we're close to idle sleep/shutdown
if sabIsActive:
response = xbmc.executehttpapi("GetGUISetting(0;powermanagement.shutdowntime)").replace('<li>','')
shutdownTime = int(response) * 60
idleTime = xbmc.getGlobalIdleTime()
timeToShutdown = shutdownTime - idleTime
if (timeToShutdown <= checkInterval - timeout):
xbmc.log('SABnzbd-Suite: still downloading. Resetting XBMC idle timer.')
xbmc.executehttpapi("SendKey(0xF000)")
xbmc.executebuiltin('InhibitIdleShutdown(true)')
else:
xbmc.executebuiltin('InhibitIdleShutdown(false)')
# calculate and set the time to wake up at (if any)
if wakePeriodically:

3
packages/addons/service/multimedia/tvheadend/changelog.txt
View File

@ -1,3 +1,6 @@
3.0.7
- update to TVHeadend 3.3.511
3.0.6
- update to TVHeadend 3.3.491
- disable avahi support

4
packages/addons/service/multimedia/tvheadend/meta
View File

@ -19,8 +19,8 @@
################################################################################
PKG_NAME="tvheadend"
PKG_VERSION="3.3.491"
PKG_REV="6"
PKG_VERSION="3.3.511"
PKG_REV="7"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"

48
packages/addons/service/multimedia/tvheadend/patches/tvheadend-0001-cwc-syslog-move-some-log-messages-to-debug.patch
View File

@ -1,48 +0,0 @@
From 30517cb122d0991f0ba51155c9afff6bdc2d8899 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 13 Mar 2013 21:30:55 +0200
Subject: [PATCH] cwc: syslog: move some log messages to debug
---
src/capmt.c | 4 ++--
src/cwc.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/capmt.c b/src/capmt.c
index ac507bd..9e12e86 100644
--- a/src/capmt.c
+++ b/src/capmt.c
@@ -547,7 +547,7 @@ handle_ca0(capmt_t* capmt) {
#endif
if(ct->ct_keystate != CT_RESOLVED)
- tvhlog(LOG_INFO, "capmt", "Obtained key for service \"%s\"",t->s_svcname);
+ tvhlog(LOG_DEBUG, "capmt", "Obtained key for service \"%s\"",t->s_svcname);
ct->ct_keystate = CT_RESOLVED;
}
@@ -851,7 +851,7 @@ capmt_table_input(struct th_descrambler *td, struct service *t,
cce->cce_ecmsize = len;
if(ct->ct_keystate != CT_RESOLVED)
- tvhlog(LOG_INFO, "capmt",
+ tvhlog(LOG_DEBUG, "capmt",
"Trying to obtain key for service \"%s\"",t->s_svcname);
buf[9] = pmtversion;
diff --git a/src/cwc.c b/src/cwc.c
index ebafd4f..904213f 100644
--- a/src/cwc.c
+++ b/src/cwc.c
@@ -873,7 +873,7 @@ forbid:
}
if(ct->cs_keystate != CS_RESOLVED)
- tvhlog(LOG_INFO, "cwc",
+ tvhlog(LOG_DEBUG, "cwc",
"Obtained key for service \"%s\" in %"PRId64" ms, from %s:%i",
t->s_svcname, delay, ct->cs_cwc->cwc_hostname,
ct->cs_cwc->cwc_port);
--
1.7.10.4

94
packages/addons/service/multimedia/tvheadend/patches/tvheadend-0002-dvb-stop-constant-updating-of-dvb-muxc-onfig.patch
View File

@ -1,94 +0,0 @@
From 07cdfdaf6af06ae08a779ccc9082a517757c6fd3 Mon Sep 17 00:00:00 2001
From: Adam Sutton <dev@adamsutton.me.uk>
Date: Tue, 12 Mar 2013 15:35:21 +0000
Subject: [PATCH] Fix #1660 - dvb: stop constant updating of dvb mux
configuration files
---
src/dvb/dvb_multiplex.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/dvb/dvb_multiplex.c b/src/dvb/dvb_multiplex.c
index ff61558..692ebf1 100644
--- a/src/dvb/dvb_multiplex.c
+++ b/src/dvb/dvb_multiplex.c
@@ -58,9 +58,6 @@
{ "OK", TDMI_FE_OK },
};
-static void tdmi_set_enable(th_dvb_mux_instance_t *tdmi, int enabled);
-
-
/**
*
*/
@@ -856,6 +853,9 @@ int dvb_mux_str2hier(const char *str)
if (!networkname || !*networkname)
return;
+ if (!strcmp(tdmi->tdmi_network ?: "", networkname))
+ return;
+
free(tdmi->tdmi_network);
tdmi->tdmi_network = strdup(networkname);
dvb_mux_save(tdmi);
@@ -879,8 +879,9 @@ int dvb_mux_str2hier(const char *str)
if (tdmi->tdmi_transport_stream_id != 0xFFFF || tsid == 0xFFFF)
return;
- tdmi->tdmi_transport_stream_id = tsid;
-
+ if (tdmi->tdmi_transport_stream_id == tsid)
+ return;
+
dvb_mux_save(tdmi);
m = htsmsg_create_map();
@@ -900,6 +901,9 @@ int dvb_mux_str2hier(const char *str)
if (force)
if (tdmi->tdmi_network_id != 0 || onid == 0)
return;
+
+ if (tdmi->tdmi_network_id == onid)
+ return;
tdmi->tdmi_network_id = onid;
@@ -915,13 +919,13 @@ int dvb_mux_str2hier(const char *str)
/**
*
*/
-static void
+static int
tdmi_set_enable(th_dvb_mux_instance_t *tdmi, int enabled)
{
th_dvb_adapter_t *tda = tdmi->tdmi_adapter;
if(tdmi->tdmi_enabled == enabled)
- return;
+ return 0;
if(tdmi->tdmi_enabled) {
@@ -940,6 +944,7 @@ int dvb_mux_str2hier(const char *str)
mux_link_initial(tda, tdmi);
subscription_reschedule();
+ return 1;
}
/**
@@ -948,8 +953,8 @@ int dvb_mux_str2hier(const char *str)
void
dvb_mux_set_enable(th_dvb_mux_instance_t *tdmi, int enabled)
{
- tdmi_set_enable(tdmi, enabled);
- dvb_mux_save(tdmi);
+ if (tdmi_set_enable(tdmi, enabled))
+ dvb_mux_save(tdmi);
}
--
1.7.10