diff --git a/packages/multimedia/vdr-control/package.mk b/packages/multimedia/vdr-control/package.mk deleted file mode 100644 index 89bdcfd95d..0000000000 --- a/packages/multimedia/vdr-control/package.mk +++ /dev/null @@ -1,55 +0,0 @@ -################################################################################ -# This file is part of OpenELEC - http://www.openelec.tv -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) -# -# OpenELEC 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 of the License, or -# (at your option) any later version. -# -# OpenELEC 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. If not, see . -################################################################################ - -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_SOURCE_DIR="control-${PKG_VERSION}" -PKG_DEPENDS_TARGET="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" - -pre_configure_target() { - export CFLAGS="$CFLAGS -fPIC" - export CXXFLAGS="$CXXFLAGS -fPIC" - export LDFLAGS="$LDFLAGS -fPIC" -} - -make_target() { - VDR_DIR=$(get_build_dir vdr) - make VDRDIR=$VDR_DIR \ - LIBDIR="." \ - LOCALEDIR="./locale" -} - -post_make_target() { - $STRIP libvdr-*.so* -} - -makeinstall_target() { - : # installation not needed, done by create-addon script -} diff --git a/packages/multimedia/vdr-control/patches/vdr-control-0.0.2a-01_Makefile-fPIC-fix.patch b/packages/multimedia/vdr-control/patches/vdr-control-0.0.2a-01_Makefile-fPIC-fix.patch deleted file mode 100644 index 3380b8fcb1..0000000000 --- a/packages/multimedia/vdr-control/patches/vdr-control-0.0.2a-01_Makefile-fPIC-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -#!/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/multimedia/vdr-control/patches/vdr-control-0.0.2a-02_gateway.patch b/packages/multimedia/vdr-control/patches/vdr-control-0.0.2a-02_gateway.patch deleted file mode 100644 index 5f46c18b9c..0000000000 --- a/packages/multimedia/vdr-control/patches/vdr-control-0.0.2a-02_gateway.patch +++ /dev/null @@ -1,31 +0,0 @@ -#! /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/multimedia/vdr-control/patches/vdr-control-0.0.2a-92_control-1.3.18.patch b/packages/multimedia/vdr-control/patches/vdr-control-0.0.2a-92_control-1.3.18.patch deleted file mode 100644 index 0e6a100f24..0000000000 --- a/packages/multimedia/vdr-control/patches/vdr-control-0.0.2a-92_control-1.3.18.patch +++ /dev/null @@ -1,35 +0,0 @@ -#!/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/multimedia/vdr-control/patches/vdr-control-0.0.2a-93_control-0.0.2a-1.5.0.patch b/packages/multimedia/vdr-control/patches/vdr-control-0.0.2a-93_control-0.0.2a-1.5.0.patch deleted file mode 100644 index a7ebfe3a2a..0000000000 --- a/packages/multimedia/vdr-control/patches/vdr-control-0.0.2a-93_control-0.0.2a-1.5.0.patch +++ /dev/null @@ -1,73 +0,0 @@ -#! /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/multimedia/vdr-control/patches/vdr-control-0.0.2a-94_gcc-4.4.patch b/packages/multimedia/vdr-control/patches/vdr-control-0.0.2a-94_gcc-4.4.patch deleted file mode 100644 index 09292c75d8..0000000000 --- a/packages/multimedia/vdr-control/patches/vdr-control-0.0.2a-94_gcc-4.4.patch +++ /dev/null @@ -1,28 +0,0 @@ -#! /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/multimedia/vdr-control/patches/vdr-control-0.0.2a-95_vdr-crash-fix.patch b/packages/multimedia/vdr-control/patches/vdr-control-0.0.2a-95_vdr-crash-fix.patch deleted file mode 100644 index 9ae0c7a052..0000000000 --- a/packages/multimedia/vdr-control/patches/vdr-control-0.0.2a-95_vdr-crash-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -Nru control-0.0.2a-kw3/control.c control-0.0.2a-kw3_0/control.c ---- control-0.0.2a-kw3/control.c 2008-09-26 16:19:29.000000000 +0200 -+++ control-0.0.2a-kw3_0/control.c 2012-08-04 12:17:08.000000000 +0200 -@@ -32,6 +32,7 @@ - class cPluginControl : public cPlugin { - private: - // Add any member variables or functions you may need here. -+ cCtrlState* _pState; - cCtrlGateways* _pReceivers; - cCtrlGateway* _pTerminal; - -@@ -67,6 +68,7 @@ - cPluginControl::~cPluginControl() - { - // Clean up after yourself! -+ delete(_pState); - delete(_pReceivers); - delete(_pTerminal); - } -@@ -120,7 +122,7 @@ - // Start any background activities the plugin shall perform. - - if (glParPort || glParTerminal && *glParTerminal) -- new cCtrlState(); -+ _pState = new cCtrlState(); - - if (glParPort) { - _pReceivers = new cCtrlGateways(); diff --git a/packages/multimedia/vdr-control/patches/vdr-control-0.0.2a-96_makefile_apiversion.patch b/packages/multimedia/vdr-control/patches/vdr-control-0.0.2a-96_makefile_apiversion.patch deleted file mode 100644 index 09873e52a6..0000000000 --- a/packages/multimedia/vdr-control/patches/vdr-control-0.0.2a-96_makefile_apiversion.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/Makefile b/Makefile -index 65a7674..1a5976e 100644 ---- a/Makefile -+++ b/Makefile -@@ -31,7 +31,7 @@ TMPDIR = /tmp - - ### The version number of VDR (taken from VDR's "config.h"): - --VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') -+APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') - - ### The name of the distribution archive: - -@@ -54,7 +54,7 @@ all: libvdr-$(PLUGIN).so - - libvdr-$(PLUGIN).so: $(OBJS) - $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ -- @cp $@ $(LIBDIR)/$@.$(VDRVERSION) -+ @cp $@ $(LIBDIR)/$@.$(APIVERSION) - - dist: clean - @-rm -rf $(TMPDIR)/$(ARCHIVE)