diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2011-08-09 18:32:26 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-08-09 18:32:26 +0000 |
commit | dd40f8eb3156d7705997be76f2f92bb609121bbb (patch) | |
tree | 5d94b02fbf0334a9ab8784304fd6d28d9b328953 /media-gfx | |
parent | Migrate changes from Gentoo Prefix. EAPI3, KEYWORDS, mint CXXFLAGS, add EPREF... (diff) | |
download | historical-dd40f8eb3156d7705997be76f2f92bb609121bbb.tar.gz historical-dd40f8eb3156d7705997be76f2f92bb609121bbb.tar.bz2 historical-dd40f8eb3156d7705997be76f2f92bb609121bbb.zip |
Version bump with libpng15 compability patch wrt #378469 by Diego Elio Pettenò
Package-Manager: portage-2.2.0_alpha50/cvs/Linux x86_64
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/flam3/ChangeLog | 9 | ||||
-rw-r--r-- | media-gfx/flam3/Manifest | 15 | ||||
-rw-r--r-- | media-gfx/flam3/files/flam3-3.0.1-libpng15.patch | 76 | ||||
-rw-r--r-- | media-gfx/flam3/flam3-3.0.1.ebuild | 45 |
4 files changed, 143 insertions, 2 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/Manifest b/media-gfx/flam3/Manifest index a70d7b9d2a44..f29c199aa112 100644 --- a/media-gfx/flam3/Manifest +++ b/media-gfx/flam3/Manifest @@ -1,7 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX flam3-3.0.1-libpng15.patch 2446 RMD160 ecd5ac1fc32aa3932b2d76d809636af1b2911a9b SHA1 17ece6cc00899e5135dad2bc79f97dfbd73107a6 SHA256 2f90c112edff5418ca662b4dea7de8a21ca870fad1024c294c714e89b6b7fb23 DIST flam3-2.7.18.tar.gz 1093666 RMD160 abfea3fcbc7dfb2f671c4645364faa487edeee68 SHA1 e4b6420bc4c47f489903a0fedf66d39f5ada7aaa SHA256 f3f8155d8a0ea11a23412566e18b2751da84f9ae24bd0f37a5f6484b10ad817e +DIST flam3-3.0.1.tar.gz 1238703 RMD160 2e834147deb2edc0ee26054cb4fc8b502bce4986 SHA1 8814515f2e49e034e47cf97e9d2c0e932844abb9 SHA256 70810049604527a689ba172670c152b463273255e46f0f04091c867399859aa7 DIST flam3-3.0.tar.gz 1238210 RMD160 e77bf1197f3ad5aedd62c581bbe9d816a802bba1 SHA1 5b3317bdf51ecce7414a728c9d3735122a083b23 SHA256 411a59b86fa6a2122857b08370c197ad113295d62e403d97bd4e1376746cafc1 EBUILD flam3-2.7.18-r1.ebuild 690 RMD160 90713648fb327e7297c93fad1634d9bd58ba0b45 SHA1 5e6c5df08e0205dc060c1ca3958c304400370d38 SHA256 92fa4a45ee34d80268a3775477310dbbd5821397d8cb76d55b41326d3c630e60 +EBUILD flam3-3.0.1.ebuild 880 RMD160 312258685a4a5d3a5b9f73cfee60c8f86fcd6e34 SHA1 3f99cd1f731aad9fc863f303f9852c8570c7cfa3 SHA256 ced1a951806a2876aa4fbe6eb8f1802d8a3e7d4a408da04df1122eae5e4a15d1 EBUILD flam3-3.0.ebuild 720 RMD160 a739d6924481ed0db8044ab349c7f945f37f6357 SHA1 db0f15576cd0235ec44e82669fb2113c66e99f7e SHA256 fba8ecc9db3601210cde62bc024f48a59c85f34095d8505dd817e92fc1227b8d EBUILD flam3-9999.ebuild 791 RMD160 526708d5ec6a845d0f9f571c7ac11b9bcb947570 SHA1 865bcb0a408e7a97c9457eae1089682763da6544 SHA256 ff744ac0d1683bbd02bb5f73c75095c1f7d34902c3a9c8ef3cdd0da910a81676 -MISC ChangeLog 1987 RMD160 fafc8b4678273e4fee90a6117388abbbb020df94 SHA1 2b77594ab8f71919743d8f23ad31e02172f7b52c SHA256 0af3d2817729941dbc55cebd9ad2d382fd22899310296e607ea4b4f2a34b40e5 +MISC ChangeLog 2214 RMD160 8887d048acb41f403826f59fc44f561c69429229 SHA1 d83faaf5434f1b04bd56bada1c566cf5eb78139b SHA256 1b5084b59ba625a836dbaa8c71a6a0548e74cb0810dd7a2abe983f1bf55bb9d9 MISC metadata.xml 255 RMD160 dbe77cd804a4411e8445c05f6e632fdc2f72d082 SHA1 94e7a8d2d43907279488b984c3dcd9fd1888ce25 SHA256 28c7b0445a5f2eb0d524ff3afcef712ecbf345592d26142f71a3ef9bca653d4b +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iF4EAREIAAYFAk5BfTEACgkQXkR9YqOcLPFrzQEAqqT9czIXcMD/ZFIlkaLVks3b +G+VUCLmZar09Th8Gn4cA/0zAUZMFPGaWqRkruBK3L8U6K4aT4VLBVo+BtUVF92xG +=B9sN +-----END PGP SIGNATURE----- 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 +} |