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/xv | |
| parent | - Allow for larger database UIDs (diff) | |
- update png to 1.5.10
Notes
Notes:
svn path=/head/; revision=297915
Diffstat (limited to 'graphics/xv')
| -rw-r--r-- | graphics/xv/Makefile | 5 | ||||
| -rw-r--r-- | graphics/xv/files/patch-xvpng.c | 38 |
2 files changed, 41 insertions, 2 deletions
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index 0df550fe7016..e4f23ce506e3 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -7,7 +7,7 @@ PORTNAME= xv PORTVERSION= 3.10a -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES+= graphics MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/:base \ SF/png-mng/XV%20jumbo%20patches/20070520 @@ -24,7 +24,7 @@ COMMENT?= An X11 program that displays images of various formats LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ jasper.4:${PORTSDIR}/graphics/jasper USE_IMAKE= yes @@ -34,6 +34,7 @@ MAN1= bggen.1 vdcomp.1 xcmap.1 xv.1 xvp2p.1 .endif XVDIST= ${DISTDIR}/${DIST_SUBDIR} +CFLAGS+= -I${LOCALBASE}/include/libpng15 pre-patch: @${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/xv-3.10a-jumbo-fix-enh-patch-20070520.txt diff --git a/graphics/xv/files/patch-xvpng.c b/graphics/xv/files/patch-xvpng.c new file mode 100644 index 000000000000..f7df0484feda --- /dev/null +++ b/graphics/xv/files/patch-xvpng.c @@ -0,0 +1,38 @@ +--- xvpng.c.orig 2007-05-14 02:53:28.000000000 +0200 ++++ xvpng.c 2012-04-27 07:51:56.000000000 +0200 +@@ -32,6 +32,8 @@ + #ifdef HAVE_PNG + + #include "png.h" ++#include "zlib.h" ++#include "pngpriv.h" + + /*** Stuff for PNG Dialog box ***/ + #define PWIDE 318 +@@ -458,7 +460,7 @@ + FatalError(software); + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return -1; + } +@@ -921,7 +923,7 @@ + FatalError("malloc failure in LoadPNG"); + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + fclose(fp); + png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); + if (!read_anything) { +@@ -1143,7 +1145,7 @@ + { + SetISTR(ISTR_WARNING,"%s: libpng error: %s", fbasename, message); + +- longjmp(png_ptr->jmpbuf, 1); ++ longjmp(png_jmpbuf(png_ptr), 1); + } + + |