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

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

4 files changed, 38 insertions, 14 deletions

diff --git a/dev-util/apitrace/ChangeLog b/dev-util/apitrace/ChangeLog
index ca06c032fdcb..c3fec2466e1f 100644
--- a/dev-util/apitrace/ChangeLog
+++ b/dev-util/apitrace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/apitrace
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.3 2011/09/10 10:26:15 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/ChangeLog,v 1.4 2011/09/13 13:15:33 ssuominen Exp $
+
+  13 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> apitrace-1.0-r1.ebuild,
+  +files/apitrace-1.0-libpng15.patch:
+  Fix building with libpng15 wrt #378533 by Diego Elio Pettenò
 
   10 Sep 2011; Tim Harder <radhermit@gentoo.org> -apitrace-1.0.ebuild:
   Remove old.
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index c999240ba1a5..297124d1fdab 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX apitrace-1.0-automagic-qt.patch 768 RMD160 a966656451f3cea08ecc87c431467cf645ca1ea8 SHA1 7f2ff25ff01edc0acb6477d05f2e8c01bee99359 SHA256 6e93134ba411fee185c27bf7bb84b3f15d403f3fd119d4d86b2ae86306c991f4
 AUX apitrace-1.0-glxtrace-only.patch 660 RMD160 5d9cd457ed13d8c72ac24eb779691c5637045cf5 SHA1 821b39e3689f6ef319f5230da67fa453f2032ef4 SHA256 a78a7a641f911f1b51a611c6ff15b77216dce7d0252ace77b59ab5df90ac5cd8
+AUX apitrace-1.0-libpng15.patch 592 RMD160 bf8190344f9aa8864615a4fa069d166246a42ab2 SHA1 ed148176b9357d9dd289b41821702cc35f7b136a SHA256 9567682a6e558301e5e1f6f35b3ab54bdcd32be7d182eef881954d47b41200ba
 DIST apitrace-1.0.tar.gz 770989 RMD160 202d9e215779204fd5d7b69b231293cc16864e57 SHA1 289b7b66e9daf7d25aebd9b7ed1d28a0e6f8a79a SHA256 5747e9b9cc39854d32e6100212c55f228ab41577b18f61e70f21b7a410c8e0fc
-EBUILD apitrace-1.0-r1.ebuild 2004 RMD160 121add3447b31173f7dc19985b550a1a0dc1c8d7 SHA1 d5b21e7e7ed37d94cebd75f72155c9d20976f425 SHA256 65e720abc8755ec825c6de43532586199ac429349975e455661906ceabb8ee5b
-MISC ChangeLog 677 RMD160 3d7f4f895255ec7c44b46ae0f924f697fa4c2923 SHA1 8ad6a553186064fc9c98c0f06cc28c84ffb5db7c SHA256 ce82d2405b7c09fb40b6340b2b8cc454d490486883343d1e5ba406ee1c77433e
+EBUILD apitrace-1.0-r1.ebuild 2046 RMD160 eb80d351f80bdc44c46bbcf867867d08b3ccf0eb SHA1 b9fa737c187f34d78884203e3a134f5d3e35f975 SHA256 835af7520123aff049e5c2809fad0646c3ce756e6528514809eb2611e116e9c1
+MISC ChangeLog 858 RMD160 b41c1001f2a494db6e0c0b1a549fc1e3ac1de32d SHA1 d68a2af8b7507f01256c2e17b5e02d51589a1b5f SHA256 7d7ed089ec658e405faabb88279725cf9391c729fb3a0e8d8f9cfe106d13ada7
 MISC metadata.xml 254 RMD160 161337e6910a0fd0b752294ab4aa7640c7c2aad6 SHA1 e1d817485dd8943fcb7bfefec4ccff1d56e5b2f7 SHA256 27ec031bea6f122f30a7a6ce887a0174396b7aa96aa28472472ac67b2b24078b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOaztMAAoJEEqz6FtPBkyjsaoH+weGE0uy4Pll3BF1xccEcgCV
-dEoQf5lnRkd6JX3bXskh+xzv3vh9MiyyxgL2awXXXUws/RbnHPOrNKrxDA1wXZcS
-sYdKG0YMaCO5B6Fo/xsIwCC++k1CKSas4i66fJseWGt0Rf0jEZlJpFNFDEQEwTKw
-KfiSSTfBVPoCRdD0UJnD/bxomyvm0DRzRL55tlZlR9WjW49nJ4r+zvOVmCkArlUA
-Aeob69E2jNhZoPMFuUxT1NB8XLOwchNwY+H244iP70IIzvFFvq9KF1gZL4ePqFWJ
-jH99hmdEvX8TQGxKTNUwVl1QGGQuVlzcOp10bug7+nHaMZ+365dBFLtZccTpmgo=
-=t3Tm
+iF4EAREIAAYFAk5vV6oACgkQXkR9YqOcLPEjJwD7B41c+T4tVPJVk4JvY3ycwlW8
+RzXaZ2Zg2SGDe7wmqUwA/0hUiaZ4gLpA3dKx2n5G49XMjGwaMKhg88rRRq/Eu2YW
+=+PAZ
 -----END PGP SIGNATURE-----
diff --git a/dev-util/apitrace/apitrace-1.0-r1.ebuild b/dev-util/apitrace/apitrace-1.0-r1.ebuild
index 28567ee5fa9d..2e3518eac9d0 100644
--- a/dev-util/apitrace/apitrace-1.0-r1.ebuild
+++ b/dev-util/apitrace/apitrace-1.0-r1.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-util/apitrace/apitrace-1.0-r1.ebuild,v 1.1 2011/06/10 10:34:46 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/apitrace/apitrace-1.0-r1.ebuild,v 1.2 2011/09/13 13:15:33 ssuominen Exp $
 
 EAPI=3
 
@@ -41,8 +41,10 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-automagic-qt.patch \
-		"${FILESDIR}"/${P}-glxtrace-only.patch
+	epatch \
+		"${FILESDIR}"/${P}-automagic-qt.patch \
+		"${FILESDIR}"/${P}-glxtrace-only.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
 }
 
 src_configure() {
diff --git a/dev-util/apitrace/files/apitrace-1.0-libpng15.patch b/dev-util/apitrace/files/apitrace-1.0-libpng15.patch
new file mode 100644
index 000000000000..ade9bfa7b8d2
--- /dev/null
+++ b/dev-util/apitrace/files/apitrace-1.0-libpng15.patch
@@ -0,0 +1,21 @@
+http://bugs.gentoo.org/378533
+
+--- image.cpp
++++ image.cpp
+@@ -24,6 +24,7 @@
+  **************************************************************************/
+ 
+ 
++#include <zlib.h> /* Z_DEFAULT_COMPRESSION */
+ #include <png.h>
+ 
+ #include <math.h>
+@@ -319,7 +320,7 @@
+ static void
+ pngWriteCallback(png_structp png_ptr, png_bytep data, png_size_t length)
+ {
+-    struct png_tmp_buffer *buf = (struct png_tmp_buffer*) png_ptr->io_ptr;
++    struct png_tmp_buffer *buf = (struct png_tmp_buffer*) png_get_io_ptr(png_ptr);
+     size_t nsize = buf->size + length;
+ 
+     /* allocate or grow buffer */