diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-08-12 15:46:37 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-08-12 15:46:37 +0000 |
| commit | ac58d38a8a845ff8a10d71e98322e143af073356 (patch) | |
| tree | 68d24dd5e50905a103995b58cf0e4f6ca66d7fdb /media-gfx | |
| parent | Fix up depends (diff) | |
| download | gentoo-2-ac58d38a8a845ff8a10d71e98322e143af073356.tar.gz gentoo-2-ac58d38a8a845ff8a10d71e98322e143af073356.tar.bz2 gentoo-2-ac58d38a8a845ff8a10d71e98322e143af073356.zip | |
Seems the -libpng15.patch isn't entirely compatible with libpng14, apply workaround from bug #378677
(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/enblend/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/enblend/enblend-4.0.ebuild | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/media-gfx/enblend/ChangeLog b/media-gfx/enblend/ChangeLog index d1d5ea2b22aa..6aa5c4004bf6 100644 --- a/media-gfx/enblend/ChangeLog +++ b/media-gfx/enblend/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/enblend # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.45 2011/08/07 15:56:20 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/ChangeLog,v 1.46 2011/08/12 15:46:37 ssuominen Exp $ + + 12 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> enblend-4.0.ebuild: + Seems the -libpng15.patch isn't entirely compatible with libpng14, apply + workaround from bug #378677 07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> enblend-4.0.ebuild, +files/enblend-4.0-libpng15.patch: diff --git a/media-gfx/enblend/enblend-4.0.ebuild b/media-gfx/enblend/enblend-4.0.ebuild index a77f1b810d62..2b21f3e592b0 100644 --- a/media-gfx/enblend/enblend-4.0.ebuild +++ b/media-gfx/enblend/enblend-4.0.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-gfx/enblend/enblend-4.0.ebuild,v 1.9 2011/08/07 15:56:20 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/enblend/enblend-4.0.ebuild,v 1.10 2011/08/12 15:46:37 ssuominen Exp $ EAPI=2 @@ -43,7 +43,11 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${P}-libpng1{4,5}.patch + epatch "${FILESDIR}"/${P}-libpng14.patch + + # 378677, temp workaround + has_version ">=media-libs/libpng-1.5" && epatch \ + "${FILESDIR}"/${P}-libpng15.patch } src_configure() { |