From: Samuli Suominen <ssuominen@gentoo.org>
Date: Wed, 12 May 2010 12:03:26 +0000 (+0000)
Subject: Fix building with libpng14 wrt #319399 by Helmut Jarausch.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=88441d8dcc1d43e819a5ce6b7581c8fc76c36a07;p=gentoo.git

Fix building with libpng14 wrt #319399 by Helmut Jarausch.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
---

diff --git a/media-gfx/exact-image/ChangeLog b/media-gfx/exact-image/ChangeLog
index 8f5d9c74c1a4..a8b361de68f6 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.1 2010/01/07 14:44:48 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exact-image/ChangeLog,v 1.2 2010/05/12 12:03:26 ssuominen Exp $
+
+  12 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  exact-image-0.7.5.ebuild, +files/exact-image-0.7.5-libpng14.patch:
+  Fix building with libpng14 wrt #319399 by Helmut Jarausch.
 
 *exact-image-0.7.5 (07 Jan 2010)
 
diff --git a/media-gfx/exact-image/Manifest b/media-gfx/exact-image/Manifest
index a9f7fbd640ac..9402291b1fe7 100644
--- a/media-gfx/exact-image/Manifest
+++ b/media-gfx/exact-image/Manifest
@@ -1,4 +1,5 @@
+AUX exact-image-0.7.5-libpng14.patch 2431 RMD160 2d4a5bf1d2a6019a3a0dbb29eb4a3e2f42d63ab3 SHA1 40fb4b4b140d6958310226f4444521717ae903d9 SHA256 19c2ed561d37ca66543f5c778fa714b873d53289bf779f1482a76222ea5fb2ba
 DIST exact-image-0.7.5.tar.bz2 532314 RMD160 ec83a3f124ac0e6dc7d2724fdf9d2e5c77893227 SHA1 9e0a57df673ffa3b97dd858935c9f0732f09cc82 SHA256 d43635e06fdb48ec8c23bbfd66f40c5a1fc64c81913220f267dd7449050d0c69
-EBUILD exact-image-0.7.5.ebuild 1919 RMD160 d4d7da1c0852f6c0d1a8f383c315f3aa2ca02153 SHA1 13a602832f9995742bdceb78b901e388028a939a SHA256 64d9944135b13dd82a8b899cdb74584d80591f133e0d17f1a917701aa1654215
-MISC ChangeLog 433 RMD160 95901a1bf9f5df2400f659996a821d70d981ef7e SHA1 d2c1d2f845d19d015da62e33d3ef49a73accba2d SHA256 97923107ba8100215f9fc5f25edd2b0de4c48399ae080862a6c8d1236ea61494
+EBUILD exact-image-0.7.5.ebuild 2047 RMD160 289e9da983f14b72f28b76f17dfb5963e01b178f SHA1 c6c3243a49a30facb849c019a33d352e9a6bcc1a SHA256 91227b51aaf54fd55a468d52b7169a041a7913bc08155f7573dd21daa086cd58
+MISC ChangeLog 619 RMD160 e4cc2d2e002bc7ad71aa06c0035796bb8027b467 SHA1 2c67754f4bab5446b42ece2504d5a53f7fed6231 SHA256 f3793ccb01ec98325b6a29857b20c835d69728dc13c8ba075c736e9adeee7163
 MISC metadata.xml 415 RMD160 699c10ad1591672665f5f5a0dc826446ac963abe SHA1 37571ecb2ec795cd8a0122de6eddf72be850e4fa SHA256 0c3bba661467d1f7649ce868cc87cff7985a800b6bf330b35a32fecb84939f1c
diff --git a/media-gfx/exact-image/exact-image-0.7.5.ebuild b/media-gfx/exact-image/exact-image-0.7.5.ebuild
index 959ae5b14e15..a2b55388e834 100644
--- a/media-gfx/exact-image/exact-image-0.7.5.ebuild
+++ b/media-gfx/exact-image/exact-image-0.7.5.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 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.7.5.ebuild,v 1.1 2010/01/07 14:44:48 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/exact-image/exact-image-0.7.5.ebuild,v 1.2 2010/05/12 12:03:26 ssuominen Exp $
 
 EAPI="2"
+inherit eutils
 
 DESCRIPTION="A fast, modern and generic image processing library"
 HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/"
@@ -36,6 +37,11 @@ RDEPEND="agg? ( x11-libs/agg[truetype] )
 DEPEND="${RDEPEND}
 	swig? ( dev-lang/swig )"
 
+src_prepare() {
+	# this is broken ebuild: automagic libpng depend.
+	epatch "${FILESDIR}"/${P}-libpng14.patch
+}
+
 src_configure() {
 	# evas support is disabled since evas is not on main tree. You can find it
 	# on enlightenment overlay
diff --git a/media-gfx/exact-image/files/exact-image-0.7.5-libpng14.patch b/media-gfx/exact-image/files/exact-image-0.7.5-libpng14.patch
new file mode 100644
index 000000000000..f25b9af02da9
--- /dev/null
+++ b/media-gfx/exact-image/files/exact-image-0.7.5-libpng14.patch
@@ -0,0 +1,69 @@
+--- codecs/png.cc
++++ codecs/png.cc
+@@ -71,7 +71,7 @@
+   /* Allocate/initialize the memory for image information.  REQUIRED. */
+   info_ptr = png_create_info_struct(png_ptr);
+   if (info_ptr == NULL) {
+-    png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++    png_destroy_read_struct(&png_ptr, NULL, NULL);
+     return 0;
+   }
+   
+@@ -82,7 +82,7 @@
+   
+   if (setjmp(png_jmpbuf(png_ptr))) {
+     /* Free all of the memory associated with the png_ptr and info_ptr */
+-    png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++    png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+     /* If we get here, we had a problem reading the file */
+     return 0;
+   }
+@@ -99,7 +99,7 @@
+   png_read_info (png_ptr, info_ptr);
+   
+   png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+-		&interlace_type, int_p_NULL, int_p_NULL);
++		&interlace_type, NULL, NULL);
+   
+   image.w = width;
+   image.h = height;
+@@ -132,7 +132,7 @@
+ #if 0 // no longer needed
+   /* Expand grayscale images to the full 8 bits from 2, or 4 bits/pixel */
+   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth > 1 && bit_depth < 8) {
+-    png_set_gray_1_2_4_to_8(png_ptr);
++    png_set_expand_gray_1_2_4_to_8(png_ptr);
+     image.bps = 8;
+   }
+ #endif  
+@@ -196,11 +196,11 @@
+   for (int pass = 0; pass < number_passes; ++pass)
+     for (unsigned int y = 0; y < height; ++y) {
+       row_pointers[0] = image.getRawData() + y * stride;
+-      png_read_rows(png_ptr, row_pointers, png_bytepp_NULL, 1);
++      png_read_rows(png_ptr, row_pointers, NULL, 1);
+     }
+   
+   /* clean up after the read, and free any memory allocated - REQUIRED */
+-  png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++  png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+   
+   /* that's it */
+   return true;
+@@ -224,7 +224,7 @@
+   /* Allocate/initialize the memory for image information.  REQUIRED. */
+   info_ptr = png_create_info_struct(png_ptr);
+   if (info_ptr == NULL) {
+-    png_destroy_write_struct(&png_ptr, png_infopp_NULL);
++    png_destroy_write_struct(&png_ptr, NULL);
+     return false;
+   }
+   
+@@ -244,7 +244,6 @@
+   else if (quality > Z_BEST_COMPRESSION) quality = Z_BEST_COMPRESSION;
+   png_set_compression_level(png_ptr, quality);
+   
+-  png_info_init (info_ptr);
+   
+   /* Set up our STL stream output control */ 
+   png_set_write_fn (png_ptr, stream, &stdstream_write_data, &stdstream_flush_data);