From beb864e11ac246377e6e774322b7a8d26f2c9847 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Mon, 3 Feb 2014 22:38:53 +0200
Subject: [PATCH] sundtek-mediatv: remove analogtv support

downloading stuff at runtime from dropbox is asking for a trouble
---
 .../driver/sundtek-mediatv/changelog.txt      |  2 ++
 .../addons/driver/sundtek-mediatv/package.mk  |  2 +-
 .../sundtek-mediatv/settings-default.xml      |  1 -
 .../source/bin/userspace-driver.sh            | 26 -------------------
 .../resources/language/English/strings.xml    |  1 -
 .../source/resources/settings.xml             |  1 -
 6 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/packages/addons/driver/sundtek-mediatv/changelog.txt b/packages/addons/driver/sundtek-mediatv/changelog.txt
index 0aeaeca911..27962b88e6 100644
--- a/packages/addons/driver/sundtek-mediatv/changelog.txt
+++ b/packages/addons/driver/sundtek-mediatv/changelog.txt
@@ -1,3 +1,5 @@
+4.1.2
+  clean up. sorry. no analog tv anymore.
 4.1.1
   clean up
 4.1.0
diff --git a/packages/addons/driver/sundtek-mediatv/package.mk b/packages/addons/driver/sundtek-mediatv/package.mk
index 39dad786a2..6b4c7c44aa 100644
--- a/packages/addons/driver/sundtek-mediatv/package.mk
+++ b/packages/addons/driver/sundtek-mediatv/package.mk
@@ -18,7 +18,7 @@
 
 PKG_NAME="sundtek-mediatv"
 PKG_VERSION="4.1"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://support.sundtek.com/"
diff --git a/packages/addons/driver/sundtek-mediatv/settings-default.xml b/packages/addons/driver/sundtek-mediatv/settings-default.xml
index 7a2ddc571a..8b004875bd 100644
--- a/packages/addons/driver/sundtek-mediatv/settings-default.xml
+++ b/packages/addons/driver/sundtek-mediatv/settings-default.xml
@@ -1,6 +1,5 @@
 <settings>
   <setting id="AUTO_UPDATE" value="false" />
-  <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" />
diff --git a/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh b/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh
index 1f179da764..93fd88615c 100644
--- a/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh
+++ b/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh
@@ -159,26 +159,6 @@ fi
 
 export LD_PRELOAD=$SUNDTEK_ADDON_DIR/lib/libmediaclient.so
 
-if [ "$ANALOG_TV" = "true" -a ! -f "$SUNDTEK_ADDON_DIR/bin/plugins/lib/libavcodec.so.54.12.100" ]; then
-  logger -t Sundtek "### Downloading missing ffmpeg libraries ###"
-  cd $SUNDTEK_ADDON_DIR/bin
-  mkdir -p plugins/
-  cd plugins/
-
-  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
-
-  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
@@ -324,12 +304,6 @@ if [ -z "$(pidof mediasrv)" ]; then
     sleep $SETTLE_TIME
   fi
 
-  if [ "$ANALOG_TV" = "true" ]; then
-    logger -t Sundtek "### Switching to analog TV mode ###"
-    #rm -fr /dev/dvb/
-    mediaclient --disable-dvb=/dev/dvb/adapter0
-  fi
-
   if [ "$RUN_USER_SCRIPT" = "true" -a -f "$SUNDTEK_ADDON_HOME/userscript.sh" ]; then
     logger -t Sundtek "### Running user script $SUNDTEK_ADDON_HOME/userscript.sh ###"
     cat $SUNDTEK_ADDON_HOME/userscript.sh | dos2unix >/var/run/sundtek-userscript.sh
diff --git a/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml b/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml
index 79530eae49..5e4e3d17e8 100644
--- a/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml
+++ b/packages/addons/driver/sundtek-mediatv/source/resources/language/English/strings.xml
@@ -2,7 +2,6 @@
 <strings>
   <string id="1000">General</string>
   <string id="1011">Auto update binary driver</string>
-  <string id="1012">Enable analog TV</string>
   <string id="1014">Extra delay [sec]</string>
   <string id="1015">Run user script</string>
   <string id="1030">Enable hardware PID filter</string>
diff --git a/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml b/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml
index 919b142f08..41024a7971 100644
--- a/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml
+++ b/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml
@@ -3,7 +3,6 @@
   <category label="1000" >
     <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" />