diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon index 0c4d26f258..d29f6b09f7 100755 --- a/packages/addons/service/multimedia/vdr-addon/addon +++ b/packages/addons/service/multimedia/vdr-addon/addon @@ -37,7 +37,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config cp -PR $BUILD/vdr-live-*/live/* $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/live cp $PKG_DIR/config.plugins/remote.conf $ADDON_BUILD/$PKG_ADDON_ID/config mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgsearch - cp $PKG_DIR/config.plugins/commands.conf $ADDON_BUILD/$PKG_ADDON_ID/config mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins cp $BUILD/rotorng-[0-9]*/examples/rotorng.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins @@ -62,8 +61,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-control-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-epgsearch*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-plugin-xmltv2vdr*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $BUILD/vdr-xineliboutput-[0-9]*/libvdr*.so.1.7.27 $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $BUILD/vdr-text2skin-[0-9]*/libvdr*.so.1.7.27 $ADDON_BUILD/$PKG_ADDON_ID/plugin # ENABLED_PLUGINS="cardclient constcw sc-conax sc-cryptoworks sc-irdeto sc-nagra sc-seca sc-viaccess sc-videoguard2" # for plugin in $ENABLED_PLUGINS; do @@ -89,18 +86,5 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib cp -P $BUILD/libxslt-[0-9]*/libxslt/.libs/libxslt*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib cp -P $BUILD/libxslt-[0-9]*/libexslt/.libs/libexslt*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/imlib2/loaders/ -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib/imlib2/filters/ - cp $SYSROOT_PREFIX/usr/lib/libImlib2.so.1 $ADDON_BUILD/$PKG_ADDON_ID/lib/ - cp $SYSROOT_PREFIX/usr/lib/imlib2/loaders/*.so $ADDON_BUILD/$PKG_ADDON_ID/lib/imlib2/loaders/ - cp $SYSROOT_PREFIX/usr/lib/imlib2/filters/*.so $ADDON_BUILD/$PKG_ADDON_ID/lib/imlib2/filters/ - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server cp -PR $BUILD/vdr-plugin-streamdev-*/streamdev-server/streamdevhosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/streamdev-server - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/text2skin/anthra_1280_OS/ - cp -PR $BUILD/vdr-skinanthra_1280_OS-*/* $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/text2skin/anthra_1280_OS/ - rm -fr $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/text2skin/anthra_1280_OS/themes - -mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/themes - cp -P $BUILD/vdr-skinanthra_1280_OS-*/themes/* $ADDON_BUILD/$PKG_ADDON_ID/config/themes/ diff --git a/packages/addons/service/multimedia/vdr-addon/config.plugins/commands.conf b/packages/addons/service/multimedia/vdr-addon/config.plugins/commands.conf deleted file mode 100644 index 1ad67aeae5..0000000000 --- a/packages/addons/service/multimedia/vdr-addon/config.plugins/commands.conf +++ /dev/null @@ -1,3 +0,0 @@ -Exit -> XBMC : killall -9 vdr-sxfe -Reboot : reboot -PowerOff : poweroff -f diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml index 868e2dce1f..f88770f309 100644 --- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml @@ -18,7 +18,4 @@ - - - diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta index aeb334f985..368c9637ce 100644 --- a/packages/addons/service/multimedia/vdr-addon/meta +++ b/packages/addons/service/multimedia/vdr-addon/meta @@ -27,7 +27,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://www.openelec.tv" PKG_URL="" PKG_DEPENDS="" -PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr vdr-xineliboutput vdr-text2skin vdr-skinanthra_1280_OS" +PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-plugin-vnsiserver vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-plugin-xmltv2vdr" PKG_PRIORITY="optional" PKG_SECTION="service.multimedia" PKG_SHORTDESC="vdr: A powerful DVB TV application" diff --git a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start index b91d677310..13ab9acfb2 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -83,12 +83,6 @@ fi if [ "$ENABLE_XMLTV2VDR" == "true" ] ; then VDR_ARG="$VDR_ARG -P xmltv2vdr" fi -if [ "$ENABLE_XINELIBOUTPUT" == "true" ] ; then - VDR_ARG="$VDR_ARG -P 'xineliboutput --local=none --remote=$XINELIBOUTPUT_PORT' -s $ADDON_HOME/vdr-shutdown.sh" -fi -if [ "$ENABLE_TEXT2SKIN" == "true" ] ; then - VDR_ARG="$VDR_ARG -P text2skin" -fi # dynamite must be LAST loaded plugin if [ "$ENABLE_DYNAMITE" == "true" ] ; then VDR_ARG="$VDR_ARG -P dynamite" @@ -110,21 +104,9 @@ fi if [ -f "$ADDON_CONFIG_DIR/setup.conf" ]; then sed -i -e '/^$/d' $ADDON_CONFIG_DIR/setup.conf - sed -i -e '/^OSDHeight.*$/d' $ADDON_CONFIG_DIR/setup.conf - sed -i -e '/^OSDSkin.*$/d' $ADDON_CONFIG_DIR/setup.conf - sed -i -e '/^OSDTheme.*$/d' $ADDON_CONFIG_DIR/setup.conf - sed -i -e '/^xineliboutput.OSD.Blending.*$/d' $ADDON_CONFIG_DIR/setup.conf - sed -i -e '/^xineliboutput.OSD.Size.*$/d' $ADDON_CONFIG_DIR/setup.conf - sed -i -e '/^xineliboutput.OSD.SoftOSD.*$/d' $ADDON_CONFIG_DIR/setup.conf sed -i -e '/^epgsearch.SVDRPPort.*$/d' $ADDON_CONFIG_DIR/setup.conf fi cat >>$ADDON_CONFIG_DIR/setup.conf << MYDATA -OSDHeight = 1080 -OSDSkin = anthra_1280_OS -OSDTheme = yabluelight -xineliboutput.OSD.Blending = 1 -xineliboutput.OSD.Size = 1280x720 -xineliboutput.OSD.SoftOSD = 1 epgsearch.SVDRPPort = 2004 MYDATA diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml index ff5dbacfbe..afbdee613c 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml @@ -25,9 +25,6 @@ Enable plugin: xmltv2vdr Enable epgdata.com epgdata.com PIN - Enable plugin: xineliboutput - xineliboutput: listen on port - Enable plugin: text2skin VDR Configuration VDR Video Dir PVR plugin diff --git a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml index 0ff09ec8c6..1f82adda78 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -30,9 +30,6 @@ - - -