From 4a49e524455e7287fa12c0e198741b708d991c7f Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 27 Mar 2013 12:51:34 +0200 Subject: [PATCH 1/9] xbmc-addon-settings: update to xbmc-addon-settings-0.1.4 --- packages/mediacenter/xbmc-addon-settings/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/xbmc-addon-settings/meta b/packages/mediacenter/xbmc-addon-settings/meta index 1b4cf85f49..47e9da9a6f 100644 --- a/packages/mediacenter/xbmc-addon-settings/meta +++ b/packages/mediacenter/xbmc-addon-settings/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-addon-settings" -PKG_VERSION="0.1.3" +PKG_VERSION="0.1.4" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="prop." From 392b032d8103439770de5f5a24c542e31da7b468 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 28 Mar 2013 19:40:21 +0200 Subject: [PATCH 2/9] tvheadend: update to tvheadend-3.3.511 --- .../multimedia/tvheadend/changelog.txt | 3 + .../addons/service/multimedia/tvheadend/meta | 4 +- ...slog-move-some-log-messages-to-debug.patch | 48 ---------- ...-constant-updating-of-dvb-muxc-onfig.patch | 94 ------------------- 4 files changed, 5 insertions(+), 144 deletions(-) delete mode 100644 packages/addons/service/multimedia/tvheadend/patches/tvheadend-0001-cwc-syslog-move-some-log-messages-to-debug.patch delete mode 100644 packages/addons/service/multimedia/tvheadend/patches/tvheadend-0002-dvb-stop-constant-updating-of-dvb-muxc-onfig.patch diff --git a/packages/addons/service/multimedia/tvheadend/changelog.txt b/packages/addons/service/multimedia/tvheadend/changelog.txt index c912a5a531..0839bb78cb 100644 --- a/packages/addons/service/multimedia/tvheadend/changelog.txt +++ b/packages/addons/service/multimedia/tvheadend/changelog.txt @@ -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 diff --git a/packages/addons/service/multimedia/tvheadend/meta b/packages/addons/service/multimedia/tvheadend/meta index 84d329f3d4..f91a5463a3 100644 --- a/packages/addons/service/multimedia/tvheadend/meta +++ b/packages/addons/service/multimedia/tvheadend/meta @@ -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" diff --git a/packages/addons/service/multimedia/tvheadend/patches/tvheadend-0001-cwc-syslog-move-some-log-messages-to-debug.patch b/packages/addons/service/multimedia/tvheadend/patches/tvheadend-0001-cwc-syslog-move-some-log-messages-to-debug.patch deleted file mode 100644 index a3ce1092cf..0000000000 --- a/packages/addons/service/multimedia/tvheadend/patches/tvheadend-0001-cwc-syslog-move-some-log-messages-to-debug.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 30517cb122d0991f0ba51155c9afff6bdc2d8899 Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -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 - diff --git a/packages/addons/service/multimedia/tvheadend/patches/tvheadend-0002-dvb-stop-constant-updating-of-dvb-muxc-onfig.patch b/packages/addons/service/multimedia/tvheadend/patches/tvheadend-0002-dvb-stop-constant-updating-of-dvb-muxc-onfig.patch deleted file mode 100644 index 60e2894c10..0000000000 --- a/packages/addons/service/multimedia/tvheadend/patches/tvheadend-0002-dvb-stop-constant-updating-of-dvb-muxc-onfig.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 07cdfdaf6af06ae08a779ccc9082a517757c6fd3 Mon Sep 17 00:00:00 2001 -From: Adam Sutton -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 - From e632500fd47f0e93e5637dc81db95dc93c099425 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 28 Mar 2013 20:11:36 +0200 Subject: [PATCH 3/9] SABnzbd-Suite: executehttpapi has been removed from xbmc. use builtin:inhibitidleshutdown fixes #1548, closes #2129 --- .../downloadmanager/SABnzbd-Suite/source/default.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py index 50317c5684..164f1d9738 100644 --- a/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py +++ b/packages/addons/service/downloadmanager/SABnzbd-Suite/source/default.py @@ -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('
  • ','') - 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: From 81666bf18271de6c2edfe5f6b5e6fca9db6d8e38 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 28 Mar 2013 20:36:00 +0200 Subject: [PATCH 4/9] CouchPotatoServe: update to CouchPotatoServe-5a23be2 --- packages/3rdparty/download/CouchPotatoServer/meta | 2 +- ...a00a-move-cache.patch => CouchPotatoServer-move-cache.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename packages/3rdparty/download/CouchPotatoServer/patches/{CouchPotatoServer-a49a00a-move-cache.patch => CouchPotatoServer-move-cache.patch} (100%) diff --git a/packages/3rdparty/download/CouchPotatoServer/meta b/packages/3rdparty/download/CouchPotatoServer/meta index 5469068066..a9d9592d43 100644 --- a/packages/3rdparty/download/CouchPotatoServer/meta +++ b/packages/3rdparty/download/CouchPotatoServer/meta @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="CouchPotatoServer" -PKG_VERSION="a49a00a" +PKG_VERSION="5a23be2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-a49a00a-move-cache.patch b/packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-move-cache.patch similarity index 100% rename from packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-a49a00a-move-cache.patch rename to packages/3rdparty/download/CouchPotatoServer/patches/CouchPotatoServer-move-cache.patch From 020ada5fd6cea267d16f87440985775fe6718e45 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 28 Mar 2013 20:40:39 +0200 Subject: [PATCH 5/9] SickBeard: update to SickBeard-ebec1de --- packages/3rdparty/download/SickBeard/meta | 2 +- ...e_logo_update-header_and_donate_button-0.1.patch} | 0 ... SickBeard-002-remove_default_settings-0.3.patch} | 12 ++++++------ 3 files changed, 7 insertions(+), 7 deletions(-) rename packages/3rdparty/download/SickBeard/patches/{SickBeard-4e57625-001-remove_logo_update-header_and_donate_button-0.1.patch => SickBeard-001-remove_logo_update-header_and_donate_button-0.1.patch} (100%) rename packages/3rdparty/download/SickBeard/patches/{SickBeard-4e57625-002-remove_default_settings-0.3.patch => SickBeard-002-remove_default_settings-0.3.patch} (96%) diff --git a/packages/3rdparty/download/SickBeard/meta b/packages/3rdparty/download/SickBeard/meta index 99113c8a94..793ae956dc 100644 --- a/packages/3rdparty/download/SickBeard/meta +++ b/packages/3rdparty/download/SickBeard/meta @@ -20,7 +20,7 @@ ################################################################################ PKG_NAME="SickBeard" -PKG_VERSION="4e57625" +PKG_VERSION="ebec1de" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="OSS" diff --git a/packages/3rdparty/download/SickBeard/patches/SickBeard-4e57625-001-remove_logo_update-header_and_donate_button-0.1.patch b/packages/3rdparty/download/SickBeard/patches/SickBeard-001-remove_logo_update-header_and_donate_button-0.1.patch similarity index 100% rename from packages/3rdparty/download/SickBeard/patches/SickBeard-4e57625-001-remove_logo_update-header_and_donate_button-0.1.patch rename to packages/3rdparty/download/SickBeard/patches/SickBeard-001-remove_logo_update-header_and_donate_button-0.1.patch diff --git a/packages/3rdparty/download/SickBeard/patches/SickBeard-4e57625-002-remove_default_settings-0.3.patch b/packages/3rdparty/download/SickBeard/patches/SickBeard-002-remove_default_settings-0.3.patch similarity index 96% rename from packages/3rdparty/download/SickBeard/patches/SickBeard-4e57625-002-remove_default_settings-0.3.patch rename to packages/3rdparty/download/SickBeard/patches/SickBeard-002-remove_default_settings-0.3.patch index 312b3db7a3..32f5c86111 100644 --- a/packages/3rdparty/download/SickBeard/patches/SickBeard-4e57625-002-remove_default_settings-0.3.patch +++ b/packages/3rdparty/download/SickBeard/patches/SickBeard-002-remove_default_settings-0.3.patch @@ -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 @@
    @@ -12,7 +12,7 @@ index 826cf0a..02f14af 100755 -
    -
    -
    -- +- -