From dfa68cc73b448ba7e55bbc4a739443d69a9a81d4 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 3 Feb 2014 23:34:25 +0200 Subject: [PATCH] sundtek-mediatv: include driver bin/libs --- .../driver/sundtek-mediatv/changelog.txt | 2 + .../addons/driver/sundtek-mediatv/package.mk | 22 +++++- .../sundtek-mediatv/settings-default.xml | 1 - .../source/bin/userspace-driver.sh | 73 ------------------- .../resources/language/English/strings.xml | 1 - .../source/resources/settings.xml | 1 - 6 files changed, 22 insertions(+), 78 deletions(-) diff --git a/packages/addons/driver/sundtek-mediatv/changelog.txt b/packages/addons/driver/sundtek-mediatv/changelog.txt index 27962b88e6..9c38405ba9 100644 --- a/packages/addons/driver/sundtek-mediatv/changelog.txt +++ b/packages/addons/driver/sundtek-mediatv/changelog.txt @@ -1,3 +1,5 @@ +4.1.3 + include driver bin/libs 4.1.2 clean up. sorry. no analog tv anymore. 4.1.1 diff --git a/packages/addons/driver/sundtek-mediatv/package.mk b/packages/addons/driver/sundtek-mediatv/package.mk index 6b4c7c44aa..ce168f6c72 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="2" +PKG_REV="3" PKG_ARCH="any" PKG_LICENSE="nonfree" PKG_SITE="http://support.sundtek.com/" @@ -33,7 +33,23 @@ PKG_ADDON_TYPE="xbmc.python.script" PKG_AUTORECONF="no" make_target() { - : # nothing to do here + mkdir -p $ROOT/$PKG_BUILD + cd $ROOT/$PKG_BUILD + + case $TARGET_ARCH in + i386) + INSTALLER_URL="http://sundtek.de/media/netinst/32bit/installer.tar.gz" + ;; + x86_64) + INSTALLER_URL="http://sundtek.de/media/netinst/64bit/installer.tar.gz" + ;; + arm) + INSTALLER_URL="http://sundtek.de/media/netinst/armsysvhf/installer.tar.gz" + ;; + esac + wget -O installer.tar.gz $INSTALLER_URL + tar -xzf installer.tar.gz + chmod 755 opt/bin/* } makeinstall_target() { @@ -44,4 +60,6 @@ addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/ cp -P $PKG_DIR/config/* $ADDON_BUILD/$PKG_ADDON_ID/config/ cp -P $PKG_DIR/settings-default.xml $ADDON_BUILD/$PKG_ADDON_ID/ + cp -Pa $PKG_BUILD/opt/bin $ADDON_BUILD/$PKG_ADDON_ID/ + cp -Pa $PKG_BUILD/opt/lib $ADDON_BUILD/$PKG_ADDON_ID/ } diff --git a/packages/addons/driver/sundtek-mediatv/settings-default.xml b/packages/addons/driver/sundtek-mediatv/settings-default.xml index 8b004875bd..326d7448ba 100644 --- a/packages/addons/driver/sundtek-mediatv/settings-default.xml +++ b/packages/addons/driver/sundtek-mediatv/settings-default.xml @@ -1,5 +1,4 @@ - 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 93fd88615c..f6fcc481e2 100644 --- a/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh +++ b/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh @@ -73,79 +73,6 @@ mkdir -p /var/config cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf . /var/config/sundtek-addon.conf -if [ "$AUTO_UPDATE" = "true" -a -f $SUNDTEK_ADDON_DIR/bin/mediasrv ]; then - logger -t Sundtek "### Checking for new Sundtek binary installer ###" - touch $SUNDTEK_ADDON_HOME/driver-version.txt - wget -O /tmp/sundtek-driver-version.txt http://sundtek.de/media/latest.phtml - md5_1=$(md5sum -b /tmp/sundtek-driver-version.txt | awk '{print $1}') - md5_2=$(md5sum -b $SUNDTEK_ADDON_HOME/driver-version.txt | awk '{print $1}') - if [ "$md5_1" != "$md5_2" ]; then - logger -t Sundtek "### Updating Sundtek binary installer ###" - rm -f $SUNDTEK_ADDON_DIR/bin/mediasrv - fi - - rm -f /tmp/sundtek-driver-version.txt -fi - -if [ ! -f $SUNDTEK_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 $SUNDTEK_ADDON_DIR - mkdir -p bin lib tmp - cd tmp/ - - ARCH=$(sed -n 's|.*\.\([^-]*\)-.*|\1|p' /etc/release | tr -d '\n') - if [ "$ARCH" = "x86_64" ]; then - INSTALLER_URL="http://sundtek.de/media/netinst/64bit/installer.tar.gz" - elif [ "$ARCH" = "i386" ]; 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' $SUNDTEK_ADDON_DIR/config/sundtek.conf - sed -i 's|^use_hwpidfilter=.*|use_hwpidfilter=on|g' $SUNDTEK_ADDON_HOME/sundtek.conf - sed -i 's|.*id="ENABLE_HW_PID_FILTER".*||' $SUNDTEK_ADDON_DIR/settings-default.xml - sed -i 's|.*id="ENABLE_HW_PID_FILTER".*||' $SUNDTEK_ADDON_SETTINGS - else - logger -t Sundtek "### Unsupported architecture ###" - cd .. - rm -fr tmp/ - exit 1 - fi - - wget -O installer.tar.gz $INSTALLER_URL - wget -O ../driver-version.txt http://sundtek.de/media/latest.phtml - logger -t Sundtek "### Extracting installer ###" - tar -xzf installer.tar.gz - if [ $? -ne 0 ]; then - logger -t Sundtek "### Installer damaged ###" - cd .. - rm -fr tmp/ - exit 2 - fi - - cp -Pa opt/bin/* ../bin/ - cp -Pa opt/lib/* ../lib/ - cp ../driver-version.txt $SUNDTEK_ADDON_HOME/ - cd .. - rm -fr tmp/ - logger -t Sundtek "### Installer finished ###" - - cat "$SUNDTEK_ADDON_SETTINGS" | awk -F\" '{print $2"=\""$4"\""}' | sed '/^=/d' > /var/config/sundtek-addon.conf - . /var/config/sundtek-addon.conf -fi - -if [ ! -f $SUNDTEK_ADDON_HOME/driver-version.txt ]; then - cp $SUNDTEK_ADDON_DIR/driver-version.txt $SUNDTEK_ADDON_HOME/ -fi - -# 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 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 5e4e3d17e8..05135ef130 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 @@ -1,7 +1,6 @@ General - Auto update binary driver Extra delay [sec] Run user script Enable hardware PID filter diff --git a/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml b/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml index 41024a7971..b7b81a94f1 100644 --- a/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml +++ b/packages/addons/driver/sundtek-mediatv/source/resources/settings.xml @@ -2,7 +2,6 @@ -