Version bump with libpng15 compability patch wrt #378469 by Diego Elio Pettenò

(Portage version: 2.2.0_alpha50/cvs/Linux x86_64)

3 files changed, 129 insertions, 1 deletions

diff --git a/media-gfx/flam3/ChangeLog b/media-gfx/flam3/ChangeLog
index dddca66381cf..61ad57628d4e 100644
--- a/media-gfx/flam3/ChangeLog
+++ b/media-gfx/flam3/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/flam3
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/flam3/ChangeLog,v 1.10 2011/02/26 17:10:21 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/flam3/ChangeLog,v 1.11 2011/08/09 18:32:26 ssuominen Exp $
+
+*flam3-3.0.1 (09 Aug 2011)
+
+  09 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> +flam3-3.0.1.ebuild,
+  +files/flam3-3.0.1-libpng15.patch:
+  Version bump with libpng15 compability patch wrt #378469 by Diego Elio
+  Pettenò
 
   26 Feb 2011; Kevin McCarthy <signals@gentoo.org> flam3-2.7.18-r1.ebuild,
   flam3-3.0.ebuild, flam3-9999.ebuild:
diff --git a/media-gfx/flam3/files/flam3-3.0.1-libpng15.patch b/media-gfx/flam3/files/flam3-3.0.1-libpng15.patch
new file mode 100644
index 000000000000..61f905589872
--- /dev/null
+++ b/media-gfx/flam3/files/flam3-3.0.1-libpng15.patch
@@ -0,0 +1,76 @@
+http://code.google.com/p/flam3/issues/detail?id=8
+
+--- src/png.c
++++ src/png.c
+@@ -142,7 +142,7 @@
+   }
+   if (setjmp(png_jmpbuf(png_ptr))) {
+      if (png_image) {
+-	 for (y = 0 ; y < info_ptr->height ; y++)
++	 for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++)
+ 	     free (png_image[y]);
+ 	 free (png_image);
+      }
+@@ -161,19 +161,19 @@
+   png_set_sig_bytes (png_ptr, SIG_CHECK_SIZE);
+   png_read_info (png_ptr, info_ptr);
+ 
+-  if (8 != info_ptr->bit_depth) {
++  if (8 != png_get_bit_depth(png_ptr, info_ptr)) {
+     fprintf(stderr, "bit depth type must be 8, not %d.\n",
+-	    info_ptr->bit_depth);
++	    png_get_bit_depth(png_ptr, info_ptr));
+     return 0;
+   }
+ 
+-  *width = info_ptr->width;
+-  *height = info_ptr->height;
++  *width = png_get_image_width(png_ptr, info_ptr);
++  *height = png_get_image_height(png_ptr, info_ptr);
+   p = q = malloc(4 * *width * *height);
+-  png_image = (png_byte **)malloc (info_ptr->height * sizeof (png_byte*));
++  png_image = (png_byte **)malloc (png_get_image_height(png_ptr, info_ptr) * sizeof (png_byte*));
+ 
+-  linesize = info_ptr->width;
+-  switch (info_ptr->color_type) {
++  linesize = png_get_image_width(png_ptr, info_ptr);
++  switch (png_get_color_type(png_ptr, info_ptr)) {
+     case PNG_COLOR_TYPE_RGB:
+       linesize *= 3;
+       break;
+@@ -182,21 +182,21 @@
+       break;
+   default:
+     fprintf(stderr, "color type must be RGB or RGBA not %d.\n",
+-	    info_ptr->color_type);
++	    png_get_color_type(png_ptr, info_ptr));
+     return 0;
+   }
+ 
+-  for (y = 0 ; y < info_ptr->height ; y++) {
++  for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++) {
+     png_image[y] = malloc (linesize);
+   }
+   png_read_image (png_ptr, png_image);
+   png_read_end (png_ptr, info_ptr);
+ 
+-  for (y = 0 ; y < info_ptr->height ; y++) {
++  for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++) {
+     unsigned char *s = png_image[y];
+-    for (x = 0 ; x < info_ptr->width ; x++) {
++    for (x = 0 ; x < png_get_image_width(png_ptr, info_ptr) ; x++) {
+ 
+-      switch (info_ptr->color_type) {
++      switch (png_get_color_type(png_ptr, info_ptr)) {
+       case PNG_COLOR_TYPE_RGB:
+ 	p[0] = s[0];
+ 	p[1] = s[1];
+@@ -217,7 +217,7 @@
+     }
+   }
+ 
+-  for (y = 0 ; y < info_ptr->height ; y++)
++  for (y = 0 ; y < png_get_image_height(png_ptr, info_ptr) ; y++)
+     free (png_image[y]);
+   free (png_image);
+   png_destroy_read_struct (&png_ptr, &info_ptr, (png_infopp)NULL);  
diff --git a/media-gfx/flam3/flam3-3.0.1.ebuild b/media-gfx/flam3/flam3-3.0.1.ebuild
new file mode 100644
index 000000000000..0b64313ccaf9
--- /dev/null
+++ b/media-gfx/flam3/flam3-3.0.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/flam3/flam3-3.0.1.ebuild,v 1.1 2011/08/09 18:32:26 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="Tools and a library for creating flame fractal images"
+HOMEPAGE="http://flam3.com/"
+SRC_URI="http://flam3.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/libxml2
+	media-libs/libpng
+	virtual/jpeg
+	!<=x11-misc/electricsheep-2.6.8-r2"
+DEPEND="${RDEPEND}"
+
+S=${S}/src
+
+DOCS=( README.txt )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng15.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	rm -f "${D}"usr/lib*/libflam3.la
+
+	docinto examples
+	dodoc *.flam3
+}