diff --git a/packages/addons/driver/sundtek-mediatv/changelog.txt b/packages/addons/driver/sundtek-mediatv/changelog.txt index b84a437bac..dbbe145f4e 100644 --- a/packages/addons/driver/sundtek-mediatv/changelog.txt +++ b/packages/addons/driver/sundtek-mediatv/changelog.txt @@ -1,3 +1,5 @@ +4.1.5 + dont touch /storage/.profile 4.1.4 enable hw pid filter by default 4.1.3 diff --git a/packages/addons/driver/sundtek-mediatv/package.mk b/packages/addons/driver/sundtek-mediatv/package.mk index d868b0ad28..40a00273c8 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="4" +PKG_REV="5" PKG_ARCH="any" PKG_LICENSE="nonfree" PKG_SITE="http://support.sundtek.com/" @@ -49,6 +49,8 @@ make_target() { esac wget -O installer.tar.gz $INSTALLER_URL tar -xzf installer.tar.gz + # we run this via wrapper + mv opt/bin/mediaclient opt/bin/mediaclient.bin chmod 755 opt/bin/* } diff --git a/packages/addons/driver/sundtek-mediatv/source/bin/mediaclient b/packages/addons/driver/sundtek-mediatv/source/bin/mediaclient new file mode 100755 index 0000000000..b0909a88e5 --- /dev/null +++ b/packages/addons/driver/sundtek-mediatv/source/bin/mediaclient @@ -0,0 +1,2 @@ +#!/bin/sh +LD_PRELOAD=/storage/.xbmc/addons/driver.dvb.sundtek-mediatv/lib/libmediaclient.so exec mediaclient.bin "$@" 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 f6fcc481e2..87155c51eb 100644 --- a/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh +++ b/packages/addons/driver/sundtek-mediatv/source/bin/userspace-driver.sh @@ -73,17 +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 -# 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-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=$SUNDTEK_ADDON_DIR/lib/libmediaclient.so if [ -z "$(pidof mediasrv)" ]; then @@ -240,7 +229,7 @@ if [ -z "$(pidof mediasrv)" ]; then # save adapter serial number in background sleep 5 serial_number_old=$(cat $SUNDTEK_ADDON_HOME/adapters.txt 2>/dev/null) - serial_number_new=$(mediaclient -e | awk '/device / {print $0} /ID:/ {print $2}') + serial_number_new=$(mediaclient.bin -e | awk '/device / {print $0} /ID:/ {print $2}') if [ "$serial_number_old" != "$serial_number_new" ]; then echo "$serial_number_new" >$SUNDTEK_ADDON_HOME/adapters.txt fi diff --git a/packages/addons/driver/sundtek-mediatv/source/default.py b/packages/addons/driver/sundtek-mediatv/source/default.py index 644ab1f45a..8e179664b7 100644 --- a/packages/addons/driver/sundtek-mediatv/source/default.py +++ b/packages/addons/driver/sundtek-mediatv/source/default.py @@ -25,7 +25,7 @@ __cwd__ = __settings__.getAddonInfo('path') __resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib')) __settings_xml__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml')) -__mediaclient__ = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'mediaclient')) +__mediaclient__ = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'mediaclient.bin')) __ld_preload__ = xbmc.translatePath(os.path.join(__cwd__, 'lib', 'libmediaclient.so')) __mediaclient_e__ = 'LD_PRELOAD=' + __ld_preload__ + ' ' + __mediaclient__ + ' -e'