summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-12-23 11:01:42 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-12-23 11:01:42 +0000
commit32a046b90d05286c4ad6fa05ad4259ab37d7ebe8 (patch)
treeea651d51f393f598925dc33fc44aa508e6b22d22 /media-video/dvdstyler
parentAdded missing dep on x11-libs/libXaw (diff)
downloadgentoo-2-32a046b90d05286c4ad6fa05ad4259ab37d7ebe8.tar.gz
gentoo-2-32a046b90d05286c4ad6fa05ad4259ab37d7ebe8.tar.bz2
gentoo-2-32a046b90d05286c4ad6fa05ad4259ab37d7ebe8.zip
Fix building with FFmpeg >= 0.9 wrt #395793 by Helmut Jarausch
(Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
Diffstat (limited to 'media-video/dvdstyler')
-rw-r--r--media-video/dvdstyler/ChangeLog5
-rw-r--r--media-video/dvdstyler/dvdstyler-2.1.ebuild6
2 files changed, 9 insertions, 2 deletions
diff --git a/media-video/dvdstyler/ChangeLog b/media-video/dvdstyler/ChangeLog
index fa92bcf9a3cd..8fe9eb01a755 100644
--- a/media-video/dvdstyler/ChangeLog
+++ b/media-video/dvdstyler/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-video/dvdstyler
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.51 2011/12/22 21:27:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/ChangeLog,v 1.52 2011/12/23 11:01:42 ssuominen Exp $
+
+ 23 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> dvdstyler-2.1.ebuild:
+ Fix building with FFmpeg >= 0.9 wrt #395793 by Helmut Jarausch
22 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
-dvdstyler-2.0_rc1.ebuild, -dvdstyler-2.0_rc2.ebuild:
diff --git a/media-video/dvdstyler/dvdstyler-2.1.ebuild b/media-video/dvdstyler/dvdstyler-2.1.ebuild
index c1a6edc7cb64..6f86c120ea1a 100644
--- a/media-video/dvdstyler/dvdstyler-2.1.ebuild
+++ b/media-video/dvdstyler/dvdstyler-2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-2.1.ebuild,v 1.2 2011/12/22 21:27:18 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvdstyler/dvdstyler-2.1.ebuild,v 1.3 2011/12/23 11:01:42 ssuominen Exp $
EAPI=4
@@ -46,6 +46,10 @@ src_prepare() {
sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die
sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die #367863
+
+ if has_version ">=media-video/ffmpeg-0.9"; then
+ sed -i -e '/^#i/s:vsink_buffer:buffersink:' src/mediatrc_ffmpeg.cpp || die #395793
+ fi
}
src_configure() {