[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-satip/, media-plugins/vdr-satip/files/

[Joerg Bornkessel]

commit:     ad6d1c2f37145ba24dce788b556827893ea7d4b5
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 27 11:10:31 2016 +0000
Commit:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 11:10:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad6d1c2f

media-plugins/vdr-satip: fixed gcc-6 compile; wrt bug 594170

Package-Manager: portage-2.3.0

 .../vdr-satip/files/vdr-satip-2.2.3_c++11.patch    | 28 ++++++++++++++++++
 media-plugins/vdr-satip/vdr-satip-2.2.3-r1.ebuild  | 33 ++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/media-plugins/vdr-satip/files/vdr-satip-2.2.3_c++11.patch b/media-plugins/vdr-satip/files/vdr-satip-2.2.3_c++11.patch
new file mode 100644
index 00000000..102e8e9
--- /dev/null
+++ b/media-plugins/vdr-satip/files/vdr-satip-2.2.3_c++11.patch
@@ -0,0 +1,28 @@
+common.h still use function typeof,
+this was never defined part of c++ and is
+not supported in c++11 anymore
+so we revert back to gnu++03 as it is not fixed by upstream
+Signed-of-by: Joerg Bornkessel <hd_brummy@g.o> (2016/aug/01)
+diff -Naur satip-2.2.3.orig/Makefile satip-2.2.3/Makefile
+--- satip-2.2.3.orig/Makefile	2016-08-03 23:17:36.769080128 +0200
++++ satip-2.2.3/Makefile	2016-08-03 23:18:36.399080128 +0200
+@@ -32,6 +32,7 @@
+ 
+ export CFLAGS   = $(call PKGCFG,cflags)
+ export CXXFLAGS = $(call PKGCFG,cxxflags)
++export CXXFLAGS += -std=gnu++03
+ STRIP = true
+ 
+ ### The version number of VDR's plugin API:
+diff -Naur satip-2.2.3.orig/common.h satip-2.2.3/common.h
+--- satip-2.2.3.orig/common.h	2016-08-07 02:54:27.290440336 +0200
++++ satip-2.2.3/common.h	2016-08-07 02:54:53.193773669 +0200
+@@ -52,7 +52,7 @@
+   do {                                                       \
+      if (exp) {                                              \
+         char tmp[64];                                        \
+-        esyslog("[%s,%d]: "errstr": %s", __FILE__, __LINE__, \
++        esyslog("[%s,%d]: " errstr ": %s", __FILE__, __LINE__, \
+                 strerror_r(errno, tmp, sizeof(tmp)));        \
+         func;                                                \
+         ret;                                                 \

diff --git a/media-plugins/vdr-satip/vdr-satip-2.2.3-r1.ebuild b/media-plugins/vdr-satip/vdr-satip-2.2.3-r1.ebuild
new file mode 100644
index 00000000..b27b7df
--- /dev/null
+++ b/media-plugins/vdr-satip/vdr-satip-2.2.3-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: integrates SAT>IP network devices seamlessly into VDR"
+HOMEPAGE="http://www.saunalahti.fi/~rahrenbe/vdr/satip/"
+SRC_URI="http://www.saunalahti.fi/~rahrenbe/vdr/satip/files/${P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=media-video/vdr-2.2.0
+		>=net-misc/curl-7.36
+		|| ( dev-libs/tinyxml
+			dev-libs/pugixml )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	vdr-plugin-2_src_prepare
+
+	# c++11 compile fix
+	eapply "${FILESDIR}/${P}_c++11.patch"
+
+	if has_version "dev-libs/tinyxml" ; then
+		sed -e "s:#SATIP_USE_TINYXML:SATIP_USE_TINYXML:" -i Makefile
+	fi
+}