From d5170841caf1d66571fc6b9d3d77539889ced687 Mon Sep 17 00:00:00 2001
From: Samuli Suominen <ssuominen@gentoo.org>
Date: Tue, 13 Sep 2011 13:15:33 +0000
Subject: Fix building with libpng15 wrt #378533 by Diego Elio Pettenò
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
---
 dev-util/apitrace/ChangeLog                         |  6 +++++-
 dev-util/apitrace/apitrace-1.0-r1.ebuild            |  8 +++++---
 dev-util/apitrace/files/apitrace-1.0-libpng15.patch | 21 +++++++++++++++++++++
 3 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 dev-util/apitrace/files/apitrace-1.0-libpng15.patch

(limited to 'dev-util')

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/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 */
-- 
cgit v1.2.3-65-gdbad