Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting2.git;a=commitdiff;h=8d25d0c9d39ab60fa7ea4d1e5bcde05ca34714ed

commit 8d25d0c9d39ab60fa7ea4d1e5bcde05ca34714ed
Author: Baste <[email protected]>
Date:   Wed Jun 27 16:51:59 2012 +0200

mathgl-1.11.2-2-x86_64
* Add libpng15.patch

diff --git a/source/xlib-extra/mathgl/FrugalBuild 
b/source/xlib-extra/mathgl/FrugalBuild
index 6685102..ff218f9 100644
--- a/source/xlib-extra/mathgl/FrugalBuild
+++ b/source/xlib-extra/mathgl/FrugalBuild
@@ -13,7 +13,9 @@ _F_sourceforge_dirname=$pkgname
_F_sourceforge_ext=".tar.gz"
Finclude sourceforge python
Fconfopts="$Fconfopts --enable-fltk --enable-glut --enable-qt --enable-jpeg 
--enable-gif --enable-hdf5 --enable-python --enable-octave"
-sha1sums=('16b9ab58e654c5b91374f8a35eafc33630d7f5c0')
+source=($source libpng15.patch)
+sha1sums=('16b9ab58e654c5b91374f8a35eafc33630d7f5c0' \
+          'a44c1213385e53466ff7cb0c91cdfdc1f82b8905')

subpkgs=('mathgl-qt' 'mathgl-fltk' 'mathgl-glut' 'mathgl-python' 
'mathgl-octave')
subdescs=('QT interface for Mathgl library' 'FLTK interface for Mathgl library' 
'GLUT interface for Mathgl library'  \
diff --git a/source/xlib-extra/mathgl/libpng15.patch 
b/source/xlib-extra/mathgl/libpng15.patch
new file mode 100644
index 0000000..f28e06c
--- /dev/null
+++ b/source/xlib-extra/mathgl/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

Reply via email to