commit: 30e42354a43d8bfa200bc7c38add38401c3e9463 Author: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> AuthorDate: Sun Oct 16 17:47:10 2016 +0000 Commit: Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org> CommitDate: Sun Oct 16 17:47:56 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30e42354
media-plugins/vdr-osdserver: compile fix gcc-6; some minor compile warnings fixed; Description lenght fixed; wrt bug 594796 Package-Manager: portage-2.3.0 media-plugins/vdr-osdserver/Manifest | 1 + .../files/vdr-osdserver-0.1.3_gcc-6.patch | 85 ++++++++++++++++++++++ .../vdr-osdserver/vdr-osdserver-0.1.2.ebuild | 4 +- ...ver-0.1.2.ebuild => vdr-osdserver-0.1.3.ebuild} | 15 ++-- 4 files changed, 96 insertions(+), 9 deletions(-) diff --git a/media-plugins/vdr-osdserver/Manifest b/media-plugins/vdr-osdserver/Manifest index 675e7dc..5b3eda3 100644 --- a/media-plugins/vdr-osdserver/Manifest +++ b/media-plugins/vdr-osdserver/Manifest @@ -1 +1,2 @@ DIST vdr-osdserver-0.1.2.tgz 47649 SHA256 7bfd0a2733034ff10d439079879629583920716aee26a32e2d6cc7b5d38eb42b SHA512 706a2a1484f3182db2d6d1f83560e0c43d9613c0f537ebb4b254fe1de6cc4bad5c044a1b74f02e55067e7c4c0e10c8086758359edd92fe02f5a01013e2717f97 WHIRLPOOL 3c0e19e96c243a1487a915c9d2cfea3e4668de02c80b37ae4f49e3e882a951145baf7c08a9123d7d423e49d09f3fddee9ad458474cd8556e20b3d513c9b22c7a +DIST vdr-osdserver-0.1.3.tgz 48073 SHA256 b41b0930c793c302378a6ce734d10377fc59021b594c426fa1eff255cfb10620 SHA512 976f61186ed3eb395c3ee2e2bc04b89fe04915a72ae1c70f601cffa134d3f6811feaa233a0dd285c34861389556a27c1ceffcfcc6474ff17581d5f81c8a88acb WHIRLPOOL d712adde60f345599af9320d25d5667125af199c49bca39560ac54d9e7acf9fec1a0d71e14168240fcf4b8e6263536cb45ce2c5b9d5e52aa0eebaa0ff3693e44 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 00000000..d5819c5 --- /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 <hd_bru...@gentoo.org> (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 <ctype.h> ++#include <algorithm> + + #include <vdr/tools.h> + #include <vdr/remote.h> +@@ -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; diff --git a/media-plugins/vdr-osdserver/vdr-osdserver-0.1.2.ebuild b/media-plugins/vdr-osdserver/vdr-osdserver-0.1.2.ebuild index c01d44a..9497fbe 100644 --- a/media-plugins/vdr-osdserver/vdr-osdserver-0.1.2.ebuild +++ b/media-plugins/vdr-osdserver/vdr-osdserver-0.1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=5 inherit vdr-plugin-2 -DESCRIPTION="VDR plugin: VDR OSD access for external programs through a TCP/IP socket connection" +DESCRIPTION="VDR plugin: VDR OSD access for ext. programs through a TCP/IP socket connection" HOMEPAGE="http://www.udo-richter.de/vdr/osdserver.en.html"; SRC_URI=" http://www.udo-richter.de/vdr/files/${P}.tgz"; diff --git a/media-plugins/vdr-osdserver/vdr-osdserver-0.1.2.ebuild b/media-plugins/vdr-osdserver/vdr-osdserver-0.1.3.ebuild similarity index 67% copy from media-plugins/vdr-osdserver/vdr-osdserver-0.1.2.ebuild copy to media-plugins/vdr-osdserver/vdr-osdserver-0.1.3.ebuild index c01d44a..35ad84e 100644 --- a/media-plugins/vdr-osdserver/vdr-osdserver-0.1.2.ebuild +++ b/media-plugins/vdr-osdserver/vdr-osdserver-0.1.3.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit vdr-plugin-2 -DESCRIPTION="VDR plugin: VDR OSD access for external programs through a TCP/IP socket connection" +DESCRIPTION="VDR plugin: VDR OSD access for ext. programs through a TCP/IP socket connection" HOMEPAGE="http://www.udo-richter.de/vdr/osdserver.en.html"; SRC_URI=" http://www.udo-richter.de/vdr/files/${P}.tgz"; @@ -15,19 +15,20 @@ LICENSE="GPL-2" KEYWORDS="~x86 ~amd64" IUSE="" -DEPEND=">=media-video/vdr-1.4.6" +DEPEND=">=media-video/vdr-1.7.20" RDEPEND="" -PATCHES=( ${FILESDIR}/${PN}-0.1.1-gentoo.diff ) +PATCHES=( "${FILESDIR}/${PN}-0.1.1-gentoo.diff" + "${FILESDIR}/${P}_gcc-6.patch" ) + +DOCS="examples/* README README.PERL-MODULE HISTORY" src_install() { vdr-plugin-2_src_install insinto /etc/vdr/plugins/osdserver doins "${FILESDIR}"/osdserverhosts.conf - - dodoc examples/* } pkg_postinst() {
