fix issue with libpng's API change. bug #235072

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r6 x86_64

4 files changed, 123 insertions, 5 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index d3f6caaa2628..bf5ba4c7ba33 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.189 2008/08/16 03:18:10 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.190 2008/08/21 13:20:16 cardoe Exp $
+
+*cairo-1.6.4-r1 (21 Aug 2008)
+
+  21 Aug 2008; Doug Goldstein <cardoe@gentoo.org>
+  +files/cairo-1.6.4-libpng-api-change.patch, +cairo-1.6.4-r1.ebuild:
+  fix issue with libpng's API change. bug #235072
 
   16 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index cd2cc157f34e..9e087324f6ec 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX cairo-1.6.4-libpng-api-change.patch 799 RMD160 407e2bdbaa1624c2b70c4837eb872b84d48086e6 SHA1 aac038b81fba395b68b27c64814e19bbc1e8826d SHA256 82cf3e542f46b6c07dc32b16c622c0b15bb356f5069b34a9d1cdbd4b4d7481f4
 DIST cairo-1.4.12.tar.gz 3276610 RMD160 5ed65d5872c0561f3392e60007898d9360d83d0a SHA1 45d5257e5a0c1524bcc25660a96b2c79d012ad3f SHA256 a1a1e4ccec8da980141d903adbe83535481b4fda96a479456438d3dfbc767d5d
 DIST cairo-1.4.14.tar.gz 3283608 RMD160 9e7c87a292c889b06b29e9622be0a7daa3ddd6fd SHA1 63310243ba8af949060b06c01fc28ee5471ed5a4 SHA256 8914f9c34a77bf9d908b0c617c2d7ffebdd6d1e855cfd367d2a1b3d677f22e3c
 DIST cairo-1.6.4.tar.gz 5042623 RMD160 ccae736a40d985b72bda7c2f0a98a0838020658e SHA1 9d990fe39a125ceb07221623c237cd7015855d5c SHA256 7f0ce28c358706913bc39e6930a18ae89f3b9a6aa17998faa2b59d1e0e2b4f42
 EBUILD cairo-1.4.12.ebuild 1968 RMD160 64ecf4bd8788e715239de20ed9b8e0b25266258c SHA1 10cd93281e9af9858cd0f61a0708d53681c81afd SHA256 6f25e6e271d47c75deeee9121d25098eb0c6aa25cbdf60349e76d094a4f0d912
 EBUILD cairo-1.4.14.ebuild 1968 RMD160 02f89786e2cfaeb1fac9b075f3f73e79ea4169b0 SHA1 a4449ed556796354013542f11d75e2ab6a7dab69 SHA256 6d226a1a684e84f4958480105df60be0221fe24f62f64ed52c2beed817f6caa7
+EBUILD cairo-1.6.4-r1.ebuild 2288 RMD160 6267843699ec7682c4fa346c55e985cf2876afb4 SHA1 20e6cc46a9d0c684f4dce8f7db7952dfe64cfb80 SHA256 0e85893f66528c19a72d9d9ea40a25ef6706a6f42b7344ce235f8debe76efb9f
 EBUILD cairo-1.6.4.ebuild 2109 RMD160 898bd4a7f842d4945f00773697e0f312a58ec23e SHA1 34b214b0399466c4b59f37f505470ebd45bcd164 SHA256 2fca2991647b18efc2c2b1475a9ff7d751a05a75170a09088a0bf090481ceb21
-MISC ChangeLog 26226 RMD160 9a479346e7bc832397e321f2aea8db9d92d64e0d SHA1 288de5ee34064859e7a92c9c246b7d642e495383 SHA256 21061df7bc71380d006b852a40f559af46f8ec807034a3d7c70d4e58ce5093bb
+MISC ChangeLog 26428 RMD160 bc4070b2be29f5b812a0f2fdbb6e51e3d95125a2 SHA1 4de3445f8a531ce2537a8c8210864ef28586f9a3 SHA256 73cad21ebcc652acb8047cf0cbd2a9eedcfb6241a38fbb9ce59d21142a3dbaa0
 MISC metadata.xml 578 RMD160 4aee79b6f1862ead6fe3478fccdb892d6ce2890d SHA1 4ebe889e1af6b898310568cf242ceca41f28371a SHA256 e3ab8b4144fee81b9780b417fae1bdf734dd46739987c3f24ffe4e10ef84e477
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkimRvsACgkQoeSe8B0zEfwzYwCggwHEfopU4Mu+DX+sc4fDyuqP
-MooAnRAR278ufGNuXoRpb9OTCd7SK+tu
-=3gFY
+iEYEARECAAYFAkita74ACgkQoeSe8B0zEfy7EQCfRWpSmulG0pOWxReCRy8I1T9q
+GKEAn2f3wefa0t0xjFeJYcEsGzM1Wyyt
+=C0sI
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.6.4-r1.ebuild b/x11-libs/cairo/cairo-1.6.4-r1.ebuild
new file mode 100644
index 000000000000..60ea008f6fcf
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.6.4-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.6.4-r1.ebuild,v 1.1 2008/08/21 13:20:16 cardoe Exp $
+
+inherit eutils flag-o-matic libtool
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug directfb doc glitz opengl svg test X xcb"
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND="media-libs/fontconfig
+		>=media-libs/freetype-2.1.9
+		sys-libs/zlib
+		media-libs/libpng
+		>=x11-libs/pixman-0.10.0
+		X?	(
+				x11-libs/libXrender
+				x11-libs/libXext
+				x11-libs/libX11
+				virtual/xft
+				xcb? ( x11-libs/libxcb
+						x11-libs/xcb-util )
+			)
+		directfb? ( >=dev-libs/DirectFB-0.9.24 )
+		glitz? ( >=media-libs/glitz-0.5.1 )
+		svg? ( dev-libs/libxml2 )"
+
+DEPEND="${RDEPEND}
+		>=dev-util/pkgconfig-0.19
+		X? ( x11-proto/renderproto
+			xcb? ( x11-proto/xcb-proto ) )
+		doc?	(
+					>=dev-util/gtk-doc-1.6
+					 ~app-text/docbook-xml-dtd-4.2
+				)"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# libpng's API changed as of 1.2.30, this is backwards compat with
+	# older libpng's as well. bug #235072
+	epatch "${FILESDIR}"/${PN}-1.6.4-libpng-api-change.patch
+
+	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
+	elibtoolize
+}
+
+src_compile() {
+	local use_xcb
+
+	#gets rid of fbmmx.c inlining warnings
+	append-flags -finline-limit=1200
+
+	if use glitz && use opengl; then
+		export glitz_LIBS=-lglitz-glx
+	fi
+
+	use_xcb="--disable-xcb"
+	use X && use xcb && use_xcb="--enable-xcb"
+
+	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
+		$(use_enable directfb) ${use_xcb} \
+		$(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
+		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
+		--enable-freetype --enable-ps \
+		|| die "configure failed"
+
+	emake || die "compile failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/x11-libs/cairo/files/cairo-1.6.4-libpng-api-change.patch b/x11-libs/cairo/files/cairo-1.6.4-libpng-api-change.patch
new file mode 100644
index 000000000000..b67de786b361
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.6.4-libpng-api-change.patch
@@ -0,0 +1,27 @@
+diff -ru cairo-1.6.4/src/cairo-png.c cairo-1.6.4-mod/src/cairo-png.c
+--- cairo-1.6.4/src/cairo-png.c	2008-04-11 17:07:25.000000000 -0400
++++ cairo-1.6.4-mod/src/cairo-png.c	2008-08-19 17:19:36.682399853 -0400
+@@ -119,6 +119,14 @@
+ }
+ 
+ 
++/* Starting with libpng-1.2.30, we must explicitly specify an output_flush_fn. 
++ * Otherwise, we will segfault if we are writing to a stream. */
++static void
++png_simple_output_flush_fn (png_structp png_ptr)
++{
++    return;
++}
++
+ static cairo_status_t
+ write_png (cairo_surface_t	*surface,
+ 	   png_rw_ptr		write_func,
+@@ -179,7 +187,7 @@
+ 	goto BAIL3;
+ #endif
+ 
+-    png_set_write_fn (png, closure, write_func, NULL);
++    png_set_write_fn (png, closure, write_func, png_simple_output_flush_fn);
+ 
+     switch (image->format) {
+     case CAIRO_FORMAT_ARGB32: