diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-04-10 14:16:02 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-04-10 14:16:02 +0000 |
| commit | 38a86c39ceb7a1ca1fc93fceea88a1157d466037 (patch) | |
| tree | 82a6b7edb48c05fd6b36deb338a034fc3bd45ef6 /media-video | |
| parent | Update / fix to 0.5_pre2306-r2 subsequent to migrating deps (diff) | |
| download | gentoo-2-38a86c39ceb7a1ca1fc93fceea88a1157d466037.tar.gz gentoo-2-38a86c39ceb7a1ca1fc93fceea88a1157d466037.tar.bz2 gentoo-2-38a86c39ceb7a1ca1fc93fceea88a1157d466037.zip | |
Fix building with USE="graphicsmagick" wrt #459976 by Erik Zeek, Andrew John Hughes, and others.
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/dvdauthor/ChangeLog | 8 | ||||
| -rw-r--r-- | media-video/dvdauthor/dvdauthor-0.7.1.ebuild | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/media-video/dvdauthor/ChangeLog b/media-video/dvdauthor/ChangeLog index 6c7e9707cc8a..61bb83b8903a 100644 --- a/media-video/dvdauthor/ChangeLog +++ b/media-video/dvdauthor/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/dvdauthor -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.50 2012/11/21 00:41:22 aballier Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/ChangeLog,v 1.51 2013/04/10 14:16:02 ssuominen Exp $ + + 10 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> dvdauthor-0.7.1.ebuild: + Fix building with USE="graphicsmagick" wrt #459976 by Erik Zeek, Andrew John + Hughes, and others. *dvdauthor-0.7.1 (21 Nov 2012) diff --git a/media-video/dvdauthor/dvdauthor-0.7.1.ebuild b/media-video/dvdauthor/dvdauthor-0.7.1.ebuild index e6bde9de5419..2331dd08ebc7 100644 --- a/media-video/dvdauthor/dvdauthor-0.7.1.ebuild +++ b/media-video/dvdauthor/dvdauthor-0.7.1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.7.1.ebuild,v 1.1 2012/11/21 00:41:22 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/dvdauthor/dvdauthor-0.7.1.ebuild,v 1.2 2013/04/10 14:16:02 ssuominen Exp $ -EAPI=4 +EAPI=5 inherit eutils flag-o-matic toolchain-funcs DESCRIPTION="Tools for generating DVD files to be played on standalone DVD players" @@ -18,7 +18,7 @@ RDEPEND=">=dev-libs/fribidi-0.19.2 dev-libs/libxml2 >=media-libs/freetype-2 media-libs/libdvdread - media-libs/libpng + media-libs/libpng:0= graphicsmagick? ( media-gfx/graphicsmagick ) !graphicsmagick? ( >=media-gfx/imagemagick-5.5.7.14 )" DEPEND="${RDEPEND} @@ -34,6 +34,8 @@ src_prepare() { } src_configure() { + use graphicsmagick && \ + append-cppflags "$($(tc-getPKG_CONFIG) --cflags GraphicsMagick)" #459976 append-cppflags "$($(tc-getPKG_CONFIG) --cflags fribidi)" #417041 econf } |