From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- media-plugins/vdr-osdserver/files/confd | 6 ++ .../vdr-osdserver/files/osdserverhosts.conf | 14 ++++ media-plugins/vdr-osdserver/files/rc-addon.sh | 10 +++ .../files/vdr-osdserver-0.1.1-gentoo.diff | 16 ++++ .../files/vdr-osdserver-0.1.3_gcc-6.patch | 85 ++++++++++++++++++++++ 5 files changed, 131 insertions(+) create mode 100644 media-plugins/vdr-osdserver/files/confd create mode 100644 media-plugins/vdr-osdserver/files/osdserverhosts.conf create mode 100644 media-plugins/vdr-osdserver/files/rc-addon.sh create mode 100644 media-plugins/vdr-osdserver/files/vdr-osdserver-0.1.1-gentoo.diff create mode 100644 media-plugins/vdr-osdserver/files/vdr-osdserver-0.1.3_gcc-6.patch (limited to 'media-plugins/vdr-osdserver/files') diff --git a/media-plugins/vdr-osdserver/files/confd b/media-plugins/vdr-osdserver/files/confd new file mode 100644 index 000000000000..d1f4e888bec2 --- /dev/null +++ b/media-plugins/vdr-osdserver/files/confd @@ -0,0 +1,6 @@ +# /etc/conf.d/vdr.osdserver + +### Listening port for osdserver plugin +# default: 2010 +#OSDSERVER_PORT="2010" + diff --git a/media-plugins/vdr-osdserver/files/osdserverhosts.conf b/media-plugins/vdr-osdserver/files/osdserverhosts.conf new file mode 100644 index 000000000000..845c27697e6a --- /dev/null +++ b/media-plugins/vdr-osdserver/files/osdserverhosts.conf @@ -0,0 +1,14 @@ +# +# osdserverhosts This file describes a number of host addresses that +# are allowed to connect to the osdserver pluging +# with the Video Disk Recorder (VDR) on this system. +# Syntax: +# +# IP-Address[/Netmask] +# + +127.0.0.1 # always accept localhost +#192.168.1.0/24 # any host on the local net +#204.152.189.113 # a specific host +#0.0.0.0/0 # any host on any net (USE THIS WITH CARE!) + diff --git a/media-plugins/vdr-osdserver/files/rc-addon.sh b/media-plugins/vdr-osdserver/files/rc-addon.sh new file mode 100644 index 000000000000..17dc986b650c --- /dev/null +++ b/media-plugins/vdr-osdserver/files/rc-addon.sh @@ -0,0 +1,10 @@ +# +# rc-addon plugin-startup-skript for vdr-osdserver +# +# zulio + +plugin_pre_vdr_start() { + + add_plugin_param "-p ${OSDSERVER_PORT:=2010}" +} + diff --git a/media-plugins/vdr-osdserver/files/vdr-osdserver-0.1.1-gentoo.diff b/media-plugins/vdr-osdserver/files/vdr-osdserver-0.1.1-gentoo.diff new file mode 100644 index 000000000000..3d6fea51ac89 --- /dev/null +++ b/media-plugins/vdr-osdserver/files/vdr-osdserver-0.1.1-gentoo.diff @@ -0,0 +1,16 @@ +change the default path for config directory +zulio (at) zulinux.net + +diff -Naur osdserver-0.1.1.orig/osdserver.c osdserver-0.1.1/osdserver.c +--- osdserver-0.1.1.orig/osdserver.c 2007-10-07 00:34:47.000000000 +0200 ++++ osdserver-0.1.1/osdserver.c 2007-11-30 20:05:54.000000000 +0100 +@@ -72,7 +72,7 @@ + + bool cPluginOsdServer::Initialize() { + // Initialize any background activities the plugin shall perform. +- cString OsdServerHosts = AddDirectory(cPlugin::ConfigDirectory(), "osdserverhosts.conf"); ++ cString OsdServerHosts = AddDirectory(cPlugin::ConfigDirectory(), "osdserver/osdserverhosts.conf"); + if (access(OsdServerHosts, F_OK) == 0) + Server = new cServer(Port, OsdServerHosts); + else + diff --git a/media-plugins/vdr-osdserver/files/vdr-osdserver-0.1.3_gcc-6.patch b/media-plugins/vdr-osdserver/files/vdr-osdserver-0.1.3_gcc-6.patch new file mode 100644 index 000000000000..d5819c523cba --- /dev/null +++ b/media-plugins/vdr-osdserver/files/vdr-osdserver-0.1.3_gcc-6.patch @@ -0,0 +1,85 @@ +fix compile gcc-6 +fix some minor deprecated warnings +https://bugs.gentoo.org/show_bug.cgi?id=594796 +Signed-of-by: Joerg Bornkessel (2016/Oct/16) + +diff -Naur osdserver-0.1.3.orig/Makefile osdserver-0.1.3/Makefile +--- osdserver-0.1.3.orig/Makefile 2016-10-16 19:17:32.425111158 +0200 ++++ osdserver-0.1.3/Makefile 2016-10-16 19:17:52.079111158 +0200 +@@ -48,7 +48,7 @@ + + INCLUDES += -I$(VDRDIR)/include + +-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DPLUGINVERSION='"$(VERSION)"' ++DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DPLUGINVERSION='"$(VERSION)"' -D__STL_CONFIG_H + + ### The object files (add further files here): + +diff -Naur osdserver-0.1.3.orig/interpreter.c osdserver-0.1.3/interpreter.c +--- osdserver-0.1.3.orig/interpreter.c 2016-10-16 19:17:32.426111158 +0200 ++++ osdserver-0.1.3/interpreter.c 2016-10-16 19:12:05.000000000 +0200 +@@ -1347,7 +1347,7 @@ + return true; + } + +- timeout=min(ms,100); ++ timeout=std::min(ms,100); + return false; + } + +diff -Naur osdserver-0.1.3.orig/tools.h osdserver-0.1.3/tools.h +--- osdserver-0.1.3.orig/tools.h 2016-10-16 19:17:32.425111158 +0200 ++++ osdserver-0.1.3/tools.h 2016-10-16 19:06:13.000000000 +0200 +@@ -2,6 +2,7 @@ + #define __OSDSERVER_TOOLS_H + + #include ++#include + + #include + #include +@@ -40,19 +41,19 @@ + void SetRead(int fd) { + if (fd >= 0 && fd < FD_SETSIZE) { + FD_SET(fd,&readfds); +- fdmax=max(fd,fdmax); ++ fdmax=std::max(fd,fdmax); + } + } + void SetWrite(int fd) { + if (fd >= 0 && fd < FD_SETSIZE) { + FD_SET(fd,&writefds); +- fdmax=max(fd,fdmax); ++ fdmax=std::max(fd,fdmax); + } + } + void SetExcept(int fd) { + if (fd >= 0 && fd < FD_SETSIZE) { + FD_SET(fd,&exceptfds); +- fdmax=max(fd,fdmax); ++ fdmax=std::max(fd,fdmax); + } + } + void ClearRead(int fd) { +diff -Naur osdserver-0.1.3.orig/osdobjects.h osdserver-0.1.3/osdobjects.h +--- osdserver-0.1.3.orig/osdobjects.h 2016-10-16 19:28:22.987111158 +0200 ++++ osdserver-0.1.3/osdobjects.h 2016-10-16 19:29:19.946111158 +0200 +@@ -56,12 +56,12 @@ + } + + // Make some protected stuff public +- cOsdMenu::SetTitle; +- cOsdMenu::SetCurrent; +- cOsdMenu::SetCols; +- cOsdMenu::Del; +- cOsdMenu::HasSubMenu; +- cOsdMenu::CloseSubMenu; ++ using cOsdMenu::SetTitle; ++ using cOsdMenu::SetCurrent; ++ using cOsdMenu::SetCols; ++ using cOsdMenu::Del; ++ using cOsdMenu::HasSubMenu; ++ using cOsdMenu::CloseSubMenu; + }; + friend class cPrivateMenu; + friend class cPrivate; -- cgit v1.2.3