svn commit: r375459 - in head/games/motogt: . files

[Antoine Brodin]

Author: antoine
Date: Wed Dec 24 13:52:11 2014
New Revision: 375459
URL: https://svnweb.freebsd.org/changeset/ports/375459
QAT: https://qat.redports.org/buildarchive/r375459/

Log:
  Properly support png 1.5
  
  Obtained from:	Archlinux

Modified:
  head/games/motogt/Makefile
  head/games/motogt/files/patch-src-MakeData.cpp

Modified: head/games/motogt/Makefile
==============================================================================
--- head/games/motogt/Makefile	Wed Dec 24 13:51:30 2014	(r375458)
+++ head/games/motogt/Makefile	Wed Dec 24 13:52:11 2014	(r375459)
@@ -25,7 +25,6 @@ USE_GL=		gl
 BUILD_WRKSRC=	${WRKSRC}/src
 MAKEFILE=	Makefile.lnx
 MAKE_JOBS_UNSAFE=	yes
-CFLAGS+=	-I${LOCALBASE}/include/libpng15
 SUB_FILES=	motogt
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

Modified: head/games/motogt/files/patch-src-MakeData.cpp
==============================================================================
--- head/games/motogt/files/patch-src-MakeData.cpp	Wed Dec 24 13:51:30 2014	(r375458)
+++ head/games/motogt/files/patch-src-MakeData.cpp	Wed Dec 24 13:52:11 2014	(r375459)
@@ -1,16 +1,38 @@
---- src/MakeData.cpp.orig	2011-01-10 18:40:30.000000000 +0100
-+++ src/MakeData.cpp	2012-05-03 20:21:33.000000000 +0200
-@@ -4,7 +4,9 @@
- #include <cstdio>
+--- src/MakeData.cpp.orig	2011-01-10 17:40:30 UTC
++++ src/MakeData.cpp
+@@ -5,6 +5,7 @@
  #define PNG_DEBUG 3
  #include <png.h>
-+#include <pngpriv.h>
  #include <fstream>
 +#include <sys/stat.h>
  #include "global.h"
  #include "Config.h"
  #include "Confirm.h"
-@@ -376,7 +378,12 @@
+@@ -109,10 +110,10 @@ struct PngFile {
+ 		
+ 		png_read_info(png_ptr, info_ptr);
+ 		
+-		width = info_ptr->width;
+-		height = info_ptr->height;
+-		color_type = info_ptr->color_type;
+-		bit_depth = info_ptr->bit_depth;
++		width = png_get_image_width(png_ptr, info_ptr);
++		height = png_get_image_height(png_ptr, info_ptr);
++		color_type = png_get_color_type(png_ptr, info_ptr);
++		bit_depth = png_get_bit_depth(png_ptr, info_ptr);
+ 		
+ 		number_of_passes = png_set_interlace_handling(png_ptr);
+ 		png_read_update_info(png_ptr, info_ptr);
+@@ -125,7 +126,7 @@ struct PngFile {
+ 		
+ 		row_pointers = (png_bytep*) malloc(sizeof(png_bytep) * height);
+ 		for (int y=0; y<height; y++)
+-			row_pointers[y] = (png_byte*) malloc(info_ptr->rowbytes);
++			row_pointers[y] = (png_byte*) malloc(png_get_rowbytes(png_ptr,info_ptr));
+ 		
+ 		png_read_image(png_ptr, row_pointers);
+ 		
+@@ -376,7 +377,12 @@ struct PngFile {
  				}
  				fname[2]='0'+i; 
  				fname[1]='0'+j;