diff --git a/packages/3rdparty/multimedia/vdr/build b/packages/3rdparty/multimedia/vdr/build index 81fef1e4ca..752ead02d0 100755 --- a/packages/3rdparty/multimedia/vdr/build +++ b/packages/3rdparty/multimedia/vdr/build @@ -41,5 +41,3 @@ EOF make vdr make include-dir -make plugins -make install-plugins DESTDIR=$ROOT/$PKG_BUILD/.install diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon index 7b006f3daa..eb4fbcc89e 100755 --- a/packages/addons/service/multimedia/vdr-addon/addon +++ b/packages/addons/service/multimedia/vdr-addon/addon @@ -46,8 +46,6 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/ cp $BUILD/vdr-plugin-xmltv2vdr*/dist/epgdata2xmltv/epgdata2xmltv.dist $ADDON_BUILD/$PKG_ADDON_ID/config/epgsources/epgdata2xmltv mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $BUILD/vdr-[0-9]*/.install/usr/lib/vdr/libvdr-dvbhddevice.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin - cp -PR $BUILD/vdr-[0-9]*/.install/usr/lib/vdr/libvdr-dvbsddevice.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-plugin-xvdr-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-plugin-vnsiserver-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-iptv-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin @@ -64,11 +62,6 @@ mkdir -p $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 -# ENABLED_PLUGINS="cardclient constcw sc-conax sc-cryptoworks sc-irdeto sc-nagra sc-seca sc-viaccess sc-videoguard2" -# for plugin in $ENABLED_PLUGINS; do -# cp -PR $BUILD/vdr-sc-*/systems/$plugin/libsc*.so* $ADDON_BUILD/$PKG_ADDON_ID/plugin -# done - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr cp -PR $BUILD/vdr-plugin-xvdr-*/xvdr/allowed_hosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr cp -PR $BUILD/vdr-plugin-xvdr-*/xvdr/xvdr.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/xvdr diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml index 8b2ae20244..0638f63c8c 100644 --- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml @@ -18,6 +18,4 @@ - - 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 87e40729da..f42af44147 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -109,10 +109,6 @@ VDR_ARG="$VDR_ARG --cachedir=$ADDON_CACHE_DIR" VDR_ARG="$VDR_ARG --lib=$ADDON_PLUGIN_DIR" VDR_ARG="$VDR_ARG --video=\"$VDR_VIDEO_DIR\"" -if [ "$ENABLE_DVB_PLUGIN" == "true" ] ; then - VDR_ARG="$VDR_ARG -P $DVB_PLUGIN" -fi - VDR_ARG="$VDR_ARG -P $PVR_PLUGIN" if [ "$ENABLE_SOFTCAM" == "true" ] ; then 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 36020ce737..4102f16afb 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -31,8 +31,5 @@ - - -