diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon
index cad23d4262..4ebf287c03 100755
--- a/packages/addons/service/multimedia/vdr-addon/addon
+++ b/packages/addons/service/multimedia/vdr-addon/addon
@@ -37,6 +37,7 @@ 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
@@ -60,6 +61,8 @@ 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-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
@@ -82,6 +85,18 @@ 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/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
index 7925ccdc3c..72497ba183 100644
--- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml
@@ -15,4 +15,7 @@
+
+
+
diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta
old mode 100755
new mode 100644
index 524fe4d491..0f8652d396
--- 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-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-xmltv2vdr"
+PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-iptv vdr-wirbelscan vdr-wirbelscancontrol vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch vdr-xmltv2vdr vdr-xineliboutput vdr-text2skin vdr-skinanthra_1280_OS"
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 fad4596ea6..90d8a0c0fd 100755
--- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start
@@ -35,6 +35,7 @@ ADDON_PLUGIN_DIR="$ADDON_DIR/plugin"
ADDON_VIDEO_DIR="$HOME/videos"
if [ ! -f "$ADDON_SETTINGS" ]; then
+ mkdir -p $ADDON_HOME
cp $ADDON_DIR/settings-default.xml $ADDON_SETTINGS
fi
@@ -81,6 +82,12 @@ 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"
@@ -94,6 +101,20 @@ fi
mkdir -p $ADDON_CONFIG_DIR/plugins/live
cp -PR plugins/live/* $ADDON_CONFIG_DIR/plugins/live
+ # copy vdr theme
+ if [ ! -d "$ADDON_CONFIG_DIR/plugins/text2skin/" ]; then
+ mkdir -p $ADDON_CONFIG_DIR/plugins/text2skin/
+ cp -a plugins/text2skin $ADDON_CONFIG_DIR/plugins/
+ cp -a themes $ADDON_CONFIG_DIR/
+
+ # is this in conflict with something else?
+ cat >$ADDON_CONFIG_DIR/setup.conf << MYDATA
+OSDSkin = anthra_1280_OS
+OSDTheme = yabluelight
+xineliboutput.OSD.Blending = 1
+MYDATA
+ fi
+
for dir in `find . -type d`; do
mkdir -p $ADDON_CONFIG_DIR/$dir
done
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 2e3a3aaa93..efb0616f89 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
@@ -10,17 +10,20 @@
Enable plugin: streamdev-client
Enable plugin: streamdev-server
Enable plugin: wirbelscan
+ Enable plugin: dynamite
+ Enable softcam
+ softcam plugin
Enable plugin: live
live: listen on ip
live: listen on port
+ Enable plugin: rotorng
Enable plugin: control
control: listen on port
- Enable plugin: rotorng
Enable plugin: epgsearch
Enable plugin: xmltv2vdr
- Enable plugin: dynamite
Enable epgdata.com
epgdata.com PIN
- Enable softcam
- softcam plugin
+ Enable plugin: xineliboutput
+ xineliboutput: listen on port
+ Enable plugin: text2skin
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 154dc2664d..14676dd6a6 100644
--- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
+++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml
@@ -23,6 +23,9 @@
+
+
+