diff --git a/packages/3rdparty/multimedia/vdr-control/build b/packages/3rdparty/multimedia/vdr-control/build new file mode 100755 index 0000000000..040e514757 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-control/build @@ -0,0 +1,33 @@ +#!/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 + +CFLAGS="$CFLAGS -fPIC" +CXXFLAGS="$CXXFLAGS -fPIC" +LDFLAGS="$LDFLAGS -fPIC" + +VDR_DIR=`basename $BUILD/vdr-[0-9]*` + +cd $PKG_BUILD + PWD=`pwd` + make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale" diff --git a/packages/3rdparty/multimedia/vdr-control/meta b/packages/3rdparty/multimedia/vdr-control/meta new file mode 100644 index 0000000000..c145cd4648 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-control/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-control" +PKG_VERSION="0.0.2a" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://ricomp.de/vdr/" +PKG_URL="http://ricomp.de/vdr/${PKG_NAME}-${PKG_VERSION}.tgz" +PKG_DEPENDS="vdr" +PKG_BUILD_DEPENDS="toolchain vdr" +PKG_PRIORITY="optional" +PKG_SECTION="multimedia" +PKG_SHORTDESC="vdr control plugin" +PKG_LONGDESC="vdr control plugin" + +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-01_Makefile-fPIC-fix.patch b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-01_Makefile-fPIC-fix.patch new file mode 100644 index 0000000000..3380b8fcb1 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-01_Makefile-fPIC-fix.patch @@ -0,0 +1,20 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run + +## Makefile-fPIC-fix patch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds -fPIC to Makefile to fix potential FTBFS. + +@DPATCH@ +diff -urNad /usr/src/cvs/vdrdevel-plugin-rotor/Makefile vdrdevel-plugin-rotor/Makefile +--- /usr/src/cvs/vdrdevel-plugin-rotor/Makefile Sun May 16 15:48:12 2004 ++++ vdrdevel-plugin-rotor/Makefile Sat Sep 11 00:28:18 2004 +@@ -18,7 +18,7 @@ + ### The C++ compiler and options: + + CXX ?= g++ +-CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual ++CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual + + ### The directory environment: + diff --git a/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-02_gateway.patch b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-02_gateway.patch new file mode 100644 index 0000000000..5f46c18b9c --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-02_gateway.patch @@ -0,0 +1,31 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_gateway.dpatch by Walter, dg9ep @ vdrportal.de +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes problems when ending a telnet session with ctrl-c +## DP: see: http://www.vdr-portal.de/board/thread.php?threadid=49680 + +@DPATCH@ +diff -urNad vdr-plugin-control-0.0.2a~/gateway.c vdr-plugin-control-0.0.2a/gateway.c +--- vdr-plugin-control-0.0.2a~/gateway.c 2004-07-02 21:24:22.000000000 +0200 ++++ vdr-plugin-control-0.0.2a/gateway.c 2007-04-12 22:51:16.000000000 +0200 +@@ -36,7 +36,7 @@ + _pTelnet (0), + _pFormatter (0) + { +- gl_CtrlGatewayCol.Add(this); ++// gl_CtrlGatewayCol.Add(this); + + // if (! cKbdRemoteForControl::_pRemote) + // cKbdRemoteForControl::_pRemote = new cKbdRemoteForControl(); +@@ -163,8 +163,8 @@ + + // UnprepareSocket(); + +- if (! _terminating) +- gl_CtrlGatewayCol.Del(this); ++// if (! _terminating) ++// gl_CtrlGatewayCol.Del(this); + + conDSYSLOG("gateway thread ended (pid=%d)", getpid()); + conLOG_GATEW("gateway thread ended (pid=%d)", getpid()); diff --git a/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-92_control-1.3.18.patch b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-92_control-1.3.18.patch new file mode 100644 index 0000000000..0e6a100f24 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-92_control-1.3.18.patch @@ -0,0 +1,35 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run + +## control-1.3.18 patch - by Thomas Günther +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Changes for VDR >= 1.3.18. + +@DPATCH@ +--- control-0.0.2a/gateway.c ++++ control-0.0.2a/gateway.c +@@ -102,7 +102,12 @@ + + uint64 Command = 0; + uint i = 0; ++#if VDRVERSNUM >= 10318 ++ cTimeMs timeout; ++ timeout.Set(100); ++#else + int t0 = time_ms(); ++#endif + while (_active && i < sizeof(Command)) { + + uchar ch; +@@ -131,7 +136,11 @@ + // of their codes, so we'll need to wait some 100ms to see if + // there is more coming up - or whether this really is the 'ESC' + // key (if somebody knows how to clean this up, please let me know): ++#if VDRVERSNUM >= 10318 ++ if (Command == 0x1B && !timeout.TimedOut()) ++#else + if (Command == 0x1B && time_ms() - t0 < 100) ++#endif + continue; + + if (Command) { diff --git a/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-93_control-0.0.2a-1.5.0.patch b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-93_control-0.0.2a-1.5.0.patch new file mode 100644 index 0000000000..a7ebfe3a2a --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-93_control-0.0.2a-1.5.0.patch @@ -0,0 +1,73 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 93_control-0.0.2a-1.5.0.dpatch by Thomas Günther +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Changes for VDR >= 1.5.0 (applicable to VDR >= 1.4.5). + +@DPATCH@ +--- control-0.0.2a/gateway.c ++++ control-0.0.2a/gateway.c +@@ -100,7 +100,7 @@ + + if (_stack.poll(100)) { + +- uint64 Command = 0; ++ uint64_t Command = 0; + uint i = 0; + int t0 = time_ms(); + while (_active && i < sizeof(Command)) { +--- control-0.0.2a/keyboard.c ++++ control-0.0.2a/keyboard.c +@@ -18,7 +18,7 @@ + + struct tKbdMap { + eKbdFunc func; +- uint64 code; ++ uint64_t code; + }; + + +@@ -117,7 +117,7 @@ + + + +-bool cCtrlKeyboard::intPut(uint64 Command, bool Repeat, bool Release) { ++bool cCtrlKeyboard::intPut(uint64_t Command, bool Repeat, bool Release) { + + bool ret = cRemote::Put(Command, Repeat, Release); + conLOG_KEYB("%s cKbdRemoteForControl::intPut(0x%016LX)", ret ? "true" : "false", Command); +@@ -126,7 +126,7 @@ + + + +-bool cCtrlKeyboard::Put(uint64 Command, bool Repeat, bool Release) { ++bool cCtrlKeyboard::Put(uint64_t Command, bool Repeat, bool Release) { + + if (! _pRemote) + _pRemote = new cCtrlKeyboard(); +@@ -136,7 +136,7 @@ + + + +-int cCtrlKeyboard::MapCodeToFunc(uint64 Code) { ++int cCtrlKeyboard::MapCodeToFunc(uint64_t Code) { + + for (const tKbdMap *p = keyboardKbdMap; p->func != kfNone; p++) { + if (p->code == Code) +--- control-0.0.2a/keyboard.h ++++ control-0.0.2a/keyboard.h +@@ -30,11 +30,11 @@ + cCtrlKeyboard(); + virtual ~cCtrlKeyboard(); + +- bool intPut(uint64 Command, bool Repeat, bool Release); ++ bool intPut(uint64_t Command, bool Repeat, bool Release); + + public: +- static bool Put(uint64 Command, bool Repeat = false, bool Release = false); +- static int MapCodeToFunc(uint64 Code); ++ static bool Put(uint64_t Command, bool Repeat = false, bool Release = false); ++ static int MapCodeToFunc(uint64_t Code); + }; + + diff --git a/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-94_gcc-4.4.patch b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-94_gcc-4.4.patch new file mode 100644 index 0000000000..09292c75d8 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-control/patches/vdr-control-0.0.2a-94_gcc-4.4.patch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 94_gcc-4.4.dpatch by Tobias Grimm +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad vdr-plugin-control-0.0.2a~/formatter.c vdr-plugin-control-0.0.2a/formatter.c +--- vdr-plugin-control-0.0.2a~/formatter.c 2004-07-02 21:24:22.000000000 +0200 ++++ vdr-plugin-control-0.0.2a/formatter.c 2009-11-11 22:07:56.000000000 +0100 +@@ -165,7 +165,7 @@ + + if (Title) { + +- char* t = strchr(Title, '\t'); ++ const char* t = strchr(Title, '\t'); + if (t) { + + int size = t - Title; +@@ -300,7 +300,7 @@ + + for (;;) { + +- char* t = strchr(text, '\t'); ++ const char* t = strchr(text, '\t'); + if (t) { + // Tab found - check if the tab can be used + diff --git a/packages/3rdparty/multimedia/vdr-control/rename b/packages/3rdparty/multimedia/vdr-control/rename new file mode 100755 index 0000000000..2cd5321a03 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-control/rename @@ -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 control-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION} diff --git a/packages/3rdparty/multimedia/vdr-epgsearch/build b/packages/3rdparty/multimedia/vdr-epgsearch/build new file mode 100755 index 0000000000..e3e469789a --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-epgsearch/build @@ -0,0 +1,28 @@ +#!/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 + PWD=`pwd` + make VDRDIR="$PWD/../$VDR_DIR" LIBDIR="." LOCALEDIR="./locale" diff --git a/packages/3rdparty/multimedia/vdr-epgsearch/meta b/packages/3rdparty/multimedia/vdr-epgsearch/meta new file mode 100644 index 0000000000..f1a1313889 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-epgsearch/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-epgsearch" +PKG_VERSION="1.0.0" +PKG_REV="1" +PKG_ARCH="any" +PKG_LICENSE="GPL" +PKG_SITE="http://winni.vdr-developer.org/epgsearch/" +PKG_URL="http://winni.vdr-developer.org/epgsearch/downloads/${PKG_NAME}-${PKG_VERSION}.tgz" +PKG_DEPENDS="vdr" +PKG_BUILD_DEPENDS="toolchain vdr" +PKG_PRIORITY="optional" +PKG_SECTION="multimedia" +PKG_SHORTDESC="vdr-epgsearch" +PKG_LONGDESC="vdr-epgsearch" + +PKG_IS_ADDON="no" + +PKG_AUTORECONF="no" diff --git a/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-1.0.0-vdr_1.7.25-01.patch b/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-1.0.0-vdr_1.7.25-01.patch new file mode 100644 index 0000000000..e8c1b8b507 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-epgsearch/patches/vdr-epgsearch-1.0.0-vdr_1.7.25-01.patch @@ -0,0 +1,46 @@ +From 15d08ffb09de612ae1eb53b2aeca2f906f7076a6 Mon Sep 17 00:00:00 2001 +From: Christian Wieninger +Date: Sun, 04 Mar 2012 08:44:19 +0000 +Subject: support for vdr 1.7.25 + +--- +diff --git a/Makefile b/Makefile +index 0397217..4a72b41 100644 +--- a/Makefile ++++ b/Makefile +@@ -64,7 +64,7 @@ CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses -Wno-format-y2k + + ### The directory environment: + +-DVBDIR = ../../../../DVB ++#DVBDIR = ../../../../DVB + VDRDIR = ../../.. + LIBDIR = ../../lib + TMPDIR = /tmp +diff --git a/conflictcheck.h b/conflictcheck.h +index fcc6dcb..7e6fb7a 100644 +--- a/conflictcheck.h ++++ b/conflictcheck.h +@@ -163,12 +163,20 @@ class cConflictCheckDevice + result = true; + #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE + else ++#if APIVERSNUM < 10725 + result = Priority >= Setup.PrimaryLimit; ++#else ++ result = Priority >= 0; ++#endif + #endif + #endif + } + else ++#if APIVERSNUM < 10725 + result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit; ++#else ++ result = !IsPrimaryDevice() || Priority >= 0; ++#endif + } + else + needsDetachReceivers = true; +-- +cgit v0.9.0.2-39-g756e diff --git a/packages/3rdparty/multimedia/vdr-epgsearch/rename b/packages/3rdparty/multimedia/vdr-epgsearch/rename new file mode 100755 index 0000000000..cc1d8bcc58 --- /dev/null +++ b/packages/3rdparty/multimedia/vdr-epgsearch/rename @@ -0,0 +1,27 @@ +#!/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 epgsearch-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION} +mv epgsearch-${PKG_VERSION} ${PKG_NAME}-${PKG_VERSION} diff --git a/packages/3rdparty/multimedia/vdr-iptv/meta b/packages/3rdparty/multimedia/vdr-iptv/meta index 878c216d7b..2ecb3620f5 100644 --- a/packages/3rdparty/multimedia/vdr-iptv/meta +++ b/packages/3rdparty/multimedia/vdr-iptv/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="vdr-iptv" -PKG_VERSION="0.5.0" +PKG_VERSION="0.5.2" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.0-http_socket_connect.patch b/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.0-http_socket_connect.patch deleted file mode 100644 index 866c7f70ea..0000000000 --- a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.0-http_socket_connect.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 9766e893eb3ed1076e41f89b663b3be122355f39 -Author: Stefan Saraev -Date: Wed Mar 7 00:13:55 2012 +0200 - - vdr-iptv: protocolhttp socket connect() fix - -diff --git a/protocolhttp.c b/protocolhttp.c -index 62abbd6..2d5277a 100644 ---- a/protocolhttp.c -+++ b/protocolhttp.c -@@ -42,6 +42,25 @@ bool cIptvProtocolHttp::Connect(void) - if (!isActive && !isempty(streamAddr) && !isempty(streamPath)) { - // Ensure that socket is valid and connect - OpenSocket(socketPort, streamAddr); -+ -+ // First try only the IP address -+ sockAddr.sin_addr.s_addr = inet_addr(streamAddr); -+ -+ if (sockAddr.sin_addr.s_addr == INADDR_NONE) { -+ debug("Cannot convert %s directly to internet address\n", streamAddr); -+ -+ // It may be a host name, get the name -+ struct hostent *host; -+ host = gethostbyname(streamAddr); -+ if (!host) { -+ char tmp[64]; -+ error("%s is not valid address: %s", streamAddr, strerror_r(h_errno, tmp, sizeof(tmp))); -+ return false; -+ } -+ -+ sockAddr.sin_addr.s_addr = inet_addr(*host->h_addr_list); -+ } -+ - if (!ConnectSocket()) { - CloseSocket(); - return false; diff --git a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.0-skip_header_processing.patch b/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.0-skip_header_processing.patch deleted file mode 100644 index 5fe6f94932..0000000000 --- a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.0-skip_header_processing.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit 67d5e792aa30100b111490c3c9e1c01f9def3c86 -Author: Stefan Saraev -Date: Thu Mar 15 00:02:50 2012 +0200 - - vdr-iptv: skip header processing - -diff --git a/protocolhttp.c b/protocolhttp.c -index 2d5277a..9b305aa 100644 ---- a/protocolhttp.c -+++ b/protocolhttp.c -@@ -154,17 +154,7 @@ bool cIptvProtocolHttp::ProcessHeaders(void) - memset(buf, '\0', sizeof(buf)); - if (!GetHeaderLine(buf, sizeof(buf), lineLength)) - return false; -- if (!responseFound && sscanf(buf, "HTTP/1.%*i %i ", &response) != 1) { -- error("Expected HTTP header not found\n"); -- continue; -- } -- else -- responseFound = true; -- // Allow only 'OK' and 'Partial Content' -- if ((response != 200) && (response != 206)) { -- error("Invalid HTTP response (%d): %s\n", response, buf); -- return false; -- } -+ responseFound = true; - } - return true; - } diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta index 0c5bc5022f..f81e5d558f 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta +++ b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="vdr-plugin-dvbapi" -PKG_VERSION="9bef03f" +PKG_VERSION="329cbe8" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-9bef03f-crosscompiling.patch b/packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-329cbe8-crosscompiling.patch similarity index 100% rename from packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-9bef03f-crosscompiling.patch rename to packages/3rdparty/multimedia/vdr-plugin-dvbapi/patches/vdr-plugin-dvbapi-329cbe8-crosscompiling.patch diff --git a/packages/3rdparty/multimedia/vdr-plugin-streamdev/meta b/packages/3rdparty/multimedia/vdr-plugin-streamdev/meta index a20423a960..8e1f97839c 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-streamdev/meta +++ b/packages/3rdparty/multimedia/vdr-plugin-streamdev/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="vdr-plugin-streamdev" -PKG_VERSION="a179771" +PKG_VERSION="8719007" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-a63f724-makefile.patch b/packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-8719007-makefile.patch similarity index 100% rename from packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-a63f724-makefile.patch rename to packages/3rdparty/multimedia/vdr-plugin-streamdev/patches/vdr-plugin-streamdev-8719007-makefile.patch diff --git a/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta b/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta index a81e1f9f42..c6f3381df4 100644 --- a/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta +++ b/packages/3rdparty/multimedia/vdr-plugin-xvdr/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="vdr-plugin-xvdr" -PKG_VERSION="c98852f" +PKG_VERSION="b62ccbd" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-c98852f_receiver-and-recording-fixes.patch b/packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-c98852f_receiver-and-recording-fixes.patch deleted file mode 100644 index 059881585f..0000000000 --- a/packages/3rdparty/multimedia/vdr-plugin-xvdr/patches/vdr-plugin-xvdr-c98852f_receiver-and-recording-fixes.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff --git a/src/live/livepatfilter.c b/src/live/livepatfilter.c -index e811c8c..f1b94fd 100644 ---- a/src/live/livepatfilter.c -+++ b/src/live/livepatfilter.c -@@ -447,7 +447,7 @@ void cLivePatFilter::Process(u_short Pid, u_char Tid, const u_char *Data, int Le - } - } - -- m_Streamer->m_Receiver = new cLiveReceiver(m_Streamer, m_Channel->GetChannelID(), m_Streamer->m_Priority, m_Streamer->m_Pids); -+ m_Streamer->m_Receiver = new cLiveReceiver(m_Streamer, m_Channel, m_Streamer->m_Priority, m_Streamer->m_Pids); - m_Streamer->m_Device->AttachReceiver(m_Streamer->m_Receiver); - INFOLOG("Currently unknown new streams found, requesting stream change"); - m_Streamer->RequestStreamChange(); -diff --git a/src/live/livereceiver.c b/src/live/livereceiver.c -index 34f5ba8..528f65a 100644 ---- a/src/live/livereceiver.c -+++ b/src/live/livereceiver.c -@@ -27,10 +27,12 @@ - #include "livereceiver.h" - #include "livestreamer.h" - --cLiveReceiver::cLiveReceiver(cLiveStreamer *Streamer, tChannelID ChannelID, int Priority, const int *Pids) -- : cReceiver(ChannelID, Priority, 0, Pids) -+cLiveReceiver::cLiveReceiver(cLiveStreamer *Streamer, const cChannel *Channel, int Priority, const int *Pids) -+ : cReceiver(Channel, Priority) - , m_Streamer(Streamer) - { -+ AddPid(0); -+ AddPids(Pids); - DEBUGLOG("Starting live receiver"); - } - -diff --git a/src/live/livereceiver.h b/src/live/livereceiver.h -index 8d23522..2ccd8bf 100644 ---- a/src/live/livereceiver.h -+++ b/src/live/livereceiver.h -@@ -42,7 +42,7 @@ protected: - virtual void Receive(uchar *Data, int Length); - - public: -- cLiveReceiver(cLiveStreamer *Streamer, tChannelID ChannelID, int Priority, const int *Pids); -+ cLiveReceiver(cLiveStreamer *Streamer, const cChannel *Channel, int Priority, const int *Pids); - virtual ~cLiveReceiver(); - }; - -diff --git a/src/live/livestreamer.c b/src/live/livestreamer.c -index a2d6826..6bafc02 100644 ---- a/src/live/livestreamer.c -+++ b/src/live/livestreamer.c -@@ -406,7 +406,7 @@ bool cLiveStreamer::StreamChannel(const cChannel *channel, int priority, cxSocke - if (m_NumStreams > 0 && m_Socket) - { - DEBUGLOG("Creating new live Receiver"); -- m_Receiver = new cLiveReceiver(this, m_Channel->GetChannelID(), m_Priority, m_Pids); -+ m_Receiver = new cLiveReceiver(this, m_Channel, m_Priority, m_Pids); - m_PatFilter = new cLivePatFilter(this, m_Channel); - m_Device->AttachReceiver(m_Receiver); - m_Device->AttachFilter(m_PatFilter); -diff --git a/src/xvdr/xvdrclient.c b/src/xvdr/xvdrclient.c -index cea1af2..931ea61 100644 ---- a/src/xvdr/xvdrclient.c -+++ b/src/xvdr/xvdrclient.c -@@ -1572,7 +1572,7 @@ bool cXVDRClient::processRECORDINGS_GetList() /* OPCODE 102 */ - } - else - { -- recordingStart = recording->start; -+ recordingStart = recording->Start(); - } - } - DEBUGLOG("GRI: RC: recordingStart=%lu recordingDuration=%i", recordingStart, recordingDuration); -@@ -1584,10 +1584,10 @@ bool cXVDRClient::processRECORDINGS_GetList() /* OPCODE 102 */ - m_resp->add_U32(recordingDuration); - - // priority -- m_resp->add_U32(recording->priority); -+ m_resp->add_U32(recording->Priority()); - - // lifetime -- m_resp->add_U32(recording->lifetime); -+ m_resp->add_U32(recording->Lifetime()); - - // channel_name - m_resp->add_String(recording->Info()->ChannelName() ? m_toUTF8.Convert(recording->Info()->ChannelName()) : ""); diff --git a/packages/addons/service/multimedia/vdr-addon/addon b/packages/addons/service/multimedia/vdr-addon/addon index 43f5c08dbb..0ca96935c4 100755 --- a/packages/addons/service/multimedia/vdr-addon/addon +++ b/packages/addons/service/multimedia/vdr-addon/addon @@ -36,6 +36,8 @@ mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config 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/plugin cp -PR $BUILD/vdr-plugin-xvdr-*/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin @@ -49,6 +51,8 @@ mkdir -p $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 cp -PR $BUILD/rotorng-*/libvdr*.so.* $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 # ENABLED_PLUGINS="cardclient constcw sc-conax sc-cryptoworks sc-irdeto sc-nagra sc-seca sc-viaccess sc-videoguard2" # for plugin in $ENABLED_PLUGINS; do diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt index c6881845da..8bd9b85680 100644 --- a/packages/addons/service/multimedia/vdr-addon/changelog.txt +++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt @@ -1,6 +1,11 @@ 2.1.4 - added live plugin - added rotorng plugin +- added control plugin +- added epgsearch plugin +- update to vdr-iptv-0.5.2 +- update to vdr-plugin-streamdev-8719007 +- update to vdr-plugin-xvdr-b62ccbd 2.1.3 - adjust for fontconfig 2.9.0 diff --git a/packages/addons/service/multimedia/vdr-addon/config.plugins/remote.conf b/packages/addons/service/multimedia/vdr-addon/config.plugins/remote.conf new file mode 100644 index 0000000000..97a2c6068f --- /dev/null +++ b/packages/addons/service/multimedia/vdr-addon/config.plugins/remote.conf @@ -0,0 +1,31 @@ +KBD.Up 00000000001B5B41 +KBD.Down 00000000001B5B42 +KBD.Menu 000000000000006D +KBD.Ok 000000000000000D +KBD.Back 000000000000007F +KBD.Left 00000000001B5B44 +KBD.Right 00000000001B5B43 +KBD.Red 000000001B5B5B41 +KBD.Green 000000001B5B5B42 +KBD.Yellow 000000001B5B5B43 +KBD.Blue 000000001B5B5B44 +KBD.0 0000000000000030 +KBD.1 0000000000000031 +KBD.2 0000000000000032 +KBD.3 0000000000000033 +KBD.4 0000000000000034 +KBD.5 0000000000000035 +KBD.6 0000000000000036 +KBD.7 0000000000000037 +KBD.8 0000000000000038 +KBD.9 0000000000000039 +KBD.Info 0000000000000069 +KBD.FastFwd 0000001B5B31377E +KBD.FastRew 000000001B5B5B45 +KBD.Power 0000000000000070 +KBD.Volume+ 0000001B5B32347E +KBD.Volume- 0000001B5B32337E +KBD.Mute 0000001B5B32317E +KBD.User7 0000001B5B31387E +KBD.User8 0000001B5B31397E +KBD.User9 0000001B5B32307E diff --git a/packages/addons/service/multimedia/vdr-addon/config/settings.xml b/packages/addons/service/multimedia/vdr-addon/config/settings.xml index e43d403d96..7925ccdc3c 100644 --- a/packages/addons/service/multimedia/vdr-addon/config/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/config/settings.xml @@ -10,6 +10,9 @@ + + + diff --git a/packages/addons/service/multimedia/vdr-addon/meta b/packages/addons/service/multimedia/vdr-addon/meta index 909673fd33..936a5926ae 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" +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_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 8f4958241a..669fb0aa1d 100755 --- a/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start +++ b/packages/addons/service/multimedia/vdr-addon/source/bin/vdr.start @@ -72,6 +72,12 @@ fi if [ "$ENABLE_ROTORNG" == "true" ] ; then VDR_ARG="$VDR_ARG -P rotorng" fi +if [ "$ENABLE_CONTROL" == "true" ] ; then + VDR_ARG="$VDR_ARG -P 'control -p $CONTROL_PORT'" +fi +if [ "$ENABLE_EPGSEARCH" == "true" ] ; then + VDR_ARG="$VDR_ARG -P epgsearch" +fi # dynamite must be LAST loaded plugin if [ "$ENABLE_DYNAMITE" == "true" ] ; then VDR_ARG="$VDR_ARG -P dynamite" 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 841cfb087e..5b02809032 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 @@ -13,7 +13,10 @@ Enable plugin: live live: listen on ip live: listen on port + Enable plugin: control + control: listen on port Enable plugin: rotorng + Enable plugin: epgsearch Enable plugin: dynamite Enable softcam softcam plugin 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 572b7b32f4..1a2ed5e394 100644 --- a/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml +++ b/packages/addons/service/multimedia/vdr-addon/source/resources/settings.xml @@ -16,7 +16,10 @@ + + + diff --git a/packages/devel/libcap/build b/packages/devel/libcap/build index 9178c86cd3..0625934884 100755 --- a/packages/devel/libcap/build +++ b/packages/devel/libcap/build @@ -25,6 +25,8 @@ cd $PKG_BUILD +sed -i -e "/^PAM_CAP/s:=.*:= no:" Make.Rules + setup_toolchain host make CC=$HOST_CC -C libcap _makenames diff --git a/packages/mediacenter/xbmc-addon-vuplus/install b/packages/mediacenter/xbmc-addon-vuplus/install index 4c4edbcf0f..a539802b57 100755 --- a/packages/mediacenter/xbmc-addon-vuplus/install +++ b/packages/mediacenter/xbmc-addon-vuplus/install @@ -26,5 +26,5 @@ mkdir -p $INSTALL/usr/share/xbmc/addons/pvr.vuplus cp -PRf $PKG_BUILD/addons/pvr.vuplus/resources $INSTALL/usr/share/xbmc/addons/pvr.vuplus cp -Pf $PKG_BUILD/addons/pvr.vuplus/addon.xml $INSTALL/usr/share/xbmc/addons/pvr.vuplus cp -Pf $PKG_BUILD/addons/pvr.vuplus/XBMC_vuplus.pvr $INSTALL/usr/share/xbmc/addons/pvr.vuplus - cp -Pf $PKG_BUILD/addons/pvr.vuplus/changelog $INSTALL/usr/share/xbmc/addons/pvr.vuplus + cp -Pf $PKG_BUILD/addons/pvr.vuplus/changelog.txt $INSTALL/usr/share/xbmc/addons/pvr.vuplus cp -Pf $PKG_BUILD/addons/pvr.vuplus/icon.png $INSTALL/usr/share/xbmc/addons/pvr.vuplus diff --git a/packages/mediacenter/xbmc-addon-vuplus/meta b/packages/mediacenter/xbmc-addon-vuplus/meta index d1837812c5..5dfb36215a 100644 --- a/packages/mediacenter/xbmc-addon-vuplus/meta +++ b/packages/mediacenter/xbmc-addon-vuplus/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="xbmc-addon-vuplus" -PKG_VERSION="72b8840" +PKG_VERSION="7151aa1" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL"