summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Bornkessel <hd_brummy@gentoo.org>2016-09-30 08:11:17 +0200
committerJoerg Bornkessel <hd_brummy@gentoo.org>2016-09-30 08:11:17 +0200
commit3a059ddca5381eb7769adb3e63719e58b89f4945 (patch)
treeebdab8fac8f3d37adb9c21f4d75f3bd4ee78695e
parentdev-ruby/rubygems: add 2.6.7 (diff)
downloadgentoo-3a059ddc.tar.gz
gentoo-3a059ddc.tar.bz2
gentoo-3a059ddc.zip
media-plugins/vdr-mp3ng: fix gcc-6 compile, wrt bug 595248; fix compile >=vdr-2.1.2
Package-Manager: portage-2.3.0
-rw-r--r--media-plugins/vdr-mp3ng/vdr-mp3ng-0.0.1_pre5.ebuild11
1 files 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 1972d646c6b1..ce1d73290342 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() {