summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-03-09 16:59:35 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-03-09 16:59:35 +0000
commit24f1010fc29dd56db87552270b1c2ef7741ba9de (patch)
tree4a8e72918df861e1ba606a38fd1e8489e533b8d1 /games-arcade/briquolo/files
parentnet-im/qutecom: new ebuild for bug 237941 (diff)
downloadgentoo-2-24f1010fc29dd56db87552270b1c2ef7741ba9de.tar.gz
gentoo-2-24f1010fc29dd56db87552270b1c2ef7741ba9de.tar.bz2
gentoo-2-24f1010fc29dd56db87552270b1c2ef7741ba9de.zip
Fix building with libpng14 wrt #308667 by Locke Shinseiko (Wizzleby).
(Portage version: 2.2_rc66/cvs/Linux x86_64)
Diffstat (limited to 'games-arcade/briquolo/files')
-rw-r--r--games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch b/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch
new file mode 100644
index 000000000000..d325bac02578
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-libpng14.patch
@@ -0,0 +1,31 @@
+http://bugs.gentoo.org/show_bug.cgi?id=308667
+
+--- src/MOGL/MOGL_Image.cpp
++++ src/MOGL/MOGL_Image.cpp
+@@ -183,7 +183,7 @@ bool MOGL_Image::ChargerPNG(const char *
+ info_ptr = png_create_info_struct(png_ptr);
+ if (info_ptr == NULL)
+ {
+- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ return false;
+ }
+
+@@ -191,7 +191,7 @@ bool MOGL_Image::ChargerPNG(const char *
+ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ // On libère la mémoire
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return false;
+ }
+
+@@ -235,7 +235,7 @@ bool MOGL_Image::ChargerPNG(const char *
+ /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */
+ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
+ {
+- png_set_gray_1_2_4_to_8(png_ptr);
++ png_set_expand_gray_1_2_4_to_8(png_ptr);
+ }
+
+ /* Expand paletted or RGB images with transparency to full alpha channels