svn commit: r375379 - in head/graphics/nvidia-texture-tools: . files

[Antoine Brodin]

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()) {