From 70da2ae5ff0c816c7a0c500293b50d3d0dd9b641 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 25 Oct 2013 08:34:41 -0300 Subject: [PATCH] matchbox-lib: patch up support for libpng 1.5+ Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../matchbox-lib-1.9-libpng15.patch | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/matchbox/matchbox-lib/matchbox-lib-1.9-libpng15.patch 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 0000000000..3d68573b5f --- /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 + +--- 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 -- 2.30.2