summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2013-10-25 11:34:41 (GMT)
committer Peter Korsgaard <peter@korsgaard.com>2013-10-26 09:07:59 (GMT)
commit70da2ae5ff0c816c7a0c500293b50d3d0dd9b641 (patch)
treedee9addebfedb059688a7b453864aeeafa0e7181
parenta784f7566e3dc67f963aa8bc4da296474d0e7fa8 (diff)
downloadbuildroot-70da2ae5ff0c816c7a0c500293b50d3d0dd9b641.tar.gz
buildroot-70da2ae5ff0c816c7a0c500293b50d3d0dd9b641.tar.bz2
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>
-rw-r--r--package/matchbox/matchbox-lib/matchbox-lib-1.9-libpng15.patch26
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 0000000..3d68573
--- /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