From owner-svn-ports-head@FreeBSD.ORG Wed Dec 24 13:52:13 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8B9D5668; Wed, 24 Dec 2014 13:52:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5D6013827; Wed, 24 Dec 2014 13:52:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBODqDNB043619; Wed, 24 Dec 2014 13:52:13 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBODqCfA043617; Wed, 24 Dec 2014 13:52:12 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201412241352.sBODqCfA043617@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Wed, 24 Dec 2014 13:52:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375459 - in head/games/motogt: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Dec 2014 13:52:13 -0000 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 +--- src/MakeData.cpp.orig 2011-01-10 17:40:30 UTC ++++ src/MakeData.cpp +@@ -5,6 +5,7 @@ #define PNG_DEBUG 3 #include -+#include #include +#include #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; yrowbytes); ++ 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;