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

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

4 files changed, 47 insertions, 9 deletions

diff --git a/media-libs/libafterimage/ChangeLog b/media-libs/libafterimage/ChangeLog
index 644ea0cdbf6c..cbea8237c97b 100644
--- a/media-libs/libafterimage/ChangeLog
+++ b/media-libs/libafterimage/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libafterimage
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.32 2011/08/28 17:51:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/ChangeLog,v 1.33 2011/09/14 19:17:34 ssuominen Exp $
+
+  14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +files/libafterimage-libpng15.patch, libafterimage-1.20.ebuild:
+  Fix building with libpng15 wrt #378523 by Diego Elio Pettenò
 
   28 Aug 2011; Fabian Groffen <grobian@gentoo.org> libafterimage-1.20.ebuild:
   Fix for Prefix, transfer Prefix keywords
diff --git a/media-libs/libafterimage/Manifest b/media-libs/libafterimage/Manifest
index 313e0f4e0dad..5cfc75c2eb36 100644
--- a/media-libs/libafterimage/Manifest
+++ b/media-libs/libafterimage/Manifest
@@ -1,21 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX libafterimage-1.18-glx.patch 932 RMD160 61f6ddd4f659ffdeff2c4a7abd57ad9d5a97354e SHA1 09183f34a1f4b7737efcc40b36563e2bf84d8964 SHA256 e6fc40d8a0384781d04b82229a7d1a61066cedcf6dbf01427251230a59703b82
 AUX libafterimage-1.18-recmake_bsd.patch 1934 RMD160 cdd484974683aaea096c893d842b3693362e4a39 SHA1 030a4173e798e764dfbca64a60f2640af489236e SHA256 3628b28d09a119133b1235215454a8e7f664bdf9969445c267fa8648497e75a3
 AUX libafterimage-config.patch 369 RMD160 e209d20413373694cd4b4cf16cc1927fbb8437f6 SHA1 030143afcdece5802511b51899c221d48e421ebf SHA256 75a7683211f8d65a6cb1a6ed99b013d7bcc5b3cb3a241e36748a2c0b5ff960c6
 AUX libafterimage-gif.patch 1436 RMD160 8656affb37559f0cee1fd8143e8c29f78ec4dd42 SHA1 a80433320c5c22c9ffb754a3952aada7df6760a9 SHA256 d9e681e5fae08dd6e648ee699e3feb617a924ec5c011fdab81a75d4c3949ea9a
+AUX libafterimage-libpng15.patch 1076 RMD160 21ad676cbcbd2651463520da9cc2108a1b2f2893 SHA1 2e08a6c833ef39ada0a07ca6150f279230debf6b SHA256 bbf95bcddc4c48dcde88745dc9cb772ca53b625e8e466b9d565e4183ce71dbe3
 AUX libafterimage-makefile.in.patch 2168 RMD160 4b6340f3845774de82fb612de0e94f0841ae869a SHA1 f707ad8a850eafacdac780a727f936b8cf8673de SHA256 44b2f80b7e5f9bef3852d179e247592f3d5a0983de105082d1b5d1667eb4ced8
 DIST libAfterImage-1.18.tar.bz2 1050328 RMD160 dcf921660e15bb31908c90fcfe00b58d58754fc3 SHA1 d177c63067f5d0053e02f92879fe59764e421f25 SHA256 f1562240f1dd3a180e07436ee28a993a707654a339d997ad0512692d3fc32312
 DIST libAfterImage-1.20.tar.bz2 1017055 RMD160 b02332fc598a6f141d103c38974e34fc559e1eb4 SHA1 c214ac89a1e61d9c8834ccc9210d0f7952305737 SHA256 6e233253f4d1dd22dfce9f9a245cc036d814fc99ba7f6732f4e345de62cfe458
 EBUILD libafterimage-1.18-r1.ebuild 2057 RMD160 071d40441ef17db71a74137ac9309289c7c74e8d SHA1 bdbff0028d48ff776c416548c6cff1db3c276678 SHA256 3f1c3aad8643465bc4ecf812d73a936490bfc7cbed9e5ef35b48cf4be4e5f9f1
-EBUILD libafterimage-1.20.ebuild 2201 RMD160 15874e72d7eb005802a7f02046cab3f0be6b9708 SHA1 ac8de98566e3fff426f554430dc33e8ba5e41fa2 SHA256 902df16cd8b4a8a843a7584a15a43ac0c955c5e4a18471f56635cc85d63611b3
-MISC ChangeLog 4544 RMD160 a678bf503339820a3bf5690b039369e58aa70174 SHA1 a12d9e7f1451812abcf74352a36b99baacf30aa7 SHA256 0613fe79c04907f079411e3766092be03546b11803c45156adf9d45c46bed9a6
+EBUILD libafterimage-1.20.ebuild 2278 RMD160 16dae5733614ccbb71469a34afade9ddc287cbd7 SHA1 58fdef09249d3e9e3868aabf4af47d7ecc977e73 SHA256 57018a50e4796ac80a0b47241761af327fd35485cab9700c7986e64a3a8d2472
+MISC ChangeLog 4731 RMD160 8e70bb91e45d8145c3e21af12a9861ba025132e4 SHA1 656affeae9e96d6134449390e2c5398ac85e5859 SHA256 56e9b14542cfc359aba08c271d6d5821a18cb67712eac5f1af905b566ac28a17
 MISC metadata.xml 803 RMD160 5a20a7d1e910ee66f7bb5fd53aad8341a1f0b653 SHA1 bfee50707db93a6a62978caf711b15be6446c67c SHA256 5f1fc597d0da18541c30e568f47ec9d1937f277dc34130101e8e605924a4d444
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (Darwin)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5agBUACgkQX3X2B8XHTomjVwCcD9aIT6TldEA002V7oWTnnFPQ
-RoYAnjR8skOm6fir4NnbiPzJNfGWqHE9
-=6Jf/
+iF4EAREIAAYFAk5w/gUACgkQXkR9YqOcLPFbRAEAj5xWZVh+5E38QcSfu24v1zHr
+Mq+d2FXQx0QCKaYSvF8A/0HYtb8rsWRO4RdLYQ3oOFMBviKeTdrqcpNsskjWVDbB
+=zQHF
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libafterimage/files/libafterimage-libpng15.patch b/media-libs/libafterimage/files/libafterimage-libpng15.patch
new file mode 100644
index 000000000000..44d5b944007c
--- /dev/null
+++ b/media-libs/libafterimage/files/libafterimage-libpng15.patch
@@ -0,0 +1,31 @@
+--- export.c
++++ export.c
+@@ -496,7 +496,7 @@
+ 	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
+     if ( png_ptr != NULL )
+     	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
+-			if( setjmp(png_ptr->jmpbuf) )
++			if( setjmp(png_jmpbuf(png_ptr)) )
+ 			{
+ 				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
+ 				info_ptr = NULL ;
+--- import.c
++++ import.c
+@@ -1251,7 +1251,7 @@
+ 			 * the normal method of doing things with libpng).  REQUIRED unless you
+ 			 * set up your own error handlers in the png_create_read_struct() earlier.
+ 			 */
+-			if ( !setjmp (png_ptr->jmpbuf))
++			if ( !setjmp (png_jmpbuf(png_ptr)))
+ 			{
+ 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
+ 
+@@ -1468,7 +1468,7 @@
+ 
+ static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
+ {
+-   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
++   ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
+    memcpy(data, buf->buffer, length);
+    buf->buffer += length;
+ }
diff --git a/media-libs/libafterimage/libafterimage-1.20.ebuild b/media-libs/libafterimage/libafterimage-1.20.ebuild
index 7460fa378786..1761c6895546 100644
--- a/media-libs/libafterimage/libafterimage-1.20.ebuild
+++ b/media-libs/libafterimage/libafterimage-1.20.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/libafterimage/libafterimage-1.20.ebuild,v 1.3 2011/08/28 17:51:11 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libafterimage/libafterimage-1.20.ebuild,v 1.4 2011/09/14 19:17:34 ssuominen Exp $
 
 EAPI=3
 inherit eutils autotools
@@ -39,6 +39,8 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-config.patch
 	# fix gif unbundle
 	epatch "${FILESDIR}"/${PN}-gif.patch
+	# fix for libpng15 compability
+	epatch "${FILESDIR}"/${PN}-libpng15.patch
 	# remove forced flags
 	sed -i \
 		-e 's/CFLAGS="-O3"//' \