From ec9172bb6fb7a987288270a870934c792ff47ae9 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 21 Mar 2013 12:49:23 +0200 Subject: [PATCH 1/3] tvheadend: add patch to move some cwc/capmt log messages to debug (syslog) --- ...slog-move-some-log-messages-to-debug.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 packages/addons/service/multimedia/tvheadend/patches/tvheadend-0001-cwc-syslog-move-some-log-messages-to-debug.patch 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 new file mode 100644 index 0000000000..a3ce1092cf --- /dev/null +++ b/packages/addons/service/multimedia/tvheadend/patches/tvheadend-0001-cwc-syslog-move-some-log-messages-to-debug.patch @@ -0,0 +1,48 @@ +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 + From 01a5422d0bb3c4014223871934427b32276ccfb8 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Thu, 21 Mar 2013 12:50:32 +0200 Subject: [PATCH 2/3] tvheadend: add patch to stop constant updating of dvb mux configuration files fixes #2051 --- ...-constant-updating-of-dvb-muxc-onfig.patch | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) create 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/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 new file mode 100644 index 0000000000..60e2894c10 --- /dev/null +++ b/packages/addons/service/multimedia/tvheadend/patches/tvheadend-0002-dvb-stop-constant-updating-of-dvb-muxc-onfig.patch @@ -0,0 +1,94 @@ +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 7e118a4dadc0a518bdfe9233b18872b29c39d55a Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Thu, 21 Mar 2013 15:08:22 +0100 Subject: [PATCH 3/3] Fix weird typo Not sure what happened here, but obviously ADEND_ARG should have been TVHEADEND_ARG. Completely clueness how this has come about. --- .../service/multimedia/tvheadend/source/bin/tvheadend.start | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start index 3ddfa7d65c..29f72f6562 100755 --- a/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start +++ b/packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start @@ -95,9 +95,9 @@ if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then fi if [ "$DEBUG" = "yes" ]; then - ADEND_ARG="-C -s -u root -g video -c $ADDON_HOME" + TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME" else - ADEND_ARG="-C -u root -g video -c $ADDON_HOME" + TVHEADEND_ARG="-C -u root -g video -c $ADDON_HOME" fi mkdir -p /var/config