[gentoo-commits] repo/gentoo:master commit in: media-plugins/vdr-mp3ng/

[Joerg Bornkessel]

commit:     3a059ddca5381eb7769adb3e63719e58b89f4945
Author:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 30 06:11:17 2016 +0000
Commit:     Joerg Bornkessel <hd_brummy <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 06:11:17 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a059ddc

media-plugins/vdr-mp3ng: fix gcc-6 compile, wrt bug 595248; fix compile >=vdr-2.1.2

Package-Manager: portage-2.3.0

 media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5.ebuild | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5.ebuild b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5.ebuild
index 1972d64..ce1d732 100644
--- a/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5.ebuild
+++ b/media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-inherit vdr-plugin-2
+inherit vdr-plugin-2 flag-o-matic
 
 MY_PV=0.9.13-MKIV-pre3
 MY_P=${PN}-${MY_PV}
@@ -34,6 +34,9 @@ DEPEND=">=media-video/vdr-1.6
 src_prepare() {
 	vdr-plugin-2_src_prepare
 
+	# wrt bug 595248
+	append-cxxflags $(test-flags-CXX -std=gnu++03) -std=gnu++03
+
 	epatch "${FILESDIR}/${PN}-0.0.1_pre4-gentoo.diff"
 	epatch "${FILESDIR}/${PN}-0.0.1_pre4-gcc4.diff"
 	epatch "${DISTDIR}/${PN}-0.0.1_pre4-span-0.0.3.diff.tar.gz"
@@ -50,6 +53,10 @@ src_prepare() {
 	has_version ">=media-gfx/imagemagick-6.4" && epatch "${FILESDIR}/imagemagick-6.4.x.diff"
 
 	sed -i mp3ng.c -e "s:RegisterI18n:// RegisterI18n:"
+
+	if has_version ">=media-video/vdr-2.1.2"; then
+		sed -e "s#VideoDirectory#cVideoDirectory::Name\(\)#" -i decoder.c
+	fi
 }
 
 src_install() {