Fix building with libpng15 wrt #383203 by Diego Elio Pettenò

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

4 files changed, 55 insertions, 12 deletions

diff --git a/media-gfx/exact-image/ChangeLog b/media-gfx/exact-image/ChangeLog
index b76432f171ad..ab537a756e2b 100644
--- a/media-gfx/exact-image/ChangeLog
+++ b/media-gfx/exact-image/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/exact-image
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exact-image/ChangeLog,v 1.6 2010/11/08 22:36:11 maekke Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exact-image/ChangeLog,v 1.7 2011/09/17 16:06:43 ssuominen Exp $
+
+  17 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> exact-image-0.8.1.ebuild,
+  +files/exact-image-0.8.1-libpng15.patch:
+  Fix building with libpng15 wrt #383203 by Diego Elio Pettenò
 
   08 Nov 2010; Markus Meier <maekke@gentoo.org> exact-image-0.8.1.ebuild:
   change jpeg dep to virtual/jpeg
diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index 8c171cf9df2d..513e2882861d 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX exact-image-0.7.5-libpng14.patch 2431 RMD160 2d4a5bf1d2a6019a3a0dbb29eb4a3e2f42d63ab3 SHA1 40fb4b4b140d6958310226f4444521717ae903d9 SHA256 19c2ed561d37ca66543f5c778fa714b873d53289bf779f1482a76222ea5fb2ba
+AUX exact-image-0.8.1-libpng15.patch 750 RMD160 947b953d9f16feca46936a14cb240f4bb0e7ce6b SHA1 9aefd83bf881f1d3abea7b42ab75eba7f4871e0f SHA256 d59213a04fbcf4f3eb498d6afa9ffa201235eff1026bb7797b75727b1f73ca25
 DIST exact-image-0.8.1.tar.bz2 283660 RMD160 aa7b46540fca3a790cfb67529cb906fb2cab4088 SHA1 2aa8398d52b62cee5f62356fb81b0d1b8e7f6137 SHA256 926a09c897489705ba42daeb01fc4a3c327a8194dc65431f630d50684390e28b
-EBUILD exact-image-0.8.1.ebuild 2227 RMD160 f2ade6ffb3dfa9228362c1947425a6b5f22cf921 SHA1 8c431e2bf7dec960c7de9fdba3eb0558bc6dbf19 SHA256 b8996fee5872b1941ed0ec99316462f165a1d6c5991171e990825bd138a8da7c
-MISC ChangeLog 1231 RMD160 9f38398cf1747f5462e6436c2b4c10e5bcb27da5 SHA1 2dc251354df8fced3cb1140c79171073d3b58d8c SHA256 c18cd5665894d17d7db255c97c382b91c2ee4d99fbf82082ad5025e6f130bc6f
+EBUILD exact-image-0.8.1.ebuild 2274 RMD160 b49f52e7540ad3c5554360fdb71d76569ec51792 SHA1 808823db3ddf1aa5767911697d3bf5322af7b6f4 SHA256 a1ccef2b27fc04bd4a67dde33f3c95aaa389f12908b97e719c13ecc926326a2c
+MISC ChangeLog 1422 RMD160 b2940bb26209db3c8c70149d7555eddd609b6c3a SHA1 c944ebe5349dc7b550682dd012dbc2e6c4f5ee62 SHA256 6fb5c560cb169010054b48fcc65c7b04f3373bcc6adc680c359ffd3f1401bde1
 MISC metadata.xml 243 RMD160 1b9586a6ea79e925575cf0e14044a8e8f0ba9d14 SHA1 0eee5b7eb23651a629073581db30cf40f20e89eb SHA256 e6f3d1caff432a379e20fb89028bacef1f54d8d0b27da2b80a144eeb9d00a116
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAkzYe5oACgkQkKaRLQcq0GI4GACeKAYLZYq3FSH3Ap+bNpVv0tU4
-P8cAoJpmMZOhkFU9MQarK5qIGWt+s0MS
-=MsH/
+iF4EAREIAAYFAk50xc8ACgkQXkR9YqOcLPE/4wD/aPg6uW8BXzzIxQerFSWVPv0y
+517Rh28jTUpAcYJcrzYA/37XGFke6OMLRTk3cOMTdwok+NkJSonqbIr0e7o+ux2y
+=zpwi
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/exact-image/exact-image-0.8.1.ebuild b/media-gfx/exact-image/exact-image-0.8.1.ebuild
index 84596e9226d6..bd69a3fde67c 100644
--- a/media-gfx/exact-image/exact-image-0.8.1.ebuild
+++ b/media-gfx/exact-image/exact-image-0.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/exact-image/exact-image-0.8.1.ebuild,v 1.3 2010/11/08 22:36:11 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exact-image/exact-image-0.8.1.ebuild,v 1.4 2011/09/17 16:06:43 ssuominen Exp $
 
 EAPI=2
 
@@ -49,7 +49,11 @@ pkg_setup() {
 
 src_prepare() {
 	python_convert_shebangs -r 2 .
-	epatch "${FILESDIR}"/${PN}-0.7.5-libpng14.patch
+
+	epatch \
+		"${FILESDIR}"/${PN}-0.7.5-libpng14.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
+
 	# fix python hardcoded path wrt bug #327171
 	sed -i -e "s:python2.5:python$(python_get_version):" \
 		-e "s:\$(libdir):usr/$(get_libdir):" \
diff --git a/media-gfx/exact-image/files/exact-image-0.8.1-libpng15.patch b/media-gfx/exact-image/files/exact-image-0.8.1-libpng15.patch
new file mode 100644
index 000000000000..44c94726e35c
--- /dev/null
+++ b/media-gfx/exact-image/files/exact-image-0.8.1-libpng15.patch
@@ -0,0 +1,34 @@
+--- codecs/png.cc
++++ codecs/png.cc
+@@ -16,6 +16,7 @@
+  */
+ 
+ #include <stdlib.h>
++#include <zlib.h>
+ #include <png.h>
+ 
+ #include <iostream>
+@@ -104,7 +105,7 @@
+   image.w = width;
+   image.h = height;
+   image.bps = bit_depth;
+-  image.spp = info_ptr->channels;
++  image.spp = png_get_channels(png_ptr, info_ptr);
+   
+   png_uint_32 res_x, res_y;
+   res_x = png_get_x_pixels_per_meter(png_ptr, info_ptr);
+@@ -120,10 +121,13 @@
+   // png_set_packswap(png_ptr);
+ 
+   /* Expand paletted colors into true RGB triplets */
++
++  int num_trans;
++
+   if (color_type == PNG_COLOR_TYPE_PALETTE) {
+     png_set_palette_to_rgb(png_ptr);
+     image.bps = 8;
+-    if (info_ptr->num_trans)
++    if (num_trans)
+       image.spp = 4;
+     else
+       image.spp = 3;