vdr-addon: add vdr-live plugin

packages/addons/service/multimedia/vdr-addon/addon

@@ -33,6 +33,8 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $BUILD/vdr-[0-9]*/sources.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   cp $BUILD/vdr-[0-9]*/svdrphosts.conf $ADDON_BUILD/$PKG_ADDON_ID/config
   echo '0.0.0.0/0' >> $ADDON_BUILD/$PKG_ADDON_ID/config/svdrphosts.conf
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/live
+  cp -PR $BUILD/vdr-live-*/live/* $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/live
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-plugin-xvdr-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
@@ -44,6 +46,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-sc-*/systems/*/libsc*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-plugin-streamdev-*/server/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
   cp -PR $BUILD/vdr-plugin-streamdev-*/client/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+  cp -PR $BUILD/vdr-live-*/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
@@ -59,6 +62,8 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -P $BUILD/attr-[0-9]*/libattr/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
   cp -P $BUILD/libcap-[0-9]*/libcap/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -P $BUILD/cxxtools-[0-9]*/.build-target/src/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -P $BUILD/tntnet-[0-9]*/.build-target/framework/common/.libs/*.so* $ADDON_BUILD/$PKG_ADDON_ID/lib
 
 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

packages/addons/service/multimedia/vdr-addon/changelog.txt

@@ -1,3 +1,6 @@
+2.1.4
+- added live plugin
+
 2.1.3
 - adjust for fontconfig 2.9.0
 - update patchset 

packages/addons/service/multimedia/vdr-addon/config/settings.xml

@@ -7,5 +7,8 @@
     <setting id="ENABLE_STREAMDEV_CLIENT" value="false" />
     <setting id="ENABLE_STREAMDEV_SERVER" value="false" />
     <setting id="ENABLE_WIRBELSCAN" value="true" />
+    <setting id="ENABLE_LIVE" value="false" />
+    <setting id="LIVE_IP" value="0.0.0.0" />
+    <setting id="LIVE_PORT" value="8008" />
     <setting id="SOFTCAM_PLUGIN" value="sc" />
 </settings>

packages/addons/service/multimedia/vdr-addon/meta

@@ -21,13 +21,13 @@
 
 PKG_NAME="vdr-addon"
 PKG_VERSION="2.1"
-PKG_REV="3"
+PKG_REV="4"
 PKG_ARCH="any"
 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-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev"
+PKG_BUILD_DEPENDS="toolchain attr libcap vdr vdr-plugin-xvdr vdr-iptv vdr-wirbelscan vdr-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live"
 PKG_PRIORITY="optional"
 PKG_SECTION="service.multimedia"
 PKG_SHORTDESC="vdr: A powerful DVB TV application"

packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start

@@ -66,6 +66,9 @@ fi
 if [ "$ENABLE_WIRBELSCAN" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P wirbelscan"
 fi
+if [ "$ENABLE_LIVE" == "true" ] ; then
+  VDR_ARG="$VDR_ARG -P 'live -i $LIVE_IP -p $LIVE_PORT'"
+fi
 # dynamite must be LAST loaded plugin
 if [ "$ENABLE_DYNAMITE" == "true" ] ; then
   VDR_ARG="$VDR_ARG -P dynamite"
@@ -75,6 +78,10 @@ fi
   cd $ADDON_DIR/config
   mkdir -p $ADDON_CONFIG_DIR
 
+  # copy live plugin html content
+  mkdir -p $ADDON_CONFIG_DIR/plugins/live
+  cp -PR plugins/live/* $ADDON_CONFIG_DIR/plugins/live
+
   for dir in `find . -type d`; do
     mkdir -p $ADDON_CONFIG_DIR/$dir
   done
@@ -105,6 +112,6 @@ if [ ! "$(pidof vdr.bin)" ];then
       sleep 1
       continue
     fi
-    LANG=en_US.UTF-8 LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" vdr.bin $VDR_ARG &>$LOG_FILE
+    LANG=en_US.UTF-8 LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH" eval vdr.bin $VDR_ARG &>$LOG_FILE
   done &
 fi

packages/addons/service/multimedia/vdr-addon/source/resources/language/English/strings.xml

@@ -10,6 +10,9 @@
 	<string id="1032">Enable plugin: streamdev-client</string>
 	<string id="1033">Enable plugin: streamdev-server</string>
 	<string id="1034">Enable plugin: wirbelscan</string>
+	<string id="1038">Enable plugin: live</string>
+	<string id="1039">live: listen on ip</string>
+	<string id="1040">live: listen on port</string>
 	<string id="1035">Enable plugin: dynamite</string>
 	<string id="1036">Enable softcam</string>
 	<string id="1037">softcam plugin</string>

packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml

@@ -13,6 +13,9 @@
 		<setting id="ENABLE_STREAMDEV_CLIENT" type="bool" label="1032" default="false" />
 		<setting id="ENABLE_STREAMDEV_SERVER" type="bool" label="1033" default="false" />
 		<setting id="ENABLE_WIRBELSCAN" type="bool" label="1034" default="true" />
+		<setting id="ENABLE_LIVE" type="bool" label="1038" default="false" />
+		<setting id="LIVE_IP" type="ipaddress" label="1039" values="" enable="!eq(-1,false)" default="0.0.0.0"/>
+		<setting id="LIVE_PORT" type="number" label="1040" values="" enable="!eq(-2,false)"  default="8008"/>
 		<setting id="ENABLE_DYNAMITE" type="bool" label="1035" default="true" />
 		<setting type="sep" />
 		<setting id="ENABLE_SOFTCAM" type="bool" label="1036" default="true" />