diff options
| author | antoine <antoine@FreeBSD.org> | 2014-12-24 09:25:21 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2014-12-24 09:25:21 +0800 |
| commit | e257b8930a3bd765d8e05ae40b1b204dcf659ef5 (patch) | |
| tree | bf750ea8315bb12fc1e07f28ff07767acdb350ec | |
| parent | 613151e2837e8095a37e3a001957da0fda0235ef (diff) | |
| download | freebsd-ports-gnome-e257b8930a3bd765d8e05ae40b1b204dcf659ef5.tar.gz freebsd-ports-gnome-e257b8930a3bd765d8e05ae40b1b204dcf659ef5.tar.zst freebsd-ports-gnome-e257b8930a3bd765d8e05ae40b1b204dcf659ef5.zip | |
Properly support png15
| -rw-r--r-- | graphics/nvidia-texture-tools/Makefile | 4 | ||||
| -rw-r--r-- | graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp | 18 |
2 files changed, 11 insertions, 11 deletions
diff --git a/graphics/nvidia-texture-tools/Makefile b/graphics/nvidia-texture-tools/Makefile index 640019c0cec6..c8059a014515 100644 --- a/graphics/nvidia-texture-tools/Makefile +++ b/graphics/nvidia-texture-tools/Makefile @@ -19,8 +19,8 @@ LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \ 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} diff --git a/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp b/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp index b4e288d62c52..b0cdde632d6a 100644 --- a/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp +++ b/graphics/nvidia-texture-tools/files/patch-src-nvimage-ImageIO.cpp @@ -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()) { |