diff options
| author | Gustavo Zacarias <gustavo@zacarias.com.ar> | 2013-10-25 08:34:41 -0300 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2013-10-26 11:07:59 +0200 |
| commit | 70da2ae5ff0c816c7a0c500293b50d3d0dd9b641 (patch) | |
| tree | dee9addebfedb059688a7b453864aeeafa0e7181 /package/matchbox | |
| parent | a784f7566e3dc67f963aa8bc4da296474d0e7fa8 (diff) | |
matchbox-lib: patch up support for libpng 1.5+
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/matchbox')
| -rw-r--r-- | package/matchbox/matchbox-lib/matchbox-lib-1.9-libpng15.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/package/matchbox/matchbox-lib/matchbox-lib-1.9-libpng15.patch b/package/matchbox/matchbox-lib/matchbox-lib-1.9-libpng15.patch new file mode 100644 index 000000000..3d68573b5 --- /dev/null +++ b/package/matchbox/matchbox-lib/matchbox-lib-1.9-libpng15.patch @@ -0,0 +1,26 @@ +Support for libpng 1.5+ shamelessly taken from Gentoo. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +--- a/libmb/mbpixbuf.c ++++ b/libmb/mbpixbuf.c +@@ -247,7 +247,7 @@ + return NULL; + } + +- if ( setjmp( png_ptr->jmpbuf ) ) { ++ if ( setjmp( png_jmpbuf(png_ptr) ) ) { + png_destroy_read_struct( &png_ptr, &info_ptr, NULL); + fclose(fd); + return NULL; +@@ -269,8 +269,8 @@ + ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA )) + png_set_gray_to_rgb(png_ptr); + +- if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA +- || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA ++ if ( color_type == PNG_COLOR_TYPE_RGB_ALPHA ++ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA + ) + *has_alpha = 1; + else |