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

Package-Manager: portage-2.1.3_rc8

5 files changed, 100 insertions, 5 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/Manifest b/media-libs/libpng/Manifest
index 790a12f33799..bd4508696423 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.2.7-gentoo.diff 464 RMD160 536439602f48539452c626fe80a3022640ff1277 SHA1 b1d022f3f56db3e7fc1888092087cbccb1fded8e SHA256 5e44bbb599b25c4909a7cfc8b3478847ebc6f10bfcc21e98e1609d83f4c1acc6
 MD5 3338fff0166374e14ae138e6a1f4cd21 files/1.2.7-gentoo.diff 464
 RMD160 536439602f48539452c626fe80a3022640ff1277 files/1.2.7-gentoo.diff 464
@@ -10,6 +13,10 @@ AUX libpng-1.2.14-mem-leak.patch 565 RMD160 4b00f5d04d7c90b484358566668438336c29
 MD5 7ffe44e32fb9136f58eacbc7dcc9751c files/libpng-1.2.14-mem-leak.patch 565
 RMD160 4b00f5d04d7c90b484358566668438336c297618 files/libpng-1.2.14-mem-leak.patch 565
 SHA256 a789985bc858b246dd80185ba8310185880b0a5b51418b7e31c8418ca81b1c34 files/libpng-1.2.14-mem-leak.patch 565
+AUX libpng-1.2.18-gray.patch 691 RMD160 284d6fb5e8f2e05b4f7f4e8ea3b49975a31b8bde SHA1 bda1c7aa287e3ea3d472fdb0774d248bd979b49e SHA256 1e32ef256e8823863488df366fd47ee419e2bf49369236652b66bf0bfdb7940b
+MD5 1a4237870c6f4bab93ada5e9228084dd files/libpng-1.2.18-gray.patch 691
+RMD160 284d6fb5e8f2e05b4f7f4e8ea3b49975a31b8bde files/libpng-1.2.18-gray.patch 691
+SHA256 1e32ef256e8823863488df366fd47ee419e2bf49369236652b66bf0bfdb7940b files/libpng-1.2.18-gray.patch 691
 DIST libpng-1.2.14.tar.bz2 620379 RMD160 37c91bc411a8c4bc467bb8b229a4e39bcca4bd8a SHA1 3cf3efcada7896982b165ea34ed6b399ef7fb4af SHA256 2678855a235ed02d5b30831a70dff84d5b562c5de388f1323bd680ac5cdd1722
 DIST libpng-1.2.15.tar.bz2 624008 RMD160 3fb0dcb7764c0fcb7bf349a617f3463869177aab SHA1 a561350b588c7997b107a3417b56a725b5dc5af7 SHA256 dc8350822da21eb40a9928aaded888bd29b674246f8997966b193306a1503156
 DIST libpng-1.2.16.tar.bz2 624085 RMD160 a328e6f4c8b10480b6f13d4fdcb5863fd42c357b SHA1 0b37d42d2ae33c22093d46a28e6b8fa21eb4c1da SHA256 3a14200862cf4fe59fd66340364537d9973b032b7831b7fe33eb827baebc0019
@@ -33,14 +40,18 @@ EBUILD libpng-1.2.16.ebuild 1070 RMD160 011ac83bf7e26a0467e7ab885662853adad5cb21
 MD5 614ee9b8203cca86dc1bbb064a7b0aff libpng-1.2.16.ebuild 1070
 RMD160 011ac83bf7e26a0467e7ab885662853adad5cb21 libpng-1.2.16.ebuild 1070
 SHA256 ce45619fa681c6a00e8619a63b54ea2424c8e6354ac115659c96d587402638eb libpng-1.2.16.ebuild 1070
+EBUILD libpng-1.2.18-r1.ebuild 1209 RMD160 7f3cb866955b5ce109599a96c755af3e1ec90aee SHA1 b33b3c964367b6d29fe0e0042496727909cbf337 SHA256 87565ab32212bd5006b1bf4de12092f7c8443369ceb57f5b8c3ddb37701fe126
+MD5 97006b053c1b2456f9a2d7023e6fd795 libpng-1.2.18-r1.ebuild 1209
+RMD160 7f3cb866955b5ce109599a96c755af3e1ec90aee libpng-1.2.18-r1.ebuild 1209
+SHA256 87565ab32212bd5006b1bf4de12092f7c8443369ceb57f5b8c3ddb37701fe126 libpng-1.2.18-r1.ebuild 1209
 EBUILD libpng-1.2.18.ebuild 1150 RMD160 c110d180e4889def35ddb5b9cced96e83b70de24 SHA1 dfdf23888f160cf1cc0e2cd052c9d8459511af03 SHA256 e230704d972f5d1d67b778b0d97acd16d2381158b40cd156b425e93c7154eebc
 MD5 3a71e6345b5d5337afb4056018c8e8d3 libpng-1.2.18.ebuild 1150
 RMD160 c110d180e4889def35ddb5b9cced96e83b70de24 libpng-1.2.18.ebuild 1150
 SHA256 e230704d972f5d1d67b778b0d97acd16d2381158b40cd156b425e93c7154eebc libpng-1.2.18.ebuild 1150
-MISC ChangeLog 19471 RMD160 dc75be58ff4115f7ea96231765e0b32b828d6ba4 SHA1 99d36b71b86cd97fba526c770fb5c9ac5595003c SHA256 ca9da173b1d0ace76d266616217b594715c1e856e899d20c647c47aa93bbcc63
-MD5 8bad81759c520a07a4cbe049c801c2d9 ChangeLog 19471
-RMD160 dc75be58ff4115f7ea96231765e0b32b828d6ba4 ChangeLog 19471
-SHA256 ca9da173b1d0ace76d266616217b594715c1e856e899d20c647c47aa93bbcc63 ChangeLog 19471
+MISC ChangeLog 19701 RMD160 70eb61b5a5ae1a0e21da749c569c82ab84e41e8a SHA1 ab4eb70435f61c576d05646527940a49271dd553 SHA256 c13b855f68d815c08ed9af88bbb69bef45d51ebda07590d7b72e3199fc1306c4
+MD5 a41a6d0054f61a4d2884993baa69419a ChangeLog 19701
+RMD160 70eb61b5a5ae1a0e21da749c569c82ab84e41e8a ChangeLog 19701
+SHA256 c13b855f68d815c08ed9af88bbb69bef45d51ebda07590d7b72e3199fc1306c4 ChangeLog 19701
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -60,3 +71,13 @@ SHA256 be5e326d1dcfffd835b073d646447f92369efa31bfc50fc2d5bc666a9f2cdaf5 files/di
 MD5 17d223be90ad08ea1e405f92ff5b0b9a files/digest-libpng-1.2.18 476
 RMD160 5a5f32b2eb9fbb052dd8fcbc64c26a0d485d2c8f files/digest-libpng-1.2.18 476
 SHA256 7cb4175e8e91ab1c8015c29cc27be6e6f0d11dc99c7b997d0a737fad9ef07d24 files/digest-libpng-1.2.18 476
+MD5 17d223be90ad08ea1e405f92ff5b0b9a files/digest-libpng-1.2.18-r1 476
+RMD160 5a5f32b2eb9fbb052dd8fcbc64c26a0d485d2c8f files/digest-libpng-1.2.18-r1 476
+SHA256 7cb4175e8e91ab1c8015c29cc27be6e6f0d11dc99c7b997d0a737fad9ef07d24 files/digest-libpng-1.2.18-r1 476
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.5 (GNU/Linux)
+
+iD8DBQFGmQZmp/wUKkr7RBoRAlZ3AJ0XEzYgDT7/9SydP1khZTsWmKzXuwCeOy3h
+uFc4L6oH5TA7zYvvIct0Rt0=
+=/AEj
+-----END PGP SIGNATURE-----
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
+}