From owner-svn-ports-head@FreeBSD.ORG Wed Dec 24 13:51:31 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BD106587; Wed, 24 Dec 2014 13:51:31 +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 8FB4B381B; Wed, 24 Dec 2014 13:51:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBODpVu1042340; Wed, 24 Dec 2014 13:51:31 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBODpVGt042338; Wed, 24 Dec 2014 13:51:31 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201412241351.sBODpVGt042338@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:51:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375458 - in head/games/shaaft: . 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:51:31 -0000 Author: antoine Date: Wed Dec 24 13:51:30 2014 New Revision: 375458 URL: https://svnweb.freebsd.org/changeset/ports/375458 QAT: https://qat.redports.org/buildarchive/r375458/ Log: Properly support png 1.5 Obtained from: Gentoo Modified: head/games/shaaft/Makefile head/games/shaaft/files/patch-PNG.cpp Modified: head/games/shaaft/Makefile ============================================================================== --- head/games/shaaft/Makefile Wed Dec 24 13:24:01 2014 (r375457) +++ head/games/shaaft/Makefile Wed Dec 24 13:51:30 2014 (r375458) @@ -11,7 +11,7 @@ DISTNAME= Shaaft-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= OpenGL 3D falling block game similar to Blockout -LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png +LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png CONFLICTS= criticalmass-* Modified: head/games/shaaft/files/patch-PNG.cpp ============================================================================== --- head/games/shaaft/files/patch-PNG.cpp Wed Dec 24 13:24:01 2014 (r375457) +++ head/games/shaaft/files/patch-PNG.cpp Wed Dec 24 13:51:30 2014 (r375458) @@ -1,14 +1,15 @@ ---- utilssdl/PNG.cpp.orig 2003-03-03 03:32:18.000000000 +0100 -+++ utilssdl/PNG.cpp 2012-05-09 12:16:57.000000000 +0200 -@@ -13,6 +13,7 @@ - // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details - // - #include -+#include +--- utilssdl/PNG.cpp.orig 2003-03-03 02:32:18 UTC ++++ utilssdl/PNG.cpp +@@ -45,7 +45,7 @@ void PNG::writeData( png_structp png, pn + { + png_uint_32 check; - //Save SDL surface as png - bool PNG::Save( SDL_Surface *img, const string &filename) -@@ -72,7 +73,7 @@ +- check = fwrite( data, 1, length, (FILE *)(png->io_ptr)); ++ check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png))); + if( check != length) + { + png_error( png, "Write Error"); +@@ -72,7 +72,7 @@ bool PNG::init( FILE *fp, int width, int return false; }