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

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

4 files changed, 61 insertions, 5 deletions

diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index 1d8dc8aca2e3..eb26fed33bae 100644
--- a/dev-games/irrlicht/ChangeLog
+++ b/dev-games/irrlicht/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/irrlicht
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.50 2011/04/12 06:40:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.51 2011/09/15 03:18:02 ssuominen Exp $
+
+  15 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> irrlicht-1.7.2.ebuild,
+  +files/irrlicht-1.7.2-libpng15.patch:
+  Fix building with libpng15 wrt #378287 by Diego Elio Pettenò
 
   12 Apr 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   files/irrlicht-1.7.2-gcc46.patch:
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index 2aade42d5410..0ff3cd6c8231 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX irrlicht-1.7.2-config.patch 1452 RMD160 225018641a064ddb7c7786a50a2c2afb67a4fd3a SHA1 f7409d423976547eb51b1bfa800c8a66761e9380 SHA256 462261491e7e07656b2bccf5ffef3cb5a04326e4ec43416391758adbfc0f81c4
 AUX irrlicht-1.7.2-demoMake.patch 19873 RMD160 61ad654a0824a1bde18a26ff642de412082166dd SHA1 582b60ef94fe93d458322429b4622da6e122ada2 SHA256 f4686dceb39913fb26035f970e999dff7b8dd82e87de6b999f3dfb5aacf846d0
 AUX irrlicht-1.7.2-gcc46.patch 402 RMD160 ee6992b85c971502d9f7884e7ed81821f8e738f4 SHA1 02c7df9e7a99fd3b09e46690cf0b76a1b52bb566 SHA256 a942e9374e1182eec9ebb46f53b343cc050c26d02cfea3dd7027e318f50b9777
 AUX irrlicht-1.7.2-gentoo.patch 3719 RMD160 011a66c1c17a4ea31a4d67d3364304d1aa89ad75 SHA1 0e1fdba537052809e265a5c5b0048530be36683f SHA256 2f9424314ed9b1845741f0df85839cf5293de74dcb796a67c7f0dd6e74613fa0
+AUX irrlicht-1.7.2-libpng15.patch 1205 RMD160 bd3e61e914df612a98d97692babcf1d0d5daeffb SHA1 342e17a83750d2c1d18ac5ba733aee565947eb59 SHA256 79d71023e8af56aca5a9c6e2402163f9da547d5b62f8dcf8633b855d47add9a5
 DIST irrlicht-1.7.2.zip 24603866 RMD160 066a2a664cced9ba92c2dd0337f7ca779bad8b75 SHA1 2f064cb4c712e1d7aca90a116485b5b166ae6218 SHA256 be1de9a850a94eaa5cc57a6014de5ab5304a364d45ce504315b5442be3e0d01d
-EBUILD irrlicht-1.7.2.ebuild 1410 RMD160 b5e44d3bfba63a88b9335c6c4fc6724857a042da SHA1 fb341e3ebf1bfc68995fc9453ede40e9e158f2e7 SHA256 b2ff633a476eb9891d78b62a2db4fe4955c79182cf3796ee157b38813506e314
-MISC ChangeLog 8199 RMD160 ae1d0bb6b55b12ddc5b85d104a43396ddf5c6e3b SHA1 c038428e0b27f35679f0f3278483f62954ab3e2b SHA256 237000ee07c6a9f27a357fee537ab5de4e0277de69a40c480692a7dab122e5f7
+EBUILD irrlicht-1.7.2.ebuild 1448 RMD160 67efc95259b202d26cdf7ced94858750f7ed17da SHA1 ec998e750bdf0b71980f1497c0d6b9d9d4144885 SHA256 53ecb76647e4d18b7584593c84ab49b29f5ff051d55489f5341167d564e593f8
+MISC ChangeLog 8381 RMD160 a76b73fa40c6df1b2821d06d2b304a3885d65f9c SHA1 9f41654e1ee4c14f116d76fb214584ca8dc26e0d SHA256 d6ec9ca5a3a382673e4517fea2a742ce91b7ff0f5f0c53a813d8254207c079bc
 MISC metadata.xml 790 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a SHA1 ff4789ffad6e5473e3c2bbd8b0d64a4edc34b651 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk5xbqIACgkQXkR9YqOcLPFYWgEAm9ffdw+oQL1vppYp3SvyYgea
+Lir+5nMZMUFv5U/rQEsA/RKv60Mx+cPDwFMEEfPLWG8YTRIe2C3noGWv/ixiB93K
+=JpIl
+-----END PGP SIGNATURE-----
diff --git a/dev-games/irrlicht/files/irrlicht-1.7.2-libpng15.patch b/dev-games/irrlicht/files/irrlicht-1.7.2-libpng15.patch
new file mode 100644
index 000000000000..a1426bf2907b
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.7.2-libpng15.patch
@@ -0,0 +1,40 @@
+--- source/Irrlicht/CImageLoaderPNG.cpp
++++ source/Irrlicht/CImageLoaderPNG.cpp
+@@ -28,7 +28,7 @@
+ static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)

+ {

+ 	os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);

+-	longjmp(png_ptr->jmpbuf, 1);

++	longjmp(png_jmpbuf(png_ptr), 1);

+ }

+ 

+ // PNG function for file reading

+@@ -37,7 +37,7 @@
+ 	png_size_t check;

+ 

+ 	// changed by zola {

+-	io::IReadFile* file=(io::IReadFile*)png_ptr->io_ptr;

++	io::IReadFile* file=(io::IReadFile*)png_get_io_ptr(png_ptr);

+ 	check=(png_size_t) file->read((void*)data,(u32)length);

+ 	// }

+ 

+--- source/Irrlicht/CImageWriterPNG.cpp
++++ source/Irrlicht/CImageWriterPNG.cpp
+@@ -35,7 +35,7 @@
+ static void png_cpexcept_error(png_structp png_ptr, png_const_charp msg)

+ {

+ 	os::Printer::log("PNG FATAL ERROR", msg, ELL_ERROR);

+-	longjmp(png_ptr->jmpbuf, 1);

++	longjmp(png_jmpbuf(png_ptr), 1);

+ }

+ 

+ // PNG function for file writing

+@@ -43,7 +43,7 @@
+ {

+ 	png_size_t check;

+ 

+-	io::IWriteFile* file=(io::IWriteFile*)png_ptr->io_ptr;

++	io::IWriteFile* file=(io::IWriteFile*)png_get_io_ptr(png_ptr);

+ 	check=(png_size_t) file->write((const void*)data,(u32)length);

+ 

+ 	if (check != length)

diff --git a/dev-games/irrlicht/irrlicht-1.7.2.ebuild b/dev-games/irrlicht/irrlicht-1.7.2.ebuild
index fb89de0dab23..31c93b98a8c9 100644
--- a/dev-games/irrlicht/irrlicht-1.7.2.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.7.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/dev-games/irrlicht/irrlicht-1.7.2.ebuild,v 1.5 2011/04/08 03:21:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.7.2.ebuild,v 1.6 2011/09/15 03:18:02 ssuominen Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -33,7 +33,8 @@ src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-config.patch \
 		"${FILESDIR}"/${P}-demoMake.patch \
-		"${FILESDIR}"/${P}-gcc46.patch
+		"${FILESDIR}"/${P}-gcc46.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
 
 	sed -i \
 		-e 's:\.\./\.\./media:../media:g' \