r12875 - in packages/trunk/freegish/debian: . patches

[Lubos Novak]

Author: lubos-guest
Date: 2011-11-28 12:56:23 +0000 (Mon, 28 Nov 2011)
New Revision: 12875

Added:
   packages/trunk/freegish/debian/patches/fix_for_png15.patch
Modified:
   packages/trunk/freegish/debian/changelog
   packages/trunk/freegish/debian/patches/series
Log:
Fix FTBFS with libpng 1.5

Modified: packages/trunk/freegish/debian/changelog
===================================================================
--- packages/trunk/freegish/debian/changelog	2011-11-28 12:23:15 UTC (rev 12874)
+++ packages/trunk/freegish/debian/changelog	2011-11-28 12:56:23 UTC (rev 12875)
@@ -1,11 +1,12 @@
 freegish (1.53+git20101011+dfsg-2) UNRELEASED; urgency=low
 
+  * Fix FTBFS with libpng 1.5. (Closes: #649796)
   * Fix FTBFS on kFreeBSD and Hurd.
   * Changed description string to make lintian happy.
   * Added Recommends freegish to freegish-data.
   * Bump Standards Version to 3.9.2. (No changes needed).
 
- -- Luboš Novák <alvinx12 at centrum.cz>  Mon, 28 Nov 2011 12:59:33 +0100
+ -- Luboš Novák <alvinx12 at centrum.cz>  Mon, 28 Nov 2011 13:49:12 +0100
 
 freegish (1.53+git20101011+dfsg-1) unstable; urgency=low
 

Added: packages/trunk/freegish/debian/patches/fix_for_png15.patch
===================================================================
--- packages/trunk/freegish/debian/patches/fix_for_png15.patch	                        (rev 0)
+++ packages/trunk/freegish/debian/patches/fix_for_png15.patch	2011-11-28 12:56:23 UTC (rev 12875)
@@ -0,0 +1,50 @@
+fix FTBFS for libpng 1.5
+Index: freegish-1.53+git20101011+dfsg/video/texture.c
+===================================================================
+--- freegish-1.53+git20101011+dfsg.orig/video/texture.c	2011-11-26 18:10:31.000000000 +0100
++++ freegish-1.53+git20101011+dfsg/video/texture.c	2011-11-26 18:11:43.000000000 +0100
+@@ -89,27 +89,27 @@
+ 						png_read_info(png_ptr, info_ptr);
+ 
+ 						/* expand paletted colors into true rgb */
+-						if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
++						if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_PALETTE)
+ 							png_set_expand(png_ptr);
+ 
+ 						/* expand grayscale images to the full 8 bits */
+-						if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY && info_ptr->bit_depth < 8)
++						if (png_get_color_type(png_ptr, info_ptr) == PNG_COLOR_TYPE_GRAY && png_get_bit_depth(png_ptr, info_ptr) < 8)
+ 							png_set_expand(png_ptr);
+ 
+ 						/* expand images with transparency to full alpha channels */
+-						if (info_ptr->valid & PNG_INFO_tRNS)
++						if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
+ 							png_set_expand(png_ptr);
+ 
+ 						/* tell libpng to strip 16 bit depth files down to 8 bits */
+-						if (info_ptr->bit_depth == 16)
++						if (png_get_bit_depth(png_ptr, info_ptr) == 16)
+ 							png_set_strip_16(png_ptr);
+ 
+ 						/* fill upto 4 byte RGBA - we always want an alpha channel*/
+-						if (info_ptr->bit_depth == 8 && info_ptr->color_type != PNG_COLOR_TYPE_RGB_ALPHA)
++						if (png_get_bit_depth(png_ptr, info_ptr) == 8 && png_get_color_type(png_ptr, info_ptr) != PNG_COLOR_TYPE_RGB_ALPHA)
+ 							png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
+ 
+ 						// XXX: is this required? we're not handling interlaced PNGs ...
+-						if (info_ptr->interlace_type)
++						if (png_get_interlace_type(png_ptr, info_ptr))
+ 							number_passes = png_set_interlace_handling(png_ptr);
+ 						else
+ 							number_passes = 1;
+@@ -125,8 +125,8 @@
+ 						else
+ 						{
+ 							int w, h, y;
+-							w = info_ptr->width;
+-							h = info_ptr->height;
++							w = png_get_image_width(png_ptr, info_ptr);
++							h = png_get_image_height(png_ptr, info_ptr);
+ 							*width = w;
+ 							*height = h;
+ 							*rgba = (unsigned int *) malloc(w*h*4);

Modified: packages/trunk/freegish/debian/patches/series
===================================================================
--- packages/trunk/freegish/debian/patches/series	2011-11-28 12:23:15 UTC (rev 12874)
+++ packages/trunk/freegish/debian/patches/series	2011-11-28 12:56:23 UTC (rev 12875)
@@ -3,3 +3,4 @@
 rename_config_dir.patch
 custom_level_loading.patch
 ftbfs_freebsd_hurd.patch
+fix_for_png15.patch