From 9be85b40c3e08c545a13d80b224c87684ff6ec93 Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Mon, 29 Mar 2010 13:55:02 +0000 Subject: - fix build for png-1.4.1 --- graphics/pngwriter/Makefile | 2 +- graphics/pngwriter/files/patch-pngwriter.cc | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 graphics/pngwriter/files/patch-pngwriter.cc (limited to 'graphics/pngwriter') diff --git a/graphics/pngwriter/Makefile b/graphics/pngwriter/Makefile index 4de4288b75e7..4ca373f71034 100644 --- a/graphics/pngwriter/Makefile +++ b/graphics/pngwriter/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src USE_GNOME= pkgconfig -CXXFLAGS+= `pkg-config --cflags freetype2 libpng12` -I${LOCALBASE}/include +CXXFLAGS+= `pkg-config --cflags freetype2 libpng14` -I${LOCALBASE}/include PORTDOCS= * PORTEXAMPLES= * diff --git a/graphics/pngwriter/files/patch-pngwriter.cc b/graphics/pngwriter/files/patch-pngwriter.cc new file mode 100644 index 000000000000..8ea130fba529 --- /dev/null +++ b/graphics/pngwriter/files/patch-pngwriter.cc @@ -0,0 +1,22 @@ +--- src/pngwriter.cc.orig 2009-02-10 22:45:16.000000000 +0100 ++++ src/pngwriter.cc 2010-03-29 15:55:32.000000000 +0200 +@@ -1204,8 +1204,8 @@ + FILE *fp; + png_structp png_ptr; + png_infop info_ptr; +- unsigned char **image; +- unsigned long width, height; ++ png_byte **image; ++ png_uint_32 width, height; + int bit_depth, color_type, interlace_type; + // png_uint_32 i; + // +@@ -1311,7 +1311,7 @@ + if(color_type == PNG_COLOR_TYPE_GRAY && bit_depth<8) + { + // png_set_expand(png_ptr); +- png_set_gray_1_2_4_to_8(png_ptr); // Just an alias of the above. ++ png_set_expand_gray_1_2_4_to_8(png_ptr); // Just an alias of the above. + transformation_ = 1; + } + -- cgit v1.2.3