diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2012-06-01 05:26:28 +0000 |
| commit | 2b74a89bc8342f0b9b737c37d87737caf7b0ea1e (patch) | |
| tree | c04604583d8be53b3ed7f10975be828c731f87cb /graphics/tif22pnm | |
| parent | - Allow for larger database UIDs (diff) | |
- update png to 1.5.10
Diffstat (limited to '')
| -rw-r--r-- | graphics/tif22pnm/Makefile | 8 | ||||
| -rw-r--r-- | graphics/tif22pnm/files/patch-png22pnm.c | 20 |
2 files changed, 18 insertions, 10 deletions
diff --git a/graphics/tif22pnm/Makefile b/graphics/tif22pnm/Makefile index b724eac4dccc..ffdbb8153474 100644 --- a/graphics/tif22pnm/Makefile +++ b/graphics/tif22pnm/Makefile @@ -8,7 +8,7 @@ PORTNAME= tif22pnm PORTVERSION= 0.12 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://pts.szit.bme.hu/ \ GOOGLE_CODE @@ -16,7 +16,7 @@ MASTER_SITES= http://pts.szit.bme.hu/ \ MAINTAINER= martymac@FreeBSD.org COMMENT= Converts TIFF- sampled images to PNM image -LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png \ +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkg-config @@ -36,8 +36,8 @@ do-build: cd ${WRKSRC} \ && ${CC} ${CFLAGS} -DNDEBUG -I${LOCALBASE}/include \ ${TIF22PNM_SRCS} -o tif22pnm -L${LOCALBASE}/lib -ltiff \ - && ${CC} ${CFLAGS} -DNDEBUG `pkg-config libpng14 --cflags` \ - ${PNG2PNM_SRCS} -o png22pnm `pkg-config libpng14 --libs` + && ${CC} ${CFLAGS} -DNDEBUG `pkg-config libpng15 --cflags` \ + ${PNG2PNM_SRCS} -o png22pnm `pkg-config libpng15 --libs` do-install: ${INSTALL_PROGRAM} ${WRKSRC}/png22pnm ${PREFIX}/bin diff --git a/graphics/tif22pnm/files/patch-png22pnm.c b/graphics/tif22pnm/files/patch-png22pnm.c index dc9378f22e29..45212e6231ec 100644 --- a/graphics/tif22pnm/files/patch-png22pnm.c +++ b/graphics/tif22pnm/files/patch-png22pnm.c @@ -1,6 +1,14 @@ --- png22pnm.c.orig 2003-03-18 17:14:51.000000000 +0100 -+++ png22pnm.c 2010-03-29 08:27:57.000000000 +0200 -@@ -783,7 +783,7 @@ ++++ png22pnm.c 2012-05-04 07:36:40.000000000 +0200 +@@ -40,6 +40,7 @@ + + #include <math.h> + #include <png.h> /* includes zlib.h and setjmp.h */ ++#include <pngpriv.h> + #if 0 + #define VERSION "p2.37.4 (5 December 1999) +netpbm" + #else +@@ -783,7 +784,7 @@ (info_ptr->valid & PNG_INFO_tRNS)) { trans_mix = TRUE; for (i = 0 ; i < info_ptr->num_trans ; i++) @@ -9,7 +17,7 @@ trans_mix = FALSE; break; } -@@ -932,7 +932,7 @@ +@@ -932,7 +933,7 @@ pnm_type = PBM_TYPE; if (info_ptr->valid & PNG_INFO_tRNS) { for (i = 0 ; i < info_ptr->num_trans ; i++) { @@ -18,7 +26,7 @@ pnm_type = PGM_TYPE; break; } -@@ -1009,7 +1009,7 @@ +@@ -1009,7 +1010,7 @@ case PNG_COLOR_TYPE_GRAY: store_pixel (pnm_pixel, c, c, c, ((info_ptr->valid & PNG_INFO_tRNS) && @@ -27,7 +35,7 @@ 0 : maxval); break; -@@ -1023,7 +1023,7 @@ +@@ -1023,7 +1024,7 @@ info_ptr->palette[c].green, info_ptr->palette[c].blue, (info_ptr->valid & PNG_INFO_tRNS) && c<info_ptr->num_trans ? @@ -36,7 +44,7 @@ break; case PNG_COLOR_TYPE_RGB: -@@ -1031,9 +1031,9 @@ +@@ -1031,9 +1032,9 @@ c3 = get_png_val (png_pixel); store_pixel (pnm_pixel, c, c2, c3, ((info_ptr->valid & PNG_INFO_tRNS) && |