From 1e82237a1e5c34531921f6f471b7acb7086eb525 Mon Sep 17 00:00:00 2001
From: vpeter4 <peter.vicman@gmail.com>
Date: Thu, 21 Feb 2013 09:05:52 +0100
Subject: [PATCH 1/5] sundtek: new addon settings enable HW PID filter (enabled
 on for RPi by default) enable IR receiver allow sharing local tuner over
 network use network tuners

---
 packages/addons/driver/sundtek/changelog.txt  |  20 ++-
 .../addons/driver/sundtek/config/sundtek.conf |  16 +-
 packages/addons/driver/sundtek/meta           |   2 +-
 .../driver/sundtek/settings-default.xml       |  18 +-
 .../sundtek/source/bin/userspace-driver.sh    | 159 ++++++++++++++----
 .../resources/language/English/strings.xml    |  19 ++-
 .../sundtek/source/resources/settings.xml     |  24 ++-
 7 files changed, 207 insertions(+), 51 deletions(-)
 mode change 100755 => 100644 packages/addons/driver/sundtek/settings-default.xml

diff --git a/packages/addons/driver/sundtek/changelog.txt b/packages/addons/driver/sundtek/changelog.txt
index 7043ca6cb5..be4e096e2a 100644
--- a/packages/addons/driver/sundtek/changelog.txt
+++ b/packages/addons/driver/sundtek/changelog.txt
@@ -1,25 +1,27 @@
+3.0.3
+  new addon settings:
+    enable HW PID filter (enabled for RPi by default)
+    enable IR receiver
+    allow sharing local tuner over network
+    use network tuners
+3.0.2
+  special version
 3.0.1
   addon renamed to just sundtek
   added addon settings
   sundtek's binaries are downloaded on first run
   automatically download new version of the binaries if available
   added preload library to .profile (to run mediaclient, w_scan, ... from console)
-
 2.1.4
   support for Raspberry Pi
-
 2.1.3
   support for network tuner
-
 2.1.2
   support for multiple Sundtek tuners
   support for working with other tuners (kernel drivers)
-
 2.1.1
-- update to addon version 2.1
-
+  update to addon version 2.1
 2.0.5
-- starting userspace DVB drivers from Tvheadend/VDR
-
+  starting userspace DVB drivers from Tvheadend/VDR
 1.90.0
-- initial version of Sundtek MediaTV DVB driver
+  initial version of Sundtek MediaTV DVB driver
diff --git a/packages/addons/driver/sundtek/config/sundtek.conf b/packages/addons/driver/sundtek/config/sundtek.conf
index 103a7ab60b..15a81288a6 100644
--- a/packages/addons/driver/sundtek/config/sundtek.conf
+++ b/packages/addons/driver/sundtek/config/sundtek.conf
@@ -5,15 +5,21 @@
 # Do not change this line (OpenElec addon require this) !
 device_attach=/storage/.xbmc/addons/driver.dvb.sundtek/bin/device-attached.sh
 
+# enable HW PID filter (default on for RPi)
+use_hwpidfilter=off
+
+# enable listening on network
+enablenetwork=off
+
+# Lowest adapter number to start with, e.g. /dev/dvb/adapter5/frontend0
+first_adapter=0
+
 # Infrared Control Support is disabled/enabled
 ir_disabled=1
 
 # trigger device_attach only once if more devices is used
 bulk_notification=on
 
-# Lowest adapter number to start with, e.g. /dev/dvb/adapter5/frontend0
-#first_adapter=5
-
 # Get adapter serial number with mediaclient -e
 # or look into file adapter_serial_number.txt
 #[SERIALNUMBER]
@@ -24,3 +30,7 @@ bulk_notification=on
 
 #[U123456789012]
 #initial_dvb_mode=DVBT
+
+#[NETWORK]
+#device=192.168.1.1:0
+#device=192.168.1.1:1
diff --git a/packages/addons/driver/sundtek/meta b/packages/addons/driver/sundtek/meta
index ce0440aacb..afeb13dab2 100644
--- a/packages/addons/driver/sundtek/meta
+++ b/packages/addons/driver/sundtek/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="sundtek"
 PKG_VERSION="3.0"
-PKG_REV="1"
+PKG_REV="3"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
diff --git a/packages/addons/driver/sundtek/settings-default.xml b/packages/addons/driver/sundtek/settings-default.xml
old mode 100755
new mode 100644
index 5de6cb8a02..dff044590f
--- a/packages/addons/driver/sundtek/settings-default.xml
+++ b/packages/addons/driver/sundtek/settings-default.xml
@@ -1,7 +1,21 @@
 <settings>
   <setting id="AUTO_UPDATE" value="false" />
-  <setting id="ANALOG_TV" value="false" />
-  <setting id="NETWORK_TUNER_IP" value="0.0.0.0" />
+  <setting id="ANALOG_TV"   value="false" />
   <setting id="SETTLE_TIME" value="0" />
   <setting id="RUN_USER_SCRIPT" value="false" />
+  <setting id="ENABLE_HW_PID_FILTER" value="false" />
+  <setting id="ENABLE_IR_RECEIVER" value="false" />
+  <setting id="LOWEST_ADAPTER_NUM" value="0" />
+  <setting id="ALLOW_NET_USE"  value="false" />
+  <setting id="USE_NET_TUNERS" value="false" />
+  <setting id="DEVICE1_IP"  value="" />
+  <setting id="DEVICE1_NUM" value="1" />
+  <setting id="DEVICE2_IP"  value="" />
+  <setting id="DEVICE2_NUM" value="1" />
+  <setting id="DEVICE3_IP"  value="" />
+  <setting id="DEVICE3_NUM" value="1" />
+  <setting id="DEVICE4_IP"  value="" />
+  <setting id="DEVICE4_NUM" value="1" />
+  <setting id="DEVICE5_IP"  value="" />
+  <setting id="DEVICE5_NUM" value="1" />
 </settings>
diff --git a/packages/addons/driver/sundtek/source/bin/userspace-driver.sh b/packages/addons/driver/sundtek/source/bin/userspace-driver.sh
index 0ec17a5389..40b93317f9 100644
--- a/packages/addons/driver/sundtek/source/bin/userspace-driver.sh
+++ b/packages/addons/driver/sundtek/source/bin/userspace-driver.sh
@@ -22,6 +22,16 @@
 
 . /etc/profile
 
+net_tuner_num_fix() {
+  local num=$1
+
+  [ -z "$num" ] && num=1
+  num=$(( $num *1 ))
+  [ $num -lt 1 ] && num=1
+  num=$(( $num -1 ))
+  echo $num
+}
+
 ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek"
 ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
@@ -31,6 +41,14 @@ mkdir -p $ADDON_HOME
 
 if [ ! -f "$ADDON_HOME/sundtek.conf" ]; then
   cp $ADDON_DIR/config/* $ADDON_HOME/
+else
+  # in case of missing entries in addon home's sundtek.conf
+  entry_set="$(grep use_hwpidfilter $ADDON_HOME/sundtek.conf 2>/dev/null)"
+  if [ -z "$entry_set" ]; then
+    sed -i 's|\(^device_attach=.*\)|\1\n# enable listening on network\nenablenetwork=off|g' $ADDON_HOME/sundtek.conf
+    sed -i 's|\(^device_attach=.*\)|\1\n\n# enable HW PID filter\nuse_hwpidfilter=off\n|g' $ADDON_HOME/sundtek.conf
+    sed -i 's|^#first_adapter=.*|first_adapter=0|g' $ADDON_HOME/sundtek.conf
+  fi
 fi
 
 if [ ! -f "$ADDON_SETTINGS" ]; then
@@ -68,6 +86,11 @@ if [ ! -f $ADDON_DIR/bin/mediasrv ]; then
     INSTALLER_URL="http://sundtek.de/media/netinst/32bit/installer.tar.gz"
   elif [ "$ARCH" = "arm" ]; then
     INSTALLER_URL="http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz"
+
+    # enable HW PID filter on RPi by default
+    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $ADDON_DIR/config/sundtek.conf
+    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $ADDON_HOME/sundtek.conf
+    sed -i 's|.*id="ENABLE_HW_PID_FILTER" value=.*|<setting id="ENABLE_HW_PID_FILTER" value="true" />|' $ADDON_SETTINGS
   else
     logger -t Sundtek "### Unsupported architecture ###"
     cd ..
@@ -75,9 +98,6 @@ if [ ! -f $ADDON_DIR/bin/mediasrv ]; then
     exit 1
   fi
 
-  # test only !!!
-  #INSTALLER_URL="http://sundtek.de/support/installer.tar.gz"
-  
   wget -O installer.tar.gz $INSTALLER_URL
   wget -O ../driver-version.txt http://sundtek.de/media/latest.phtml
   logger -t Sundtek "### Extracting installer ###"
@@ -95,21 +115,22 @@ if [ ! -f $ADDON_DIR/bin/mediasrv ]; then
   cd ..
   rm -fr tmp/
   logger -t Sundtek "### Installer finished ###"
+
+  cat "$ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf
+  . /var/config/sundtek-addon.conf
 fi
 
 if [ ! -f $ADDON_HOME/driver-version.txt ]; then
   cp $ADDON_DIR/driver-version.txt $ADDON_HOME/
 fi
 
-# enable to install same version again
+# enable to install same addon version again
 rm -f /storage/.xbmc/addons/packages/driver.dvb.sundtek-*
 
 # add alias for /opt/bin/mediaclient
-#alias_set="$(grep /opt/bin/mediaclient /storage/.profile 2>/dev/null)"
 alias_set="$(grep libmediaclient.so /storage/.profile 2>/dev/null)"
 if [ -z "$alias_set" ]; then
   echo "" >>/storage/.profile
-  #echo "alias /opt/bin/mediaclient=/storage/.xbmc/addons/driver.dvb.sundtek/bin/mediaclient" >>/storage/.profile
   echo "[ -f /storage/.xbmc/addons/driver.dvb.sundtek/lib/libmediaclient.so ] && export LD_PRELOAD=/storage/.xbmc/addons/driver.dvb.sundtek/lib/libmediaclient.so" >>/storage/.profile
   echo "" >>/storage/.profile
 fi
@@ -117,45 +138,121 @@ fi
 export LD_PRELOAD=$ADDON_DIR/lib/libmediaclient.so
 
 if [ "$ANALOG_TV" = "true" -a ! -f "$ADDON_DIR/bin/plugins/lib/libavcodec.so.54.12.100" ]; then
-	logger -t Sundtek "### Downloading missing ffmpeg libraries ###"
-	cd $ADDON_DIR/bin
-	mkdir -p plugins/
-	cd plugins/
+  logger -t Sundtek "### Downloading missing ffmpeg libraries ###"
+  cd $ADDON_DIR/bin
+  mkdir -p plugins/
+  cd plugins/
 
-	ARCH=$(sed -n 's|.*\.\([^-]*\)-.*|\1|p' /etc/release | tr -d '\n')
+  ARCH=$(sed -n 's|.*\.\([^-]*\)-.*|\1|p' /etc/release | tr -d '\n')
   wget -O sundtek-ffmpeg-analog_tv-lib.tgz http://dl.dropbox.com/u/8224157/public/sundtek/sundtek-ffmpeg-analog_tv-lib-$ARCH.tgz
 
-	logger -t Sundtek "### Extracting ffmpeg libraries ###"
-	tar -xzf sundtek-ffmpeg-analog_tv-lib.tgz
-	if [ $? -ne 0 ]; then
-	  logger -t Sundtek "### Ffmpeg library archive damaged ###"
-	  rm -f sundtek-ffmpeg-analog_tv-lib.tgz
-	  exit 2
-	fi
+  logger -t Sundtek "### Extracting ffmpeg libraries ###"
+  tar -xzf sundtek-ffmpeg-analog_tv-lib.tgz
+  if [ $? -ne 0 ]; then
+    logger -t Sundtek "### Ffmpeg library archive damaged ###"
+    rm -f sundtek-ffmpeg-analog_tv-lib.tgz
+    exit 2
+  fi
 
-	rm -f sundtek-ffmpeg-analog_tv-lib.tgz
+  rm -f sundtek-ffmpeg-analog_tv-lib.tgz
 fi
-  
+
 if [ -z "$(pidof mediasrv)" ]; then
   rm -f /var/log/mediasrv.log
   rm -f /var/log/mediaclient.log
   rm -f $SUNDTEK_READY
 
-  mediasrv --wait-for-devices -p $ADDON_DIR/bin -c $ADDON_HOME/sundtek.conf -d
+  SUNDTEK_CONF_TMP=/tmp/sundtek.conf
+  cp $ADDON_HOME/sundtek.conf $SUNDTEK_CONF_TMP
 
-  if [ -n "$NETWORK_TUNER_IP" -a "$NETWORK_TUNER_IP" != "0.0.0.0" ]; then
-    logger -t Sundtek "### Trying to connect to Sundtek network device IP $NETWORK_TUNER_IP ###"
-    mediaclient --mount=$NETWORK_TUNER_IP
+  [ -z "$LOWEST_ADAPTER_NUM" ] && LOWEST_ADAPTER_NUM=0
+  sed -i "s|^first_adapter=.*|first_adapter=$LOWEST_ADAPTER_NUM|g" $SUNDTEK_CONF_TMP
+
+  # enable HW PID filter
+  if [ "$ENABLE_HW_PID_FILTER" = "true" ]; then
+    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $SUNDTEK_CONF_TMP
   else
-    logger -t Sundtek "### Trying to attach Sundtek device ###"
+    sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=off|g' $SUNDTEK_CONF_TMP
   fi
 
+  # enable IR receiver
+  if [ "$ENABLE_IR_RECEIVER" = "true" ]; then
+    sed -i 's|^ir_disabled=.*|ir_disabled=0|g' $SUNDTEK_CONF_TMP
+  else
+    sed -i 's|^ir_disabled=.*|ir_disabled=1|g' $SUNDTEK_CONF_TMP
+  fi
+
+  if [ "$ALLOW_NET_USE" = "true" ]; then
+    sed -i 's|^enablenetwork=.*|enablenetwork=on|g' $SUNDTEK_CONF_TMP
+  else
+    sed -i 's|^enablenetwork=.*|enablenetwork=off|g' $SUNDTEK_CONF_TMP
+  fi
+
+  [ "$DEVICE1_IP" = "0.0.0.0" ] && DEVICE1_IP=""
+  [ "$DEVICE2_IP" = "0.0.0.0" ] && DEVICE2_IP=""
+  [ "$DEVICE3_IP" = "0.0.0.0" ] && DEVICE3_IP=""
+  [ "$DEVICE4_IP" = "0.0.0.0" ] && DEVICE4_IP=""
+  [ "$DEVICE5_IP" = "0.0.0.0" ] && DEVICE5_IP=""
+  DEVICE1_NUM=$(net_tuner_num_fix $DEVICE1_NUM)
+  DEVICE2_NUM=$(net_tuner_num_fix $DEVICE2_NUM)
+  DEVICE3_NUM=$(net_tuner_num_fix $DEVICE3_NUM)
+  DEVICE4_NUM=$(net_tuner_num_fix $DEVICE4_NUM)
+  DEVICE5_NUM=$(net_tuner_num_fix $DEVICE5_NUM)
+
+  if [ "$USE_NET_TUNERS" = "true" -a -n "$DEVICE1_IP" ]; then
+    # delete all network tuner entries
+    awk '/^\[NETWORK\]/{flag=1; next} /^device=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-net
+    mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP
+    echo "" >>$SUNDTEK_CONF_TMP
+    # remove empty lines at the end of file
+    sed -i '${/^$/d;}' $SUNDTEK_CONF_TMP
+    # add entries
+    echo "[NETWORK]" >>$SUNDTEK_CONF_TMP
+    for dev in $(seq 0 $DEVICE1_NUM); do
+      echo "device=$DEVICE1_IP:$dev" >>$SUNDTEK_CONF_TMP
+    done
+    if [ -n "$DEVICE2_IP" ]; then
+      for dev in $(seq 0 $DEVICE2_NUM); do
+        echo "device=$DEVICE2_IP:$dev" >>$SUNDTEK_CONF_TMP
+      done
+      if [ -n "$DEVICE3_IP" ]; then
+        for dev in $(seq 0 $DEVICE3_NUM); do
+          echo "device=$DEVICE3_IP:$dev" >>$SUNDTEK_CONF_TMP
+        done
+        if [ -n "$DEVICE4_IP" ]; then
+          for dev in $(seq 0 $DEVICE4_NUM); do
+            echo "device=$DEVICE4_IP:$dev" >>$SUNDTEK_CONF_TMP
+          done
+          if [ -n "$DEVICE5_IP" ]; then
+            for dev in $(seq 0 $DEVICE5_NUM); do
+              echo "device=$DEVICE5_IP:$dev" >>$SUNDTEK_CONF_TMP
+            done
+          fi
+        fi
+      fi
+    fi
+  else
+    # delete all network tuner entries
+    awk '/^\[NETWORK\]/{flag=1; next} /^device=|^#|^$/{if (flag==1) next} /.*/{flag=0; print}' $SUNDTEK_CONF_TMP >${SUNDTEK_CONF_TMP}-net
+    mv ${SUNDTEK_CONF_TMP}-net $SUNDTEK_CONF_TMP
+    echo "" >>$SUNDTEK_CONF_TMP
+    # remove empty lines at the end of file
+    sed -i '${/^$/d;}' $SUNDTEK_CONF_TMP
+  fi
+
+  md5_1=$(md5sum -b $SUNDTEK_CONF_TMP | awk '{print $1}')
+  md5_2=$(md5sum -b $ADDON_HOME/sundtek.conf | awk '{print $1}')
+  if [ "$md5_1" != "$md5_2" ]; then
+    # file changed - copy to addon home
+    cp $SUNDTEK_CONF_TMP $ADDON_HOME/sundtek.conf
+  fi
+
+  #rm "$SUNDTEK_CONF_TMP"
+
+  mediasrv --wait-for-devices -p $ADDON_DIR/bin -c $ADDON_HOME/sundtek.conf -d
+
   # wait for device to get attached or connected
   for i in $(seq 1 240); do
-    if [ -n "$NETWORK_TUNER_IP" -a -e /dev/dvb/adapter*/frontend* ]; then
-      sh $ADDON_DIR/bin/device-attached.sh
-    fi
-
     if [ -f $SUNDTEK_READY ]; then
       rm -f $SUNDTEK_READY
       logger -t Sundtek "### Sundtek ready ###"
@@ -173,9 +270,9 @@ if [ -z "$(pidof mediasrv)" ]; then
       usleep 500000
     fi
   done
- 
+
   if [ "$ANALOG_TV" = "true" ]; then
-  	logger -t Sundtek "### Switching to analog TV mode ###"  
+    logger -t Sundtek "### Switching to analog TV mode ###"
     #rm -fr /dev/dvb/
     mediaclient --disable-dvb=/dev/dvb/adapter0
   fi
diff --git a/packages/addons/driver/sundtek/source/resources/language/English/strings.xml b/packages/addons/driver/sundtek/source/resources/language/English/strings.xml
index fe9a39f090..a76c6fd8d5 100644
--- a/packages/addons/driver/sundtek/source/resources/language/English/strings.xml
+++ b/packages/addons/driver/sundtek/source/resources/language/English/strings.xml
@@ -2,8 +2,23 @@
 <strings>
   <string id="1000">General</string>
   <string id="1011">Auto update binary driver</string>
-  <string id="1012">Analog TV</string>
-  <string id="1013">Network tuner IP</string>
+  <string id="1012">Enable analog TV</string>
   <string id="1014">Extra settle time</string>
   <string id="1015">Run user script</string>
+  <string id="1030">Enable hardware PID filter</string>
+  <string id="1035">Enable IR receiver</string>
+  <string id="1040">Lowest adapter number (/dev/dvb/adapterX/)</string>
+  <string id="2000">Networking</string>
+  <string id="2005">Share local tuner over network</string>
+  <string id="2010">Use network shared tuners</string>
+  <string id="2020">Server 1 IP address</string>
+  <string id="2021">    # of tuners</string>
+  <string id="2030">Server 2 IP address</string>
+  <string id="2031">    # of tuners</string>
+  <string id="2040">Server 3 IP address</string>
+  <string id="2041">    # of tuners</string>
+  <string id="2050">Server 4 IP address</string>
+  <string id="2051">    # of tuners</string>
+  <string id="2060">Server 5 IP address</string>
+  <string id="2061">    # of tuners</string>
 </strings>
diff --git a/packages/addons/driver/sundtek/source/resources/settings.xml b/packages/addons/driver/sundtek/source/resources/settings.xml
index 13c4605753..cd2d13eedd 100644
--- a/packages/addons/driver/sundtek/source/resources/settings.xml
+++ b/packages/addons/driver/sundtek/source/resources/settings.xml
@@ -1,12 +1,30 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
-  <category label="1000">
-    <setting label="1010" type="lsep" />
+  <category label="1000" >
+    <setting label="" type="lsep" />
     <setting type="sep" />
     <setting id="AUTO_UPDATE" type="bool" label="1011" default="false" />
     <setting id="ANALOG_TV" type="bool" label="1012" default="false" enable="false" />
-    <setting id="NETWORK_TUNER_IP" type="ipaddress" label="1013" default="0.0.0.0" />
     <setting id="SETTLE_TIME" type="number" label="1014" default="0" />
     <setting id="RUN_USER_SCRIPT" type="bool" label="1015" default="false" />
+    <setting id="ENABLE_HW_PID_FILTER" type="bool" label="1030" default="false" />
+    <setting id="ENABLE_IR_RECEIVER" type="bool" label="1035" default="false" />
+    <setting id="LOWEST_ADAPTER_NUM" type="number" label="1040" default="0" />
+  </category>
+  <category label="2000" >
+    <setting label="" type="lsep" />
+    <setting type="sep" />
+    <setting id="ALLOW_NET_USE"  type="bool"   label="2005" default="false" />
+    <setting id="USE_NET_TUNERS" type="bool"   label="2010" default="false" />
+    <setting id="DEVICE1_IP"  type="ipaddress" label="2020" default=""                     visible="eq(-1,true)" />
+    <setting id="DEVICE1_NUM" type="labelenum" label="2021" default="1" values="1|5|4|3|2" visible="eq(-2,true)" />
+    <setting id="DEVICE2_IP"  type="ipaddress" label="2030" default=""                     visible="eq(-3,true)" />
+    <setting id="DEVICE2_NUM" type="labelenum" label="2031" default="1" values="1|5|4|3|2" visible="eq(-4,true)" />
+    <setting id="DEVICE3_IP"  type="ipaddress" label="2040" default=""                     visible="eq(-5,true)" />
+    <setting id="DEVICE3_NUM" type="labelenum" label="2041" default="1" values="1|5|4|3|2" visible="eq(-6,true)" />
+    <setting id="DEVICE4_IP"  type="ipaddress" label="2050" default=""                     visible="eq(-7,true)" />
+    <setting id="DEVICE4_NUM" type="labelenum" label="2051" default="1" values="1|5|4|3|2" visible="eq(-8,true)" />
+    <setting id="DEVICE5_IP"  type="ipaddress" label="2060" default=""                     visible="eq(-9,true)" />
+    <setting id="DEVICE5_NUM" type="labelenum" label="2061" default="1" values="1|5|4|3|2" visible="eq(-10,true)" />
   </category>
 </settings>

From 2689cd4218201ae9ea35238684757196a1900d2b Mon Sep 17 00:00:00 2001
From: vpeter4 <peter.vicman@gmail.com>
Date: Thu, 21 Feb 2013 16:45:48 +0100
Subject: [PATCH 2/5] sundtek-mediatv: bump version   added addon settings    
 enable HW PID filter (enabled for RPi by default)     enable IR receiver    
 allow sharing local tuner over network     use network tuners   sundtek's
 binaries are downloaded on first run   automatically download new version of
 the binaries if available   added preload library to .profile (to run
 mediaclient, w_scan, ... from console)

---
 .../driver/{sundtek => sundtek-mediatv}/addon |   0
 .../changelog.txt                             |   9 +--
 .../config/sundtek.conf                       |   3 -
 .../config/sundtek.conf.full                  |   0
 .../icon/icon.png                             | Bin
 .../driver/{sundtek => sundtek-mediatv}/meta  |   4 +-
 .../settings-default.xml                      |   0
 .../source/bin/sundtek.start                  |   2 +-
 .../source/bin/sundtek.stop                   |   2 +-
 .../source/bin/userspace-driver.sh            |  57 ++++++++----------
 .../source/default.py                         |   0
 .../resources/language/English/strings.xml    |   0
 .../source/resources/settings.xml             |  14 ++---
 .../source/sleep.d/sundtek-mediatv.power}     |   8 +--
 .../sundtek/source/bin/device-attached.sh     |  25 --------
 15 files changed, 43 insertions(+), 81 deletions(-)
 rename packages/addons/driver/{sundtek => sundtek-mediatv}/addon (100%)
 rename packages/addons/driver/{sundtek => sundtek-mediatv}/changelog.txt (89%)
 rename packages/addons/driver/{sundtek => sundtek-mediatv}/config/sundtek.conf (78%)
 rename packages/addons/driver/{sundtek => sundtek-mediatv}/config/sundtek.conf.full (100%)
 rename packages/addons/driver/{sundtek => sundtek-mediatv}/icon/icon.png (100%)
 rename packages/addons/driver/{sundtek => sundtek-mediatv}/meta (97%)
 rename packages/addons/driver/{sundtek => sundtek-mediatv}/settings-default.xml (100%)
 rename packages/addons/driver/{sundtek => sundtek-mediatv}/source/bin/sundtek.start (95%)
 rename packages/addons/driver/{sundtek => sundtek-mediatv}/source/bin/sundtek.stop (95%)
 rename packages/addons/driver/{sundtek => sundtek-mediatv}/source/bin/userspace-driver.sh (86%)
 rename packages/addons/driver/{sundtek => sundtek-mediatv}/source/default.py (100%)
 rename packages/addons/driver/{sundtek => sundtek-mediatv}/source/resources/language/English/strings.xml (100%)
 rename packages/addons/driver/{sundtek => sundtek-mediatv}/source/resources/settings.xml (72%)
 rename packages/addons/driver/{sundtek/source/sleep.d/sundtek.power => sundtek-mediatv/source/sleep.d/sundtek-mediatv.power} (91%)
 delete mode 100644 packages/addons/driver/sundtek/source/bin/device-attached.sh

diff --git a/packages/addons/driver/sundtek/addon b/packages/addons/driver/sundtek-mediatv/addon
similarity index 100%
rename from packages/addons/driver/sundtek/addon
rename to packages/addons/driver/sundtek-mediatv/addon
diff --git a/packages/addons/driver/sundtek/changelog.txt b/packages/addons/driver/sundtek-mediatv/changelog.txt
similarity index 89%
rename from packages/addons/driver/sundtek/changelog.txt
rename to packages/addons/driver/sundtek-mediatv/changelog.txt
index be4e096e2a..f3f1d1e893 100644
--- a/packages/addons/driver/sundtek/changelog.txt
+++ b/packages/addons/driver/sundtek-mediatv/changelog.txt
@@ -1,14 +1,9 @@
-3.0.3
-  new addon settings:
+3.0.1
+  added addon settings
     enable HW PID filter (enabled for RPi by default)
     enable IR receiver
     allow sharing local tuner over network
     use network tuners
-3.0.2
-  special version
-3.0.1
-  addon renamed to just sundtek
-  added addon settings
   sundtek's binaries are downloaded on first run
   automatically download new version of the binaries if available
   added preload library to .profile (to run mediaclient, w_scan, ... from console)
diff --git a/packages/addons/driver/sundtek/config/sundtek.conf b/packages/addons/driver/sundtek-mediatv/config/sundtek.conf
similarity index 78%
rename from packages/addons/driver/sundtek/config/sundtek.conf
rename to packages/addons/driver/sundtek-mediatv/config/sundtek.conf
index 15a81288a6..5f9d4acadb 100644
--- a/packages/addons/driver/sundtek/config/sundtek.conf
+++ b/packages/addons/driver/sundtek-mediatv/config/sundtek.conf
@@ -1,9 +1,6 @@
 #
 # sundtek.conf
 #
-# Call attach/detach script when new device appears/disappears
-# Do not change this line (OpenElec addon require this) !
-device_attach=/storage/.xbmc/addons/driver.dvb.sundtek/bin/device-attached.sh
 
 # enable HW PID filter (default on for RPi)
 use_hwpidfilter=off
diff --git a/packages/addons/driver/sundtek/config/sundtek.conf.full b/packages/addons/driver/sundtek-mediatv/config/sundtek.conf.full
similarity index 100%
rename from packages/addons/driver/sundtek/config/sundtek.conf.full
rename to packages/addons/driver/sundtek-mediatv/config/sundtek.conf.full
diff --git a/packages/addons/driver/sundtek/icon/icon.png b/packages/addons/driver/sundtek-mediatv/icon/icon.png
similarity index 100%
rename from packages/addons/driver/sundtek/icon/icon.png
rename to packages/addons/driver/sundtek-mediatv/icon/icon.png
diff --git a/packages/addons/driver/sundtek/meta b/packages/addons/driver/sundtek-mediatv/meta
similarity index 97%
rename from packages/addons/driver/sundtek/meta
rename to packages/addons/driver/sundtek-mediatv/meta
index afeb13dab2..725a629276 100644
--- a/packages/addons/driver/sundtek/meta
+++ b/packages/addons/driver/sundtek-mediatv/meta
@@ -18,9 +18,9 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="sundtek"
+PKG_NAME="sundtek-mediatv"
 PKG_VERSION="3.0"
-PKG_REV="3"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
diff --git a/packages/addons/driver/sundtek/settings-default.xml b/packages/addons/driver/sundtek-mediatv/settings-default.xml
similarity index 100%
rename from packages/addons/driver/sundtek/settings-default.xml
rename to packages/addons/driver/sundtek-mediatv/settings-default.xml
diff --git a/packages/addons/driver/sundtek/source/bin/sundtek.start b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek.start
similarity index 95%
rename from packages/addons/driver/sundtek/source/bin/sundtek.start
rename to packages/addons/driver/sundtek-mediatv/source/bin/sundtek.start
index eed33185de..232caa545d 100644
--- a/packages/addons/driver/sundtek/source/bin/sundtek.start
+++ b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek.start
@@ -22,7 +22,7 @@
 
 . /etc/profile
 
-ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek"
+ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv"
 
 logger -t Sundtek "### Sundtek manual start ###"
 . $ADDON_DIR/bin/userspace-driver.sh
diff --git a/packages/addons/driver/sundtek/source/bin/sundtek.stop b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek.stop
similarity index 95%
rename from packages/addons/driver/sundtek/source/bin/sundtek.stop
rename to packages/addons/driver/sundtek-mediatv/source/bin/sundtek.stop
index be22e253f3..dff6338175 100644
--- a/packages/addons/driver/sundtek/source/bin/sundtek.stop
+++ b/packages/addons/driver/sundtek-mediatv/source/bin/sundtek.stop
@@ -22,7 +22,7 @@
 
 . /etc/profile
 
-ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek"
+ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv"
 
 export LD_PRELOAD=$ADDON_DIR/lib/libmediaclient.so
 
diff --git a/packages/addons/driver/sundtek/source/bin/userspace-driver.sh b/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh
similarity index 86%
rename from packages/addons/driver/sundtek/source/bin/userspace-driver.sh
rename to packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh
index 40b93317f9..3b50b046a5 100644
--- a/packages/addons/driver/sundtek/source/bin/userspace-driver.sh
+++ b/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh
@@ -32,10 +32,9 @@ net_tuner_num_fix() {
   echo $num
 }
 
-ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek"
-ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek"
+ADDON_DIR="$HOME/.xbmc/addons/driver.dvb.sundtek-mediatv"
+ADDON_HOME="$HOME/.xbmc/userdata/addon_data/driver.dvb.sundtek-mediatv"
 ADDON_SETTINGS="$ADDON_HOME/settings.xml"
-SUNDTEK_READY="/var/run/sundtek.ready"
 
 mkdir -p $ADDON_HOME
 
@@ -45,9 +44,11 @@ else
   # in case of missing entries in addon home's sundtek.conf
   entry_set="$(grep use_hwpidfilter $ADDON_HOME/sundtek.conf 2>/dev/null)"
   if [ -z "$entry_set" ]; then
-    sed -i 's|\(^device_attach=.*\)|\1\n# enable listening on network\nenablenetwork=off|g' $ADDON_HOME/sundtek.conf
-    sed -i 's|\(^device_attach=.*\)|\1\n\n# enable HW PID filter\nuse_hwpidfilter=off\n|g' $ADDON_HOME/sundtek.conf
+    sed -i 's|^device_attach=.*|# device_attach not used anymore\n\n# enable HW PID filter\nuse_hwpidfilter=off\n\n# enable listening on network\nenablenetwork=off|g' $ADDON_HOME/sundtek.conf
     sed -i 's|^#first_adapter=.*|first_adapter=0|g' $ADDON_HOME/sundtek.conf
+    
+    sed -i 's|.*network tuner IP address (OpenELEC specific).*||g' $ADDON_HOME/sundtek.conf
+    sed -i 's|.*network_tuner_ip=.*||g' $ADDON_HOME/sundtek.conf
   fi
 fi
 
@@ -74,6 +75,10 @@ if [ "$AUTO_UPDATE" = "true" -a -f $ADDON_DIR/bin/mediasrv ]; then
 fi
 
 if [ ! -f $ADDON_DIR/bin/mediasrv ]; then
+  # remove renamed addon if exist
+  rm -fr "$HOME/.xbmc/addons/driver.dvb.sundtek"
+  rm -fr "$HOME/userdata/addon_data/driver.dvb.sundtek"
+
   logger -t Sundtek "### Downloading installer ###"
   cd $ADDON_DIR
   mkdir -p bin lib tmp
@@ -90,7 +95,7 @@ if [ ! -f $ADDON_DIR/bin/mediasrv ]; then
     # enable HW PID filter on RPi by default
     sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $ADDON_DIR/config/sundtek.conf
     sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $ADDON_HOME/sundtek.conf
-    sed -i 's|.*id="ENABLE_HW_PID_FILTER" value=.*|<setting id="ENABLE_HW_PID_FILTER" value="true" />|' $ADDON_SETTINGS
+    sed -i 's|.*id="ENABLE_HW_PID_FILTER".*|<setting id="ENABLE_HW_PID_FILTER" value="true" />|' $ADDON_SETTINGS
   else
     logger -t Sundtek "### Unsupported architecture ###"
     cd ..
@@ -124,15 +129,18 @@ if [ ! -f $ADDON_HOME/driver-version.txt ]; then
   cp $ADDON_DIR/driver-version.txt $ADDON_HOME/
 fi
 
-# enable to install same addon version again
-rm -f /storage/.xbmc/addons/packages/driver.dvb.sundtek-*
+# enable to install same addon package version again
+rm -f /storage/.xbmc/addons/packages/driver.dvb.sundtek*
 
 # add alias for /opt/bin/mediaclient
 alias_set="$(grep libmediaclient.so /storage/.profile 2>/dev/null)"
 if [ -z "$alias_set" ]; then
   echo "" >>/storage/.profile
-  echo "[ -f /storage/.xbmc/addons/driver.dvb.sundtek/lib/libmediaclient.so ] && export LD_PRELOAD=/storage/.xbmc/addons/driver.dvb.sundtek/lib/libmediaclient.so" >>/storage/.profile
+  echo "[ -f /storage/.xbmc/addons/driver.dvb.sundtek-mediatv/lib/libmediaclient.so ] && export LD_PRELOAD=/storage/.xbmc/addons/driver.dvb.sundtek-mediatv/lib/libmediaclient.so" >>/storage/.profile
   echo "" >>/storage/.profile
+else
+  # fix name
+  sed -i 's|/driver.dvb.sundtek/|/driver.dvb.sundtek-mediatv/|g' /storage/.profile
 fi
 
 export LD_PRELOAD=$ADDON_DIR/lib/libmediaclient.so
@@ -160,7 +168,6 @@ fi
 if [ -z "$(pidof mediasrv)" ]; then
   rm -f /var/log/mediasrv.log
   rm -f /var/log/mediaclient.log
-  rm -f $SUNDTEK_READY
 
   SUNDTEK_CONF_TMP=/tmp/sundtek.conf
   cp $ADDON_HOME/sundtek.conf $SUNDTEK_CONF_TMP
@@ -247,29 +254,15 @@ if [ -z "$(pidof mediasrv)" ]; then
     cp $SUNDTEK_CONF_TMP $ADDON_HOME/sundtek.conf
   fi
 
-  #rm "$SUNDTEK_CONF_TMP"
-
   mediasrv --wait-for-devices -p $ADDON_DIR/bin -c $ADDON_HOME/sundtek.conf -d
 
-  # wait for device to get attached or connected
-  for i in $(seq 1 240); do
-    if [ -f $SUNDTEK_READY ]; then
-      rm -f $SUNDTEK_READY
-      logger -t Sundtek "### Sundtek ready ###"
-
-      if [ -n $SETTLE_TIME -a $SETTLE_TIME -gt 0 ]; then
-        logger -t Sundtek "### Settle for $SETTLE_TIME sec ###"
-        sleep $SETTLE_TIME
-      fi
-
-      break
-    elif [ "$i" = "240" ]; then
-      logger -t Sundtek "### No Sundtek device attached or connected ###"
-      return
-    else
-      usleep 500000
-    fi
-  done
+  # wait few seconds
+  [ -z "$SETTLE_TIME" ] && SETTLE_TIME=0
+  SETTLE_TIME=$(( $SETTLE_TIME *1 ))
+  if [ $SETTLE_TIME -gt 0 ]; then
+    logger -t Sundtek "### Settle for $SETTLE_TIME sec ###"
+    sleep $SETTLE_TIME
+  fi
 
   if [ "$ANALOG_TV" = "true" ]; then
     logger -t Sundtek "### Switching to analog TV mode ###"
@@ -292,3 +285,5 @@ if [ -z "$(pidof mediasrv)" ]; then
   fi
 )&
 fi
+
+logger -t Sundtek "### Sundtek ready ###"
diff --git a/packages/addons/driver/sundtek/source/default.py b/packages/addons/driver/sundtek-mediatv/source/default.py
similarity index 100%
rename from packages/addons/driver/sundtek/source/default.py
rename to packages/addons/driver/sundtek-mediatv/source/default.py
diff --git a/packages/addons/driver/sundtek/source/resources/language/English/strings.xml b/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml
similarity index 100%
rename from packages/addons/driver/sundtek/source/resources/language/English/strings.xml
rename to packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml
diff --git a/packages/addons/driver/sundtek/source/resources/settings.xml b/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml
similarity index 72%
rename from packages/addons/driver/sundtek/source/resources/settings.xml
rename to packages/addons/driver/sundtek-mediatv/source/resources/settings.xml
index cd2d13eedd..6b4940cfdc 100644
--- a/packages/addons/driver/sundtek/source/resources/settings.xml
+++ b/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml
@@ -3,13 +3,13 @@
   <category label="1000" >
     <setting label="" type="lsep" />
     <setting type="sep" />
-    <setting id="AUTO_UPDATE" type="bool" label="1011" default="false" />
-    <setting id="ANALOG_TV" type="bool" label="1012" default="false" enable="false" />
-    <setting id="SETTLE_TIME" type="number" label="1014" default="0" />
-    <setting id="RUN_USER_SCRIPT" type="bool" label="1015" default="false" />
-    <setting id="ENABLE_HW_PID_FILTER" type="bool" label="1030" default="false" />
-    <setting id="ENABLE_IR_RECEIVER" type="bool" label="1035" default="false" />
-    <setting id="LOWEST_ADAPTER_NUM" type="number" label="1040" default="0" />
+    <setting id="AUTO_UPDATE"          type="bool"   label="1011" default="false" />
+    <setting id="ANALOG_TV"            type="bool"   label="1012" default="false" enable="false" />
+    <setting id="SETTLE_TIME"          type="number" label="1014" default="0" />
+    <setting id="RUN_USER_SCRIPT"      type="bool"   label="1015" default="false" />
+    <setting id="ENABLE_HW_PID_FILTER" type="bool"   label="1030" default="false" />
+    <setting id="ENABLE_IR_RECEIVER"   type="bool"   label="1035" default="false" />
+    <setting id="LOWEST_ADAPTER_NUM"   type="number" label="1040" default="0" />
   </category>
   <category label="2000" >
     <setting label="" type="lsep" />
diff --git a/packages/addons/driver/sundtek/source/sleep.d/sundtek.power b/packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power
similarity index 91%
rename from packages/addons/driver/sundtek/source/sleep.d/sundtek.power
rename to packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power
index b81f5ea9cc..967e1dee91 100644
--- a/packages/addons/driver/sundtek/source/sleep.d/sundtek.power
+++ b/packages/addons/driver/sundtek-mediatv/source/sleep.d/sundtek-mediatv.power
@@ -23,22 +23,22 @@
 . /etc/profile
 
 LOCKDIR="/var/lock/"
-LOCKFILE="sundtek"
+LOCKFILE="$LOCKDIR/sundtek-mediatv"
 
 case "$1" in
   hibernate|suspend)
     if [ -n "$(pidof mediasrv)" ]; then
       progress "Shutting down Sundtek DVB driver for suspending..."
       mkdir -p "$LOCKDIR"
-      touch "$LOCKDIR/$LOCKFILE"
+      touch "$LOCKFILE"
       mediaclient --shutdown
     fi
     ;;
 
   thaw|resume)
-    if [ -f "$LOCKDIR/$LOCKFILE" ]; then
+    if [ -f "$LOCKFILE" ]; then
       # driver started within Tvheadend/VDR
-      rm -rf "$LOCKDIR/$LOCKFILE"
+      rm -f "$LOCKFILE"
     fi
     ;;
 
diff --git a/packages/addons/driver/sundtek/source/bin/device-attached.sh b/packages/addons/driver/sundtek/source/bin/device-attached.sh
deleted file mode 100644
index 9b62feb274..0000000000
--- a/packages/addons/driver/sundtek/source/bin/device-attached.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-SUNDTEK_READY="/var/run/sundtek.ready"
-
-touch $SUNDTEK_READY

From bfa75c711f168844aabb6e438f5e80f7b0a3fc6a Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 21 Feb 2013 21:15:56 +0200
Subject: [PATCH 3/5] sundtek-mediatv: bump

---
 packages/addons/driver/sundtek-mediatv/meta | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/addons/driver/sundtek-mediatv/meta b/packages/addons/driver/sundtek-mediatv/meta
index 725a629276..163e8d3de9 100644
--- a/packages/addons/driver/sundtek-mediatv/meta
+++ b/packages/addons/driver/sundtek-mediatv/meta
@@ -20,7 +20,7 @@
 
 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="3.0"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"

From 1965e3511c2c53150feb68189cf66b517af53b7d Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 21 Feb 2013 21:17:46 +0200
Subject: [PATCH 4/5] sundtek-mediatv: ups, also update changelog

---
 packages/addons/driver/sundtek-mediatv/changelog.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/addons/driver/sundtek-mediatv/changelog.txt b/packages/addons/driver/sundtek-mediatv/changelog.txt
index f3f1d1e893..000cb4f4e1 100644
--- a/packages/addons/driver/sundtek-mediatv/changelog.txt
+++ b/packages/addons/driver/sundtek-mediatv/changelog.txt
@@ -1,4 +1,4 @@
-3.0.1
+3.0.2
   added addon settings
     enable HW PID filter (enabled for RPi by default)
     enable IR receiver

From f7d7a8aad8e8538e0be0093dae80c31664615603 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 21 Feb 2013 21:32:10 +0200
Subject: [PATCH 5/5] tvheadend: update to tvheadend-3.3.485

---
 packages/addons/service/multimedia/tvheadend/changelog.txt | 3 +++
 packages/addons/service/multimedia/tvheadend/meta          | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/addons/service/multimedia/tvheadend/changelog.txt b/packages/addons/service/multimedia/tvheadend/changelog.txt
index f3b59c4772..151f64fad0 100644
--- a/packages/addons/service/multimedia/tvheadend/changelog.txt
+++ b/packages/addons/service/multimedia/tvheadend/changelog.txt
@@ -1,3 +1,6 @@
+3.0.5
+- update to TVHeadend 3.3.485
+
 3.0.4
 - update to TVHeadend 3.3.403
 
diff --git a/packages/addons/service/multimedia/tvheadend/meta b/packages/addons/service/multimedia/tvheadend/meta
index 75b6582070..81cb85629c 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.403"
-PKG_REV="4"
+PKG_VERSION="3.3.485"
+PKG_REV="5"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.lonelycoder.com/hts/tvheadend_overview.html"