Merge pull request #638 from CvH/tvh-debug

tvheadend42: update to 4.1.2188
This commit is contained in:
Christian Hewitt 2016-08-20 20:27:33 +04:00 committed by GitHub
commit c5864e580b
5 changed files with 54 additions and 6 deletions

View File

@ -1,3 +1,7 @@
8.0.104
- update to Tvheadend 4.1.2188
- added TRACE debug option at the addon config
8.0.103
- update to Tvheadend 4.1.2134

View File

@ -17,8 +17,8 @@
################################################################################
PKG_NAME="tvheadend42"
PKG_VERSION="0bc30b9"
PKG_VERSION_NUMBER="4.1.2134"
PKG_VERSION="fb99e1a"
PKG_VERSION_NUMBER="4.1.2188"
PKG_REV="103"
PKG_ARCH="any"
PKG_LICENSE="GPL"
@ -64,6 +64,7 @@ PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
--enable-tvhcsa \
--enable-trace \
--nowerror \
--disable-bintray_cache \
--python=$ROOT/$TOOLCHAIN/bin/python"
post_unpack() {

View File

@ -76,8 +76,30 @@ if [ "$WORKAROUND_SLEEP" == "true" ] ; then
sleep $WORKAROUND_SLEEP_TIME
fi
if [ "$DEBUG" = "yes" ]; then
TVHEADEND_ARG="-B -C -s -u root -g video -c $ADDON_HOME"
# debug value generation
if [ "$DEBUG_LOG_TRACE_1" != "NONE" ]; then
DEBUG_LOG_ARG="$DEBUG_LOG_TRACE_1"
fi
if [ "$DEBUG_LOG_TRACE_2" != "NONE" ]; then
DEBUG_LOG_ARG="$DEBUG_LOG_ARG,$DEBUG_LOG_TRACE_2"
fi
if [ "$DEBUG_LOG_TRACE_3" != "NONE" ]; then
DEBUG_LOG_ARG="$DEBUG_LOG_ARG,$DEBUG_LOG_TRACE_3"
fi
if [ "$DEBUG_LOG_TRACE_4" != "NONE" ]; then
DEBUG_LOG_ARG="$DEBUG_LOG_ARG,$DEBUG_LOG_TRACE_4"
fi
if [ "$DEBUG_LOG_TRACE_5" != "NONE" ]; then
DEBUG_LOG_ARG="$DEBUG_LOG_ARG,$DEBUG_LOG_TRACE_5"
fi
# debug commandline
if [ "$DEBUG_LOG" = "true" ]; then
TVHEADEND_ARG="-B -C -u root -g video -c $ADDON_HOME -l $DEBUG_LOG_PATH --trace $DEBUG_LOG_ARG"
else
TVHEADEND_ARG="-B -C -u root -g video -c $ADDON_HOME"
fi

View File

@ -3,7 +3,8 @@
<!-- HTS TVHEADEND -->
<string id="1000">XMLTV</string>
<string id="1001">DVB</string>
<string id="1011">XMLTV configuration</string>
<string id="1002">DEBUG</string>
<string id="1010">XMLTV Configuration</string>
<string id="1011">XMLTV source type</string>
<string id="1012">XMLTV File location</string>
<string id="1013">XMLTV Web location</string>
@ -14,5 +15,13 @@
<string id="1023">Number of adapters to wait for</string>
<string id="1024">Preload capmt_ca.so library</string>
<string id="1025">Delay the start of Tvheadend</string>
<string id="1026">time (s)</string>
<string id="1026">Seconds delay</string>
<string id="1030">TRACE Configuration</string>
<string id="1031">Path</string>
<string id="1032">Activate TRACE Debug</string>
<string id="31032">Debug Value #1</string>
<string id="31033">Debug Value #2</string>
<string id="31034">Debug Value #3</string>
<string id="31035">Debug Value #4</string>
<string id="31036">Debug Value #5</string>
</strings>

View File

@ -19,4 +19,16 @@
<setting id="WORKAROUND_SLEEP" type="bool" label="1025" default="false" />
<setting id="WORKAROUND_SLEEP_TIME" type="slider" range="1,30" option="int" label="1026" default="1" enable="eq(-1,true)" />
</category>
<category label="1002">
<setting label="1030" type="lsep"/>
<setting type="sep" />
<setting id="DEBUG_LOG" type="bool" label="1032" default="false" />
<setting type="sep" />
<setting id="DEBUG_LOG_PATH" type="text" label="1031" default="/storage/.kodi/userdata/addon_data/service.tvheadend42/debug.log" enable="eq(-2,true)"/>
<setting id="DEBUG_LOG_TRACE_1" type="select" default="NONE" enable="eq(-3,true)" label="31032" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
<setting id="DEBUG_LOG_TRACE_2" type="select" default="NONE" enable="!eq(-1,NONE)+eq(-4,true)" label="31033" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
<setting id="DEBUG_LOG_TRACE_3" type="select" default="NONE" enable="!eq(-1,NONE)+!eq(-2,NONE)+eq(-5,true)" label="31034" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
<setting id="DEBUG_LOG_TRACE_4" type="select" default="NONE" enable="!eq(-1,NONE)+!eq(-2,NONE)+!eq(-3,NONE)+eq(-6,true)" label="31035" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
<setting id="DEBUG_LOG_TRACE_5" type="select" default="NONE" enable="!eq(-1,NONE)+!eq(-2,NONE)+!eq(-3,NONE)+!eq(-4,NONE)+eq(-7,true)" label="31036" values="NONE|access|api|avahi|bat|bonjour|bouquet|caclient|capmt|channel|charset|config|CPU|cron|csa|cwc|dbus|descrambler|diseqc|dvb|dvbcam|dvr|epg|epgdb|epggrab|esfilter|fastscan|fsmonitor|globalheaders|gtimer|hevc|htsp|htsp-ans|htsp-req|htsp-sub|http|httpc|idnode|imagecache|iptv|iptv-pcr|libav|linuxdvb|lock|main|mkv|mpegts|mtimer|muxer|muxsched|opentv|parser|pass|pat|pmt|profile|psip|pyepg|rtsp|satip|satips|scanfile|service|service-mapper|settings|spawn|subscription|tbl|tbl-atsc|tbl-base|tbl-csa|tbl-eit|tbl-pass|tbl-satip|tbl-time|tcp|thread|time|timeshift|transcode|TS|tsfile|tsfix|tvhdhomerun|tvhpoll|upnp|url|uuid|webui|xmltv" />
</category>
</settings>