Fix building with libpng-1.5 #354989 by Lars Wendler.

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

4 files changed, 100 insertions, 9 deletions

diff --git a/media-libs/imlib2/ChangeLog b/media-libs/imlib2/ChangeLog
index baa049209ed8..f04cd0ae83c3 100644
--- a/media-libs/imlib2/ChangeLog
+++ b/media-libs/imlib2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/imlib2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.103 2011/01/02 20:11:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/ChangeLog,v 1.104 2011/02/19 19:43:42 vapier Exp $
+
+  19 Feb 2011; Mike Frysinger <vapier@gentoo.org> imlib2-1.4.4.ebuild,
+  +files/imlib2-1.4.4-libpng-1.5.patch:
+  Fix building with libpng-1.5 #354989 by Lars Wendler.
 
   02 Jan 2011; Mike Frysinger <vapier@gentoo.org> imlib2-1.4.4.ebuild:
   Mark ppc stable #344781.
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index 5335a31c38b9..c26b3d8433ea 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX imlib2-1.4.4-libpng-1.5.patch 2540 RMD160 786c51b639ba1e7aa272afdce42004c1bd1fc057 SHA1 f9d9b7c3de82fdf177691a27c35d4179819a254b SHA256 5c4e0f1c5a4543e9f92f2974c7c996244274a1498bcb7083301d1153d6d79980
 DIST imlib2-1.4.4.tar.gz 977630 RMD160 5428899e202a56e91a0421d6c44dd41b0d3011f7 SHA1 3e1fc356a78fbc902a6199241b75cd9830b7fa5f SHA256 a4de52c90b8cd155b41ca70c2d34209f7b94a9e4f8e77582f2682a1795306198
-EBUILD imlib2-1.4.4.ebuild 1374 RMD160 67a88df8f0c289e69facb2fa6b0b3265238f71f7 SHA1 3d5be19dfa7d5f1c76cf9f3b4b454b1404484cb7 SHA256 4d20091e8e5ccec60c89e2822a08f415fc95bc5b1773b938a3d89aeb5140109b
-MISC ChangeLog 12274 RMD160 4e7b284cea8ce1e56b20e67a9a0a2d3c2c1e6b68 SHA1 cc52c5f25a0de9534f056c14023ec413540c7691 SHA256 d9644385cb9aef089463cbc650baa498e03979977ff3a3960311c2a01d027bbc
+EBUILD imlib2-1.4.4.ebuild 1445 RMD160 2d3cf336379d0884d73866ed234d97b022c227b1 SHA1 9b545b766792e7091a07be097edb28b4390fb840 SHA256 694360457a4b76666b45c484666b25137b05d57f9ab3baab75200a661c7839ff
+MISC ChangeLog 12442 RMD160 e7c5ef22f3360420f9fbe62f49dcc89c6a40866e SHA1 daaf57d367ed40c05eff9a0fc1b838fce89a50ac SHA256 b99a86ac17b49aad2332a4ab44b13d0e3ca54f8ca469b05b16ec5dd6c312acae
 MISC metadata.xml 2255 RMD160 da6c5bba4102a0a0bf263ed8f986704d74292a8f SHA1 5e968e9ca6c3640ee5e3c98c6939099014edbb27 SHA256 81f9771e8e64255ed50d174fe917f9ed0507db9afe88df9f29ce311a6075b30f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk0g3A4ACgkQaC/OocHi7JacvQD/RZ3+97Ac8yXgmJz+YOeiImjC
-a9qHr4IOtK9GH3LD5s0A/2G9n1wBXzJXDtZvS2l8aark6nYfOT1Cf1+nCt1kGmf+
-=nIDm
+iF4EAREIAAYFAk1gHXMACgkQaC/OocHi7Ja72AD+Kb33eOWTAMRvpf+Z+gjdrrga
+asimGLCysuM8OF8px/QA/1ZjbiFeQXnmgy50G4UTdwp4p8i/TZ/3QvTjXJTymdiP
+=YFJ8
 -----END PGP SIGNATURE-----
diff --git a/media-libs/imlib2/files/imlib2-1.4.4-libpng-1.5.patch b/media-libs/imlib2/files/imlib2-1.4.4-libpng-1.5.patch
new file mode 100644
index 000000000000..069538ef657d
--- /dev/null
+++ b/media-libs/imlib2/files/imlib2-1.4.4-libpng-1.5.patch
@@ -0,0 +1,82 @@
+http://bugs.gentoo.org/354989
+
+# http://sourceforge.net/mailarchive/message.php?msg_id=26972342
+
+$NetBSD: patch-af,v 1.4 2011/01/14 10:02:54 wiz Exp $
+
+Fix build with png-1.5.
+
+has also been committed upstream.
+
+--- src/modules/loaders/loader_png.c
++++ src/modules/loaders/loader_png.c
+@@ -58,7 +58,7 @@
+              fclose(f);
+              return 0;
+           }
+-        if (setjmp(png_ptr->jmpbuf))
++        if (setjmp(png_jmpbuf(png_ptr)))
+           {
+              png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+              fclose(f);
+@@ -238,7 +238,7 @@
+    png_structp         png_ptr;
+    png_infop           info_ptr;
+    DATA32             *ptr;
+-   int                 x, y, j;
++   int                 x, y, j, interlace;
+    png_bytep           row_ptr, data = NULL;
+    png_color_8         sig_bit;
+    int                 pl = 0;
+@@ -265,7 +265,7 @@
+         png_destroy_write_struct(&png_ptr, (png_infopp) NULL);
+         return 0;
+      }
+-   if (setjmp(png_ptr->jmpbuf))
++   if (setjmp(png_jmpbuf(png_ptr)))
+      {
+         fclose(f);
+         png_destroy_write_struct(&png_ptr, (png_infopp) & info_ptr);
+@@ -274,11 +274,11 @@
+      }
+ 
+    /* check whether we should use interlacing */
++   interlace = PNG_INTERLACE_NONE;
+    if ((tag = __imlib_GetTag(im, "interlacing")) && tag->val)
+      {
+ #ifdef PNG_WRITE_INTERLACING_SUPPORTED
+-          png_ptr->interlaced = PNG_INTERLACE_ADAM7;
+-          num_passes = png_set_interlace_handling(png_ptr);
++          interlace = PNG_INTERLACE_ADAM7;
+ #endif
+      }
+ 
+@@ -286,7 +286,7 @@
+    if (im->flags & F_HAS_ALPHA)
+      {
+         png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8,
+-                     PNG_COLOR_TYPE_RGB_ALPHA, png_ptr->interlaced,
++                     PNG_COLOR_TYPE_RGB_ALPHA, interlace,
+                      PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ #ifdef WORDS_BIGENDIAN
+         png_set_swap_alpha(png_ptr);
+@@ -297,7 +297,7 @@
+    else
+      {
+         png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8, PNG_COLOR_TYPE_RGB,
+-                     png_ptr->interlaced, PNG_COMPRESSION_TYPE_BASE,
++                     interlace, PNG_COMPRESSION_TYPE_BASE,
+                      PNG_FILTER_TYPE_BASE);
+         data = malloc(im->w * 3 * sizeof(char));
+      }
+@@ -344,6 +344,10 @@
+    png_set_shift(png_ptr, &sig_bit);
+    png_set_packing(png_ptr);
+ 
++#ifdef PNG_WRITE_INTERLACING_SUPPORTED
++   num_passes = png_set_interlace_handling(png_ptr);
++#endif
++
+    for (pass = 0; pass < num_passes; pass++)
+      {
+       ptr = im->data;
diff --git a/media-libs/imlib2/imlib2-1.4.4.ebuild b/media-libs/imlib2/imlib2-1.4.4.ebuild
index d711f836a3e0..29103e3d89e7 100644
--- a/media-libs/imlib2/imlib2-1.4.4.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.4.ebuild,v 1.8 2011/01/02 20:11:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.4.ebuild,v 1.9 2011/02/19 19:43:42 vapier Exp $
 
-EAPI="1"
+EAPI="2"
 
 inherit enlightenment toolchain-funcs
 
@@ -23,6 +23,10 @@ DEPEND="=media-libs/freetype-2*
 	X? ( x11-libs/libXext x11-proto/xextproto )
 	mp3? ( media-libs/libid3tag )"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng-1.5.patch #354989
+}
+
 src_compile() {
 	# imlib2 has diff configure options for x86/amd64 mmx
 	local myconf=""