Fix building with libpng15 wrt #383799 by Ian Stakenvicius (patch pending upstream review)

(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)

3 files changed, 61 insertions, 4 deletions

diff --git a/media-gfx/iscan/ChangeLog b/media-gfx/iscan/ChangeLog
index 1c3d924b318f..bdfada044ebd 100644
--- a/media-gfx/iscan/ChangeLog
+++ b/media-gfx/iscan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/iscan
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.42 2011/04/23 18:26:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/ChangeLog,v 1.43 2011/09/30 17:58:25 ssuominen Exp $
+
+  30 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> iscan-2.26.2.ebuild,
+  +files/iscan-2.26.2-libpng15.patch:
+  Fix building with libpng15 wrt #383799 by Ian Stakenvicius (patch pending
+  upstream review)
 
   23 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org> iscan-2.26.2.ebuild:
   Drop dependency over libieee1284 (no longer used by iscan), add missing
diff --git a/media-gfx/iscan/files/iscan-2.26.2-libpng15.patch b/media-gfx/iscan/files/iscan-2.26.2-libpng15.patch
new file mode 100644
index 000000000000..1b89b735c23f
--- /dev/null
+++ b/media-gfx/iscan/files/iscan-2.26.2-libpng15.patch
@@ -0,0 +1,51 @@
+http://bugs.gentoo.org/show_bug.cgi?id=383799#c13
+Upstream: http://www.avasys.jp/cgi-bin/lx/bbs/en/scanner-bbs/hyperbbs.cgi?mode=view;Code=5197
+
+--- lib/pngstream.cc
++++ lib/pngstream.cc
+@@ -76,7 +76,12 @@
+         set_error_handler (_png, _info);
+ 
+         lib->write_flush (_png);
++/* when not interlacing (ie, only one pass), number of rows is image height:  _v_sz */
++#if PNG_LIBPNG_VER > 10499
++        if (!_footer && _v_sz == lib->get_current_row_number(_png))
++#else
+         if (!_footer && _png->num_rows == _png->flush_rows)
++#endif
+           {
+             lib->write_end (_png, _info);
+             _footer = true;
+@@ -161,6 +166,9 @@
+     funcsym (write_row);
+     funcsym (write_flush);
+     funcsym (write_end);
++#if PNG_LIBPNG_VER > 10499
++    funcsym (get_current_row_number);
++#endif
+ 
+     if (lib->access_version_number
+         && lib->create_write_struct
+@@ -170,6 +178,9 @@
+         && lib->set_IHDR
+         && lib->set_pHYs
+         && lib->set_invert_mono
++#if PNG_LIBPNG_VER > 10499
++	&& lib->get_current_row_number
++#endif
+         && lib->write_info
+         && lib->write_row
+         && lib->write_flush
+--- lib/pngstream.hh
++++ lib/pngstream.hh
+@@ -108,6 +108,10 @@
+                png_structp);
+       fundecl (void, write_end,
+                png_structp, png_infop);
++#if PNG_LIBPNG_VER > 10499
++      fundecl (png_uint_32, get_current_row_number,
++               png_structp);
++#endif
+ #endif /* HAVE_PNG_H */
+     };
+     static png_lib_handle *lib;
diff --git a/media-gfx/iscan/iscan-2.26.2.ebuild b/media-gfx/iscan/iscan-2.26.2.ebuild
index b36f271b9d78..f7bc1876ebe3 100644
--- a/media-gfx/iscan/iscan-2.26.2.ebuild
+++ b/media-gfx/iscan/iscan-2.26.2.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-gfx/iscan/iscan-2.26.2.ebuild,v 1.2 2011/04/23 18:26:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan/iscan-2.26.2.ebuild,v 1.3 2011/09/30 17:58:25 ssuominen Exp $
 
 EAPI="2"
 
@@ -79,8 +79,9 @@ src_prepare() {
 			-e "s:\(PKG_CHECK_MODULES(GDK_IMLIB,.*)\):#\1:g" configure.ac
 	fi
 
-	epatch "${FILESDIR}/iscan-2.25.0-drop-ltdl.patch"
-	epatch "${FILESDIR}/iscan-2.25.0-fix-g++-test.patch"
+	epatch "${FILESDIR}"/iscan-2.25.0-drop-ltdl.patch
+	epatch "${FILESDIR}"/iscan-2.25.0-fix-g++-test.patch
+	epatch "${FILESDIR}"/iscan-2.26.2-libpng15.patch
 
 	eautoreconf
 }