From: Mike Frysinger Date: Tue, 3 Jan 2012 01:36:12 +0000 (+0000) Subject: Disable internal jpeg/z depends on tiff #395753 by Diego Elio Pettenò. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7f113e30329859941cba7a14d47a17a7145a8c34;p=gentoo.git Disable internal jpeg/z depends on tiff #395753 by Diego Elio Pettenò. --- diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog index 8720dbdfa887..b0f2b9352c12 100644 --- a/media-libs/netpbm/ChangeLog +++ b/media-libs/netpbm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/netpbm -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.261 2011/12/05 00:03:07 vapier Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.262 2012/01/03 01:36:12 vapier Exp $ + + 03 Jan 2012; Mike Frysinger netpbm-10.56.00.ebuild: + Disable internal jpeg/z depends on tiff #395753 by Diego Elio Pettenò. *netpbm-10.56.00 (05 Dec 2011) diff --git a/media-libs/netpbm/netpbm-10.56.00.ebuild b/media-libs/netpbm/netpbm-10.56.00.ebuild index e942cbd6a694..a2f21d150428 100644 --- a/media-libs/netpbm/netpbm-10.56.00.ebuild +++ b/media-libs/netpbm/netpbm-10.56.00.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.56.00.ebuild,v 1.1 2011/12/05 00:03:07 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.56.00.ebuild,v 1.2 2012/01/03 01:36:12 vapier Exp $ EAPI="3" @@ -101,6 +101,9 @@ src_configure() { # Gentoo build options TIFFLIB = $(netpbm_config tiff) + # Let tiff worry about its own dependencies #395753 + TIFFLIB_NEEDS_JPEG = N + TIFFLIB_NEEDS_Z = N JPEGLIB = $(netpbm_config jpeg) PNGLIB = $(netpbm_config png) ZLIB = $(netpbm_config zlib z)