Fix building with libpng-1.5.

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

4 files changed, 66 insertions, 7 deletions

diff --git a/media-libs/evas/ChangeLog b/media-libs/evas/ChangeLog
index 9ca41039639e..f764fd518be0 100644
--- a/media-libs/evas/ChangeLog
+++ b/media-libs/evas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/evas
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/ChangeLog,v 1.3 2011/01/30 14:39:45 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/ChangeLog,v 1.4 2011/02/20 01:20:28 vapier Exp $
+
+  20 Feb 2011; Mike Frysinger <vapier@gentoo.org> evas-1.0.0.ebuild,
+  +files/evas-1.0.0-libpng-1.5.patch:
+  Fix building with libpng-1.5.
 
 *evas-1.0.0 (30 Jan 2011)
 
diff --git a/media-libs/evas/Manifest b/media-libs/evas/Manifest
index 2f8cade331f9..ae49deb187e0 100644
--- a/media-libs/evas/Manifest
+++ b/media-libs/evas/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX evas-1.0.0-libpng-1.5.patch 1706 RMD160 e25b279c0c087e0c7e46544a7e0ec176eaea04c2 SHA1 312ff524da2375c58dd66c22ba6adefa309640ee SHA256 89c8b2f4c4080c6c982639055ef538fe68109daf49fa35dafd2757f362bec18f
 DIST evas-1.0.0.tar.bz2 1046612 RMD160 23067cd9e5aa8e24ee539a24dee27a3cc67fcef4 SHA1 fc310c12b801400df00a01da93676aa7be02f0d8 SHA256 aae9d50844913064e6b7037aebeefbf93460c5c828d6b0547a43dc9190fcda94
-EBUILD evas-1.0.0.ebuild 3847 RMD160 62df300cc8eb13cb95b9a4730cba0579f9afcbae SHA1 3957567abe80de612edd860586e760610c93eda1 SHA256 bd898d83016257ca3c67cfa0e213e693594e043343c8c7d45304d303190b5e26
-MISC ChangeLog 693 RMD160 db0238d9e67f787fdfcf1b2efd85ce73c0f6df92 SHA1 0f162cb4145064cbb5aa5515f6a4280364adf0d3 SHA256 c4024f8dade2b26e3e8752cdbe6f0ff67a070d84e7cd793ac728295b84013e0b
+EBUILD evas-1.0.0.ebuild 3938 RMD160 25654c089655a22806faf33ec54e97310f8ce50e SHA1 691a1cd201cc4df954abec562735b5ec7e824c81 SHA256 dd2f446816d6f7f8943fb93c4c9fbaf7e6026df9aaee9d544e4249b656584b14
+MISC ChangeLog 834 RMD160 ff9170b31fd08682d9c92f7a604d94c1d63fed37 SHA1 652e3e8633b559eff626eb6486144235239f20ff SHA256 44ed0de356f68a5f16394c263c140c4c6574941ad5fc0f16dacc4a97fd9d295c
 MISC metadata.xml 1425 RMD160 91fa09ed5babf6b117affaead1580bbce9d31415 SHA1 3aa6e04861da57b1815d8bbbbf9ea6bd090f0d1f SHA256 9c5f5eb5493bd93af0a8e8a3877bc1e2ee1a3220c0376f72b6aeef796de4fbd3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk1gQkcACgkQaC/OocHi7JYhLQD9ErSWVBARfG8AvYSVT1cv/2uy
-IFVqGRXmh35PO9M1X5gA/3dgxLahHQ339IeOTq2hLwaqmtErOjW6VYgVG3Dh4jcD
-=9/Ko
+iF4EAREIAAYFAk1gbGEACgkQaC/OocHi7JYRPQD6AnghnpXwz12HmLQ30r9nUpwa
+KxDrpCDSGlx7gKiZx3IA+wVnfqIZ06jfAlpUs3zI99uKLmAm9xTnblRC3eoJvZjG
+=FFp7
 -----END PGP SIGNATURE-----
diff --git a/media-libs/evas/evas-1.0.0.ebuild b/media-libs/evas/evas-1.0.0.ebuild
index 50d2df2639bd..345f5d9ba36b 100644
--- a/media-libs/evas/evas-1.0.0.ebuild
+++ b/media-libs/evas/evas-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/evas-1.0.0.ebuild,v 1.1 2011/01/30 14:39:45 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/evas/evas-1.0.0.ebuild,v 1.2 2011/02/20 01:20:28 vapier Exp $
 
 EAPI=2
 
@@ -43,6 +43,11 @@ RDEPEND=">=dev-libs/eina-1.0.0_beta
 	)"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	enlightenment_src_prepare
+	epatch "${FILESDIR}"/${P}-libpng-1.5.patch
+}
+
 src_configure() {
 	if use X ; then
 		if use xcb ; then
diff --git a/media-libs/evas/files/evas-1.0.0-libpng-1.5.patch b/media-libs/evas/files/evas-1.0.0-libpng-1.5.patch
new file mode 100644
index 000000000000..102d7b5f3f5d
--- /dev/null
+++ b/media-libs/evas/files/evas-1.0.0-libpng-1.5.patch
@@ -0,0 +1,49 @@
+make it work with libpng-1.5
+
+--- src/modules/savers/png/evas_image_save_png.c
++++ src/modules/savers/png/evas_image_save_png.c
+@@ -66,10 +66,13 @@ save_image_png(RGBA_Image *im, const cha
+    if (interlace)
+      {
+ #ifdef PNG_WRITE_INTERLACING_SUPPORTED
+-	png_ptr->interlaced = PNG_INTERLACE_ADAM7;
+-	num_passes = png_set_interlace_handling(png_ptr);
++	interlace = PNG_INTERLACE_ADAM7;
++#else
++	interlace = PNG_INTERLACE_NONE;
+ #endif
+      }
++   else
++     interlace = PNG_INTERLACE_NONE;
+ 
+    if (im->cache_entry.flags.alpha)
+      {
+@@ -84,7 +87,7 @@ save_image_png(RGBA_Image *im, const cha
+ 	evas_common_convert_argb_unpremul(data, im->cache_entry.w * im->cache_entry.h);
+ 	png_init_io(png_ptr, f);
+         png_set_IHDR(png_ptr, info_ptr, im->cache_entry.w, im->cache_entry.h, 8,
+-		     PNG_COLOR_TYPE_RGB_ALPHA, png_ptr->interlaced,
++		     PNG_COLOR_TYPE_RGB_ALPHA, interlace,
+ 		     PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ #ifdef WORDS_BIGENDIAN
+ 	png_set_swap_alpha(png_ptr);
+@@ -97,7 +100,7 @@ save_image_png(RGBA_Image *im, const cha
+ 	data = im->image.data;
+ 	png_init_io(png_ptr, f);
+ 	png_set_IHDR(png_ptr, info_ptr, im->cache_entry.w, im->cache_entry.h, 8,
+-		     PNG_COLOR_TYPE_RGB, png_ptr->interlaced,
++		     PNG_COLOR_TYPE_RGB, interlace,
+ 		     PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ 	png_data = alloca(im->cache_entry.w * 3 * sizeof(char));
+      }
+@@ -112,6 +115,10 @@ save_image_png(RGBA_Image *im, const cha
+    png_set_shift(png_ptr, &sig_bit);
+    png_set_packing(png_ptr);
+ 
++#ifdef PNG_WRITE_INTERLACING_SUPPORTED
++   num_passes = png_set_interlace_handling(png_ptr);
++#endif
++
+    for (pass = 0; pass < num_passes; pass++)
+      {
+ 	ptr = data;