From owner-svn-ports-head@FreeBSD.ORG Wed Dec 24 01:25:23 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 2108B570; Wed, 24 Dec 2014 01:25:23 +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 E84CD19BD; Wed, 24 Dec 2014 01:25:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBO1PM64081243; Wed, 24 Dec 2014 01:25:22 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBO1PMXh081241; Wed, 24 Dec 2014 01:25:22 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201412240125.sBO1PMXh081241@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 01:25:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375379 - in head/graphics/nvidia-texture-tools: . 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 01:25:23 -0000 Author: antoine Date: Wed Dec 24 01:25:21 2014 New Revision: 375379 URL: https://svnweb.freebsd.org/changeset/ports/375379 QAT: https://qat.redports.org/buildarchive/r375379/ Log: Properly support png15 Modified: head/graphics/nvidia-texture-tools/Makefile head/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp Modified: head/graphics/nvidia-texture-tools/Makefile ============================================================================== --- head/graphics/nvidia-texture-tools/Makefile Wed Dec 24 00:14:11 2014 (r375378) +++ head/graphics/nvidia-texture-tools/Makefile Wed Dec 24 01:25:21 2014 (r375379) @@ -19,8 +19,8 @@ LIB_DEPENDS= libpng.so:${PORTSDIR}/graph USES= alias cmake CMAKE_ARGS= -DNVTT_SHARED=TRUE -CFLAGS+= -fPIC -I${LOCALBASE}/include/libpng15 -CXXFLAGS+= -fPIC -I${LOCALBASE}/include/libpng15 +CFLAGS+= -fPIC +CXXFLAGS+= -fPIC WRKSRC= ${WRKDIR}/${PORTNAME} Modified: head/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp ============================================================================== --- head/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp Wed Dec 24 00:14:11 2014 (r375378) +++ head/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp Wed Dec 24 01:25:21 2014 (r375379) @@ -1,11 +1,11 @@ ---- src/nvimage/ImageIO.cpp.orig 2010-05-14 19:59:28.000000000 +0200 -+++ src/nvimage/ImageIO.cpp 2012-05-06 20:50:40.000000000 +0200 -@@ -599,6 +599,8 @@ - - #if defined(HAVE_PNG) - -+#include "pngpriv.h" -+ - static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length) +--- src/nvimage/ImageIO.cpp.orig 2010-05-14 17:59:28 UTC ++++ src/nvimage/ImageIO.cpp +@@ -603,7 +603,7 @@ static void user_read_data(png_structp p { nvDebugCheck(png_ptr != NULL); + +- Stream * s = (Stream *)png_ptr->io_ptr; ++ Stream * s = (Stream *)png_get_io_ptr(png_ptr); + s->serialize(data, (int)length); + + if (s->isError()) {