Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

packages/3rdparty/lib/cxxtools/build

@@ -22,10 +22,31 @@
 
 . config/options $1
 
-ENABLED_PLUGINS="cardclient constcw sc-conax sc-cryptoworks sc-irdeto sc-nagra sc-seca sc-viaccess sc-videoguard2"
+cd $PKG_BUILD
 
-mkdir -p $INSTALL/usr/lib/vdr
+setup_toolchain host
-  cp $PKG_BUILD/libvdr-sc.so.* $INSTALL/usr/lib/vdr
+
-  for plugin in $ENABLED_PLUGINS; do
+mkdir -p .build-host && cd .build-host
-    cp $PKG_BUILD/systems/$plugin/libsc-*.so.* $INSTALL/usr/lib/vdr
+
-  done
+../configure --host=$HOST_NAME \
+            --build=$HOST_NAME \
+            --prefix=$ROOT/$TOOLCHAIN \
+            --disable-static \
+            --enable-shared
+
+make
+make install
+
+cd ..
+
+setup_toolchain target
+
+mkdir -p .build-target && cd .build-target
+../configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-static \
+            --enable-shared
+
+$MAKEINSTALL

packages/3rdparty/lib/cxxtools/install

@@ -21,6 +21,3 @@
 ################################################################################
 
 . config/options $1
-
-mkdir -p $INSTALL/usr/lib/vdr
-  cp $BUILD/iptv-*/libvdr-iptv.so.* $INSTALL/usr/lib/vdr

packages/3rdparty/lib/cxxtools/meta

@@ -1,5 +1,3 @@
-#!/bin/sh
-
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
@@ -20,7 +18,19 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-. config/options $1
+PKG_NAME="cxxtools"
+PKG_VERSION="2.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL-2"
+PKG_SITE="http://www.tntnet.org/cxxtools.html"
+PKG_URL="http://www.tntnet.org/download/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain"
+PKG_PRIORITY="optional"
+PKG_SECTION="python/web"
+PKG_SHORTDESC="cxxtools: a collection of general-purpose C++ classes"
+PKG_LONGDESC="Cxxtools is a collection of general-purpose C++ classes"
+PKG_IS_ADDON="no"
 
-mkdir -p $INSTALL/usr/lib/vdr
+PKG_AUTORECONF="yes"
-  cp $PKG_BUILD/libvdr-streamdev*.so.* $INSTALL/usr/lib/vdr

packages/3rdparty/multimedia/vdr-iptv/rename

@@ -1,5 +1,25 @@
 #!/bin/sh
 
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
 . config/options $1
 
 cd $BUILD

packages/3rdparty/multimedia/vdr-live/build

@@ -22,8 +22,15 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/lib/vdr
+VDR_DIR=`basename $BUILD/vdr-[0-9]*`
-  cp $PKG_BUILD/libvdr-xvdr.so.* $INSTALL/usr/lib/vdr
 
-mkdir -p $INSTALL/usr/config/vdr/plugins/xvdr
+CFLAGS="$CFLAGS -fPIC"
-  cp $PKG_DIR/config/allowed_hosts.conf $INSTALL/usr/config/vdr/plugins/xvdr/
+CXXFLAGS="$CXXFLAGS -fPIC"
+LDFLAGS="$LDFLAGS -fPIC"
+
+# dont build parallel
+  MAKEFLAGS=-j1
+
+cd $PKG_BUILD
+  PWD=`pwd`
+  make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

packages/3rdparty/multimedia/vdr-live/meta

@@ -0,0 +1,37 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="vdr-live"
+PKG_VERSION="0.2.0"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="http://live.vdr-developer.org/en/index.php"
+PKG_URL="http://live.vdr-developer.org/downloads/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS="vdr"
+PKG_BUILD_DEPENDS="toolchain vdr tntnet"
+PKG_PRIORITY="optional"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="vdr-live: the LIVE Interactive VDR Environment/"
+PKG_LONGDESC="vdr-live allows a comfortable operation of VDR and some of its plugins trough a web interface"
+
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="no"

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-01_ipv6.patch

@@ -0,0 +1,39 @@
+Description: Allows to use IPV6 addresses
+Forwarded: not-needed
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630627#10
+Bug-Debian: http://bugs.debian.org/630627
+Author: Luboš Doležel <lubos@dolezel.info>
+
+--- live-0.2.0/setup.cpp.orig	2008-04-23 01:01:53.000000000 +0200
++++ live-0.2.0/setup.cpp	2011-06-15 20:22:36.577961061 +0200
+@@ -151,13 +151,28 @@
+ 
+ bool Setup::CheckServerIps()
+ {
++	bool v6supported = false;
++	int s = socket(AF_INET6, SOCK_STREAM, 0);
++	
++	if (s != -1) {
++		close(s);
++		v6supported = true;
++	}
++	
+ 	if ( m_serverIps.empty() ) {
+-		m_serverIps.push_back( "0.0.0.0" );
++		if (v6supported)
++			m_serverIps.push_back( "::" );
++		else
++			m_serverIps.push_back( "0.0.0.0" );
+ 		return true;
+ 	}
+ 
++        union {
++		in_addr in4;
++		in6_addr in6;
++	};
+ 	for ( IpList::const_iterator ip = m_serverIps.begin(); ip != m_serverIps.end(); ++ip ) {
+-		if ( inet_addr( ip->c_str() ) == static_cast< in_addr_t >( -1 ) ) {
++		if ( !inet_pton(AF_INET, ip->c_str(), &in4) && !inet_pton(AF_INET6, ip->c_str(), &in6) ) {
+ 			esyslog( "ERROR: live server ip %s is not a valid ip address", ip->c_str() );
+ 			cerr << "ERROR: live server ip " << *ip << " is not a valid ip address" << endl;
+ 			return false;

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-02_timers_colon.patch

@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_timers_colon.dpatch by Timo Weingärtner <timo@tiwe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: colons have to be replaced by pipes in timer titles.
+
+@DPATCH@
+--- vdr-plugin-live-0.2.0/timers.cpp	2008-04-10 22:06:05.000000000 +0200
++++ vdr-plugin-live-0.2.0.new/timers.cpp	2009-07-25 23:39:02.000000000 +0200
+@@ -138,7 +138,7 @@
+ 		ostringstream builder;
+ 		builder << flags << ":" << channel << ":" << ( weekdays != "-------" ? weekdays : "" )
+ 				<< ( weekdays == "-------" || day.empty() ? "" : "@" ) << day << ":" << start << ":" << stop << ":"
+-				<< priority << ":" << lifetime << ":" << title << ":" << aux;
++				<< priority << ":" << lifetime << ":" << StringReplace(title, ":", "|") << ":" << aux;
+ 		// dsyslog("%s", builder.str().c_str());
+ 
+ 		TimerPair timerData( timer, builder.str() );

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-03_fix-INCLUDES.patch

@@ -0,0 +1,70 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_live-0.2.0-fix-INCLUDES.dpatch by Thomas Günther <tom@toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes compilation with VDR >= 1.7.13.
+
+@DPATCH@
+--- live-0.2.0/Makefile
++++ live-0.2.0/Makefile
+@@ -38,6 +38,7 @@
+ ### Allow user defined options to overwrite defaults:
+ 
+ -include $(VDRDIR)/Make.config
++EXTRA_INCLUDES = $(INCLUDES)
+ 
+ ### The version number of VDR's plugin API (taken from VDR's "config.h"):
+ 
+@@ -139,10 +140,10 @@
+ subdirs: $(SUBDIRS)
+ 
+ $(SUBDIRS):
+-	$(MAKE) -C $@ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" $(MAKECMDGOALS)
++	$(MAKE) -C $@ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" EXTRA_INCLUDES="$(EXTRA_INCLUDES)" $(MAKECMDGOALS)
+ 
+ PAGES:
+-	$(MAKE) -C pages CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" .dependencies
++	$(MAKE) -C pages CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" EXTRA_INCLUDES="$(EXTRA_INCLUDES)" .dependencies
+ 
+ $(VERSIONSUFFIX): FORCE
+ 	./buildutil/version-util $(VERSIONSUFFIX) || ./buildutil/version-util -F $(VERSIONSUFFIX)
+--- live-0.2.0/css/Makefile
++++ live-0.2.0/css/Makefile
+@@ -7,6 +7,7 @@
+ CXXFLAGS += `tntnet-config --cxxflags`
+ LDFLAGS  += `tntnet-config --libs`
+ 
++INCLUDES += $(EXTRA_INCLUDES)
+ INCLUDES += -I..
+ 
+ ### The directory environment:
+--- live-0.2.0/httpd/Makefile
++++ live-0.2.0/httpd/Makefile
+@@ -7,6 +7,7 @@
+ 
+ ### Includes and Defines (add further entries here):
+ 
++INCLUDES += $(EXTRA_INCLUDES)
+ INCLUDES += -I.
+ 
+ ### The object files (add further files here):
+--- live-0.2.0/javascript/Makefile
++++ live-0.2.0/javascript/Makefile
+@@ -7,6 +7,7 @@
+ CXXFLAGS += `tntnet-config --cxxflags`
+ LDFLAGS  += `tntnet-config --libs`
+ 
++INCLUDES += $(EXTRA_INCLUDES)
+ INCLUDES += -I.. -I$(VDRDIR)/include
+ 
+ ### The directory environment:
+--- live-0.2.0/pages/Makefile
++++ live-0.2.0/pages/Makefile
+@@ -2,6 +2,7 @@
+ AR       ?= ar
+ ECPPC    ?= ecppc
+ 
++INCLUDES += $(EXTRA_INCLUDES)
+ INCLUDES += -I.. -I$(VDRDIR)/include
+ 
+ ### The directory environment:

packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-04_tntnet-2.0.patch

@@ -0,0 +1,12 @@
+Index: vdr-plugin-live-0.2.0/thread.cpp
+===================================================================
+--- vdr-plugin-live-0.2.0.orig/thread.cpp	2011-08-25 21:58:33.000000000 +0200
++++ vdr-plugin-live-0.2.0/thread.cpp	2011-08-25 21:58:37.000000000 +0200
+@@ -3,6 +3,7 @@
+ #include <stdexcept>
+ #include <vdr/tools.h>
+ #include <tnt/tntnet.h>
++#include <tnt/tntconfig.h>
+ #include "thread.h"
+ #include "tntconfig.h"
+ 

packages/3rdparty/multimedia/vdr-live/rename

@@ -22,5 +22,5 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/lib/vdr
+cd $BUILD
-  cp $PKG_BUILD/libvdr-dvbapi.so.* $INSTALL/usr/lib/vdr
+mv live-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION}

packages/3rdparty/multimedia/vdr-wirbelscan/install

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib/vdr
-  cp $BUILD/wirbelscan-*/libvdr-wirbelscan.so.* $INSTALL/usr/lib/vdr

packages/3rdparty/multimedia/vdr/patches/vdr-1.7.27-11_recording_h_deprecated.patch

@@ -0,0 +1,13 @@
+diff --git a/recording.h b/recording.h
+index 5f94ee2..0b44fe8 100644
+--- a/recording.h
++++ b/recording.h
+@@ -22,7 +22,7 @@
+ #define TIMERMACRO_TITLE    "TITLE"
+ #define TIMERMACRO_EPISODE  "EPISODE"
+ 
+-//#define __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS // Code enclosed with this macro is deprecated and may be removed in a future version
++#define __RECORDING_H_DEPRECATED_DIRECT_MEMBER_ACCESS // Code enclosed with this macro is deprecated and may be removed in a future version
+ 
+ extern bool VfatFileSystem;
+ extern int InstanceId;

packages/3rdparty/web/tntnet/build

@@ -3,7 +3,6 @@
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2011 Anthony Nash (nash.ant@gmail.com)
 #
 #  This Program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -23,16 +22,43 @@
 
 . config/options $1
 
-mkdir -p $INSTALL/usr/bin
+cd $PKG_BUILD
-  cp -P $PKG_BUILD/vdr $INSTALL/usr/bin
 
-mkdir -p $INSTALL/usr/lib/vdr
+setup_toolchain host
 
-mkdir -p $INSTALL/usr/config/vdr
+mkdir -p .build-host && cd .build-host
-  cp $PKG_BUILD/channels.conf* $INSTALL/usr/config/vdr
+../configure --host=$HOST_NAME \
-  cp $PKG_BUILD/diseqc.conf $INSTALL/usr/config/vdr
+            --build=$HOST_NAME \
-  cp $PKG_BUILD/keymacros.conf $INSTALL/usr/config/vdr
+            --prefix=$ROOT/$TOOLCHAIN \
-  cp $PKG_BUILD/scr.conf $INSTALL/usr/config/vdr
+            --disable-static \
-  cp $PKG_BUILD/sources.conf $INSTALL/usr/config/vdr
+            --enable-shared \
-  cp $PKG_BUILD/svdrhosts.conf $INSTALL/usr/config/vdr
+            --with-server=no \
-  echo '0.0.0.0/0' >> $INSTALL/usr/config/vdr/svdrphosts.conf
+            --with-cgi=no \
+            --with-sdk=yes \
+            --with-demos=no \
+            --with-epoll=yes \
+            --with-stressjob=no
+
+make
+make install
+
+cd ..
+
+setup_toolchain target
+
+mkdir -p .build-target && cd .build-target
+
+../configure --host=$TARGET_NAME \
+            --build=$HOST_NAME \
+            --prefix=/usr \
+            --sysconfdir=/etc \
+            --disable-static \
+            --enable-shared \
+            --with-server=no \
+            --with-cgi=no \
+            --with-sdk=yes \
+            --with-demos=no \
+            --with-epoll=yes \
+            --with-stressjob=no
+
+$MAKEINSTALL

packages/3rdparty/web/tntnet/install

@@ -21,6 +21,3 @@
 ################################################################################
 
 . config/options $1
-
-mkdir -p $INSTALL/usr/lib/vdr
-  cp $PKG_BUILD/libvdr-dynamite.so.* $INSTALL/usr/lib/vdr

packages/3rdparty/web/tntnet/meta

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="tntnet"
+PKG_VERSION="2.1"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="GPL-2"
+PKG_SITE="http://www.tntnet.org/"
+PKG_URL="http://www.tntnet.org/download/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS="libtool"
+PKG_BUILD_DEPENDS="toolchain libtool cxxtools"
+PKG_PRIORITY="optional"
+PKG_SECTION="python/web"
+PKG_SHORTDESC="tntnet: C++ Dynamite for the Web"
+PKG_LONGDESC="Tntnet is a modular, multithreaded, high performance webapplicationserver for C++"
+PKG_IS_ADDON="no"
+
+PKG_AUTORECONF="yes"

packages/addons/service/multimedia/hts-tvheadend/addon

@@ -28,4 +28,4 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID
   cp -PR $PKG_DIR/config/dvr-config $ADDON_BUILD/$PKG_ADDON_ID/dvr-config
 
 mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin
-  cp -P $PKG_BUILD/build.linux/tvheadend.bundle $ADDON_BUILD/$PKG_ADDON_ID/bin
+  cp -P $PKG_BUILD/build.linux/tvheadend.bundle $ADDON_BUILD/$PKG_ADDON_ID/bin/tvheadend

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" />

packages/linux-drivers/linux-tbs-drivers/init.d/63_tbs-ir

@@ -1,37 +0,0 @@
-################################################################################
-#      Copyright (C) 2009-2010 OpenELEC.tv
-#      http://www.openelec.tv
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-# initialize tbs ir
-#
-# runlevels: openelec
-
-(
-  progress "initializing tbs ir"
-    while [ true ] ; do
-      if [ ! -e /dev/dvb/adapter*/frontend* ] ; then
-        sleep 1
-        continue
-      else
-        ir-keytable -c
-        ir-keytable -s rc0 -p NEC,RC6 -w /etc/rc_keymaps/rc6_mce
-        break
-      fi
-    done
-)&

projects/ATV/linux/linux.i386.conf

@@ -1112,7 +1112,7 @@ CONFIG_USB_USBNET=m
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
 CONFIG_USB_NET_DM9601=m
-# CONFIG_USB_NET_SMSC75XX is not set
+CONFIG_USB_NET_SMSC75XX=m
 # CONFIG_USB_NET_SMSC95XX is not set
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_NET_NET1080 is not set

projects/Fusion/linux/linux.i386.conf

@@ -1188,7 +1188,7 @@ CONFIG_USB_USBNET=m
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
 CONFIG_USB_NET_DM9601=m
-# CONFIG_USB_NET_SMSC75XX is not set
+CONFIG_USB_NET_SMSC75XX=m
 # CONFIG_USB_NET_SMSC95XX is not set
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_NET_NET1080 is not set

projects/Fusion/linux/linux.x86_64.conf

@@ -1146,7 +1146,7 @@ CONFIG_USB_USBNET=m
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
 CONFIG_USB_NET_DM9601=m
-# CONFIG_USB_NET_SMSC75XX is not set
+CONFIG_USB_NET_SMSC75XX=m
 # CONFIG_USB_NET_SMSC95XX is not set
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_NET_NET1080 is not set

projects/Generic/linux/linux.i386.conf

@@ -1242,7 +1242,7 @@ CONFIG_USB_USBNET=m
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
 CONFIG_USB_NET_DM9601=m
-# CONFIG_USB_NET_SMSC75XX is not set
+CONFIG_USB_NET_SMSC75XX=m
 # CONFIG_USB_NET_SMSC95XX is not set
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_NET_NET1080 is not set

projects/Generic_OSS/linux/linux.i386.conf

@@ -1240,7 +1240,7 @@ CONFIG_USB_USBNET=m
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
 CONFIG_USB_NET_DM9601=m
-# CONFIG_USB_NET_SMSC75XX is not set
+CONFIG_USB_NET_SMSC75XX=m
 # CONFIG_USB_NET_SMSC95XX is not set
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_NET_NET1080 is not set

projects/ION/linux/linux.i386.conf

@@ -1169,7 +1169,7 @@ CONFIG_USB_USBNET=m
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
 CONFIG_USB_NET_DM9601=m
-# CONFIG_USB_NET_SMSC75XX is not set
+CONFIG_USB_NET_SMSC75XX=m
 # CONFIG_USB_NET_SMSC95XX is not set
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_NET_NET1080 is not set

projects/ION/linux/linux.x86_64.conf

@@ -1118,7 +1118,7 @@ CONFIG_USB_USBNET=m
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
 CONFIG_USB_NET_DM9601=m
-# CONFIG_USB_NET_SMSC75XX is not set
+CONFIG_USB_NET_SMSC75XX=m
 # CONFIG_USB_NET_SMSC95XX is not set
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_NET_NET1080 is not set

projects/Intel/linux/linux.i386.conf

@@ -1198,7 +1198,7 @@ CONFIG_USB_USBNET=m
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
 CONFIG_USB_NET_DM9601=m
-# CONFIG_USB_NET_SMSC75XX is not set
+CONFIG_USB_NET_SMSC75XX=m
 # CONFIG_USB_NET_SMSC95XX is not set
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_NET_NET1080 is not set

projects/Intel/linux/linux.x86_64.conf

@@ -1148,7 +1148,7 @@ CONFIG_USB_USBNET=m
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
 CONFIG_USB_NET_DM9601=m
-# CONFIG_USB_NET_SMSC75XX is not set
+CONFIG_USB_NET_SMSC75XX=m
 # CONFIG_USB_NET_SMSC95XX is not set
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_NET_NET1080 is not set

projects/Ultra/linux/linux.x86_64.conf

@@ -1095,7 +1095,7 @@ CONFIG_USB_USBNET=m
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
 CONFIG_USB_NET_DM9601=m
-# CONFIG_USB_NET_SMSC75XX is not set
+CONFIG_USB_NET_SMSC75XX=m
 # CONFIG_USB_NET_SMSC95XX is not set
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_NET_NET1080 is not set

projects/Virtual/linux/linux.i386.conf

@@ -1206,7 +1206,7 @@ CONFIG_USB_USBNET=m
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
 CONFIG_USB_NET_DM9601=m
-# CONFIG_USB_NET_SMSC75XX is not set
+CONFIG_USB_NET_SMSC75XX=m
 # CONFIG_USB_NET_SMSC95XX is not set
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_NET_NET1080 is not set

projects/Virtual/linux/linux.x86_64.conf

@@ -1156,7 +1156,7 @@ CONFIG_USB_USBNET=m
 # CONFIG_USB_NET_CDC_EEM is not set
 # CONFIG_USB_NET_CDC_NCM is not set
 CONFIG_USB_NET_DM9601=m
-# CONFIG_USB_NET_SMSC75XX is not set
+CONFIG_USB_NET_SMSC75XX=m
 # CONFIG_USB_NET_SMSC95XX is not set
 # CONFIG_USB_NET_GL620A is not set
 # CONFIG_USB_NET_NET1080 is not set