jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-06 17:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

new package: vdr-live

Browse Source
This commit is contained in:
Stefan Saraev 2012-04-23 22:54:11 +03:00
parent 3e0036d049
commit bd92cffca5
7 changed files with 238 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
packages/3rdparty/multimedia/vdr-live/build vendored Executable file
View File

@ -0,0 +1,36 @@
#!/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]*`
CFLAGS="$CFLAGS -fPIC"
CXXFLAGS="$CXXFLAGS -fPIC"
LDFLAGS="$LDFLAGS -fPIC"
# dont build parallel
MAKEFLAGS=-j1
cd $PKG_BUILD
PWD=`pwd`
make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale"

37
packages/3rdparty/multimedia/vdr-live/meta vendored Normal file
View File

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

39
packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-01_ipv6.patch vendored Normal file
View File

@ -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;

18
packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-02_timers_colon.patch vendored Normal file
View File

@ -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() );

70
packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-03_fix-INCLUDES.patch vendored Normal file
View File

@ -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:

12
packages/3rdparty/multimedia/vdr-live/patches/vdr-live-0.2.0-04_tntnet-2.0.patch vendored Normal file
View File

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

26
packages/3rdparty/multimedia/vdr-live/rename vendored Executable file
View File

@ -0,0 +1,26 @@
#!/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
mv live-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION}