From 1c49b4147d9375d5877c617ab28259e2a78f32ca Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 6 May 2012 00:23:32 +0300 Subject: [PATCH 1/5] vdr-addon: move rotorng plugin config to the right place --- packages/addons/service/multimedia/vdr-addon/addon | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon index 0ca96935c4..18b2d5575c 100755 --- a/packages/addons/service/multimedia/vdr-addon/addon +++ b/packages/addons/service/multimedia/vdr-addon/addon @@ -35,10 +35,12 @@ mkdir -p $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 - cp $BUILD/rotorng-[0-9]*/examples/rotorng.conf $ADDON_BUILD/$PKG_ADDON_ID/config cp $PKG_DIR/config.plugins/remote.conf $ADDON_BUILD/$PKG_ADDON_ID/config mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/epgsearch +mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins + cp $BUILD/rotorng-[0-9]*/examples/rotorng.conf $ADDON_BUILD/$PKG_ADDON_ID/config/plugins + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-plugin-xvdr-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-dynamite-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin From f86b6e99edfcdf7abf00ae0b64da5a85ae58c3fb Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 6 May 2012 00:24:17 +0300 Subject: [PATCH 2/5] new package: vdr-wirbelscancontrol --- .../multimedia/vdr-wirbelscancontrol/build | 31 ++++++++++++++++ .../multimedia/vdr-wirbelscancontrol/meta | 37 +++++++++++++++++++ .../multimedia/vdr-wirbelscancontrol/rename | 6 +++ 3 files changed, 74 insertions(+) create mode 100755 packages/3rdparty/multimedia/vdr-wirbelscancontrol/build create mode 100644 packages/3rdparty/multimedia/vdr-wirbelscancontrol/meta create mode 100755 packages/3rdparty/multimedia/vdr-wirbelscancontrol/rename diff --git a/packages/3rdparty/multimedia/vdr-wirbelscancontrol/build b/packages/3rdparty/multimedia/vdr-wirbelscancontrol/build new file mode 100755 index 0000000000..f862b6ef56 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-wirbelscancontrol/build @@ -0,0 +1,31 @@ +#!/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 + +VDR_DIR=`basename $BUILD/vdr-[0-9]*` + +cd $PKG_BUILD +ln -sf ../vdr-wirbelscan-[0-9]*/wirbelscan_services.h + +make VDRDIR="../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale" + diff --git a/packages/3rdparty/multimedia/vdr-wirbelscancontrol/meta b/packages/3rdparty/multimedia/vdr-wirbelscancontrol/meta new file mode 100644 index 0000000000..e01d2b3a95 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-wirbelscancontrol/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-wirbelscancontrol" +PKG_VERSION="0.0.2" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://wirbel.htpc-forum.de/wirbelscancontrol/index2.html" +PKG_URL="http://wirbel.htpc-forum.de/wirbelscancontrol/$PKG_NAME-$PKG_VERSION.tgz" +PKG_DEPENDS="vdr" +PKG_BUILD_DEPENDS="toolchain vdr vdr-wirbelscan" +PKG_PRIORITY="optional" +PKG_SECTION="multimedia" +PKG_SHORTDESC="TV" +PKG_LONGDESC="TV" + +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/3rdparty/multimedia/vdr-wirbelscancontrol/rename b/packages/3rdparty/multimedia/vdr-wirbelscancontrol/rename new file mode 100755 index 0000000000..9272f40919 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-wirbelscancontrol/rename @@ -0,0 +1,6 @@ +#!/bin/sh + +. config/options $1 + +cd $BUILD +mv wirbelscancontrol-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION} From 0452bdc4d43e38e5e2eed16e8ea6e4439e747aa3 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 6 May 2012 00:25:02 +0300 Subject: [PATCH 3/5] vdr-addon: add wirbelscancontrol plugin --- packages/addons/service/multimedia/vdr-addon/addon | 1 + packages/addons/service/multimedia/vdr-addon/meta | 2 +- .../addons/service/multimedia/vdr-addon/source/bin/vdr.start | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon index 18b2d5575c..5eb957eb83 100755 --- a/packages/addons/service/multimedia/vdr-addon/addon +++ b/packages/addons/service/multimedia/vdr-addon/addon @@ -46,6 +46,7 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-dynamite-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-iptv-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-wirbelscan-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin + cp -PR $BUILD/vdr-wirbelscancontrol-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-plugin-dvbapi-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-sc-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin cp -PR $BUILD/vdr-sc-*/systems/*/libsc*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta index 936a5926ae..5563ed6b76 100755 --- 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-sc vdr-plugin-dvbapi vdr-dynamite vdr-plugin-streamdev vdr-live rotorng vdr-control vdr-epgsearch" +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" 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 669fb0aa1d..5ad1348827 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -64,7 +64,7 @@ if [ "$ENABLE_STREAMDEV_CLIENT" == "true" ] ; then VDR_ARG="$VDR_ARG -P streamdev-client" fi if [ "$ENABLE_WIRBELSCAN" == "true" ] ; then - VDR_ARG="$VDR_ARG -P wirbelscan" + VDR_ARG="$VDR_ARG -P wirbelscan -P wirbelscancontrol" fi if [ "$ENABLE_LIVE" == "true" ] ; then VDR_ARG="$VDR_ARG -P 'live -i $LIVE_IP -p $LIVE_PORT'" From e65c0fc49e8d5bd1a9e197dee1ab09b94ed987df Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 6 May 2012 00:35:23 +0300 Subject: [PATCH 4/5] tntnet: depend on openssl --- packages/3rdparty/web/tntnet/meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/3rdparty/web/tntnet/meta b/packages/3rdparty/web/tntnet/meta index ddbb53c13c..c12c5ccb94 100644 --- a/packages/3rdparty/web/tntnet/meta +++ b/packages/3rdparty/web/tntnet/meta @@ -26,7 +26,7 @@ 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_BUILD_DEPENDS="toolchain libtool cxxtools openssl" PKG_PRIORITY="optional" PKG_SECTION="python/web" PKG_SHORTDESC="tntnet: C++ Dynamite for the Web" From 435a0d04dfd1807649ec7fe405293da2d4f0d416 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 6 May 2012 01:13:48 +0300 Subject: [PATCH 5/5] tntnet: don't use host ssl --- packages/3rdparty/web/tntnet/build | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/3rdparty/web/tntnet/build b/packages/3rdparty/web/tntnet/build index 62f76f3c26..4d2cda10f0 100755 --- a/packages/3rdparty/web/tntnet/build +++ b/packages/3rdparty/web/tntnet/build @@ -37,6 +37,7 @@ mkdir -p .build-host && cd .build-host --with-sdk=yes \ --with-demos=no \ --with-epoll=yes \ + --with-ssl=no \ --with-stressjob=no make