diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-20 17:32:11 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-20 17:32:11 +0000 |
commit | 159ea58168325ffd53133e9fe9b0943bb2dab428 (patch) | |
tree | 4f78adfc2bdda7a229227e036d5c1b3ae5bea1a6 /media-libs/gd | |
parent | x86 stable wrt bug #318509 (diff) | |
download | gentoo-2-159ea58168325ffd53133e9fe9b0943bb2dab428.tar.gz gentoo-2-159ea58168325ffd53133e9fe9b0943bb2dab428.tar.bz2 gentoo-2-159ea58168325ffd53133e9fe9b0943bb2dab428.zip |
Try libpng14-config and -lpng14 before falling back to libpng-config and -lpng. This is working around issues in "prefix" picking up libpng12-config from host over libpng14-config from "prefix".
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/gd')
-rw-r--r-- | media-libs/gd/ChangeLog | 7 | ||||
-rw-r--r-- | media-libs/gd/gd-2.0.35-r1.ebuild | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/media-libs/gd/ChangeLog b/media-libs/gd/ChangeLog index caded3be24c5..8d04f7fdebbc 100644 --- a/media-libs/gd/ChangeLog +++ b/media-libs/gd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/gd # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.62 2010/03/08 09:42:43 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/ChangeLog,v 1.63 2010/05/20 17:32:11 ssuominen Exp $ + + 20 May 2010; Samuli Suominen <ssuominen@gentoo.org> gd-2.0.35-r1.ebuild: + Try libpng14-config and -lpng14 before falling back to libpng-config and + -lpng. This is working around issues in "prefix" picking up + libpng12-config from host over libpng-config from "prefix". 08 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> gd-2.0.35-r1.ebuild, +files/gd-2.0.35-libpng14.patch: diff --git a/media-libs/gd/gd-2.0.35-r1.ebuild b/media-libs/gd/gd-2.0.35-r1.ebuild index 71ee7679d24b..bf2bd81a75ca 100644 --- a/media-libs/gd/gd-2.0.35-r1.ebuild +++ b/media-libs/gd/gd-2.0.35-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild,v 1.9 2010/03/08 20:14:28 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.0.35-r1.ebuild,v 1.10 2010/05/20 17:32:11 ssuominen Exp $ inherit autotools @@ -26,6 +26,12 @@ src_unpack() { epatch "${FILESDIR}"/${P}-libpng14.patch \ "${FILESDIR}"/${P}-maxcolors.patch + # Try libpng14 first, then fallback to plain libpng + sed -i \ + -e 's/libpng12-config/libpng14-config/g' \ + -e 's/-lpng12/-lpng14/' \ + configure.ac || die + eautoconf find . -type f -print0 | xargs -0 touch -r configure } |