Add fix from upstream for gray handling #181318 by David Barnett and Steffen Wolf.

(Portage version: 2.1.3_rc8)

4 files changed, 75 insertions, 1 deletions

diff --git a/media-libs/libpng/ChangeLog b/media-libs/libpng/ChangeLog
index 1f2caafdc14d..4f62d3d93d26 100644
--- a/media-libs/libpng/ChangeLog
+++ b/media-libs/libpng/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libpng
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.138 2007/07/11 20:34:50 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/ChangeLog,v 1.139 2007/07/14 17:22:15 vapier Exp $
+
+*libpng-1.2.18-r1 (14 Jul 2007)
+
+  14 Jul 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/libpng-1.2.18-gray.patch, +libpng-1.2.18-r1.ebuild:
+  Add fix from upstream for gray handling #181318 by David Barnett and Steffen
+  Wolf.
 
   11 Jul 2007; Roy Marples <uberlord@gentoo.org> libpng-1.2.18.ebuild:
   Keyworded ~sparc-fbsd.
diff --git a/media-libs/libpng/files/digest-libpng-1.2.18-r1 b/media-libs/libpng/files/digest-libpng-1.2.18-r1
new file mode 100644
index 000000000000..037ad9edfa25
--- /dev/null
+++ b/media-libs/libpng/files/digest-libpng-1.2.18-r1
@@ -0,0 +1,6 @@
+MD5 25a7f2f101eaaf2eb18c4987e0fbe39d libpng-1.2.18.tar.bz2 623690
+RMD160 ea81056a896eb038fa5d7fde2b7fa626c1a2e31e libpng-1.2.18.tar.bz2 623690
+SHA256 6fce62f9e67e951c38672bf520c062a2be742e893d240d150748a00c32f20c62 libpng-1.2.18.tar.bz2 623690
+MD5 1518ec4b873f2c61a7d32ad867b67b17 libpng-manual.txt 128284
+RMD160 f019974f931327e6d9d332d306e07dce71ff031b libpng-manual.txt 128284
+SHA256 0cc3a25643024807672e5df255332cb63c902cea333246f4a5ab48c682c3297a libpng-manual.txt 128284
diff --git a/media-libs/libpng/files/libpng-1.2.18-gray.patch b/media-libs/libpng/files/libpng-1.2.18-gray.patch
new file mode 100644
index 000000000000..bf6564e8850c
--- /dev/null
+++ b/media-libs/libpng/files/libpng-1.2.18-gray.patch
@@ -0,0 +1,20 @@
+fix from upstream for a regression in grey handling
+
+http://bugs.gentoo.org/181318
+
+--- pngrtran.c
++++ pngrtran.c
+@@ -1293,9 +1293,11 @@
+       if(rgb_error)
+       {
+          png_ptr->rgb_to_gray_status=1;
+-         if(png_ptr->transformations & PNG_RGB_TO_GRAY_WARN)
++         if((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
++             PNG_RGB_TO_GRAY_WARN)
+             png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
+-         if(png_ptr->transformations & PNG_RGB_TO_GRAY_ERR)
++         if((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
++             PNG_RGB_TO_GRAY_ERR)
+             png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");
+       }
+    }
diff --git a/media-libs/libpng/libpng-1.2.18-r1.ebuild b/media-libs/libpng/libpng-1.2.18-r1.ebuild
new file mode 100644
index 000000000000..7fddd56d33a5
--- /dev/null
+++ b/media-libs/libpng/libpng-1.2.18-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.2.18-r1.ebuild,v 1.1 2007/07/14 17:22:15 vapier Exp $
+
+inherit libtool multilib eutils
+
+DESCRIPTION="Portable Network Graphics library"
+HOMEPAGE="http://www.libpng.org/"
+SRC_URI="mirror://sourceforge/libpng/${P}.tar.bz2
+	doc? ( http://www.libpng.org/pub/png/libpng-manual.txt )"
+
+LICENSE="as-is"
+SLOT="1.2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND="sys-libs/zlib"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	use doc && cp "${WORKDIR}"/${PN}-manual.txt .
+	epatch "${FILESDIR}"/1.2.7-gentoo.diff
+	epatch "${FILESDIR}"/${P}-gray.patch #181318
+
+	# So we get sane .so versioning on FreeBSD
+	elibtoolize
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ANNOUNCE CHANGES KNOWNBUG README TODO Y2KINFO
+	use doc && dodoc libpng-manual.txt
+}
+
+pkg_postinst() {
+	# the libpng authors really screwed around between 1.2.1 and 1.2.3
+	if [[ -f ${ROOT}/usr/$(get_libdir)/libpng.so.3.1.2.1 ]] ; then
+		rm -f "${ROOT}"/usr/$(get_libdir)/libpng.so.3.1.2.1
+	fi
+}