Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting2.git;a=commitdiff;h=2963ddccc9a13b4114aad4b2636f1964671cd713
commit 2963ddccc9a13b4114aad4b2636f1964671cd713 Author: Baste <[email protected]> Date: Wed Jun 27 16:56:31 2012 +0200 flam3-3.0.1-4-x86_64 * Add libpng15.patch diff --git a/source/xlib-extra/flam3/FrugalBuild b/source/xlib-extra/flam3/FrugalBuild index e026bb0..644aba6 100644 --- a/source/xlib-extra/flam3/FrugalBuild +++ b/source/xlib-extra/flam3/FrugalBuild @@ -10,9 +10,10 @@ depends=('libjpeg>=8a' 'libxml2>=2.7.8' 'libpng>=1.4.1') Finclude googlecode groups=('xlib-extra') archs=('i686' 'x86_64') -source=($source svn.diff) +source=($source svn.diff libpng15.patch) sha1sums=('8814515f2e49e034e47cf97e9d2c0e932844abb9' \ - '38d599dfd7001823e1669ffe107062316abb2235') + '38d599dfd7001823e1669ffe107062316abb2235' \ + 'a44c1213385e53466ff7cb0c91cdfdc1f82b8905') build() { Fpatchall diff --git a/source/xlib-extra/flam3/libpng15.patch b/source/xlib-extra/flam3/libpng15.patch new file mode 100644 index 0000000..f28e06c --- /dev/null +++ b/source/xlib-extra/flam3/libpng15.patch @@ -0,0 +1,77 @@ +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); + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
