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/dc20ctrl | |
| parent | 24315159daa0089f08acea4ba1b130fb6721ad5c (diff) | |
| download | ports-2b74a89bc8342f0b9b737c37d87737caf7b0ea1e.tar.gz ports-2b74a89bc8342f0b9b737c37d87737caf7b0ea1e.zip | |
Notes
Diffstat (limited to 'graphics/dc20ctrl')
| -rw-r--r-- | graphics/dc20ctrl/Makefile | 4 | ||||
| -rw-r--r-- | graphics/dc20ctrl/files/patch-pixmaps.c (renamed from graphics/dc20ctrl/files/patch-ad) | 15 |
2 files changed, 13 insertions, 6 deletions
diff --git a/graphics/dc20ctrl/Makefile b/graphics/dc20ctrl/Makefile index cb9c66b79240..a01a08a4115f 100644 --- a/graphics/dc20ctrl/Makefile +++ b/graphics/dc20ctrl/Makefile @@ -7,7 +7,7 @@ PORTNAME= dc20ctrl PORTVERSION= 0.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://www.paternostro.org/~ugo/binaries/ @@ -16,7 +16,7 @@ COMMENT= Digital camera control and download tool for Kodak DC20 camera LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ - png.6:${PORTSDIR}/graphics/png + png15:${PORTSDIR}/graphics/png MAKE_ARGS= -DUSE_JPEG -DUSE_TIFF -DUSE_PNG diff --git a/graphics/dc20ctrl/files/patch-ad b/graphics/dc20ctrl/files/patch-pixmaps.c index 982285d0386a..8b910130f60c 100644 --- a/graphics/dc20ctrl/files/patch-ad +++ b/graphics/dc20ctrl/files/patch-pixmaps.c @@ -1,6 +1,14 @@ -diff -ru work/dc20ctrl-0.4/pixmaps.c dc20ctrl-0.4/pixmaps.c ---- work/dc20ctrl-0.4/pixmaps.c Tue Feb 17 09:19:47 1998 -+++ pixmaps.c Mon Feb 5 18:42:18 2001 +--- pixmaps.c.orig 1998-02-17 18:19:47.000000000 +0100 ++++ pixmaps.c 2012-04-30 21:36:08.000000000 +0200 +@@ -446,7 +446,7 @@ + if (p) { + if ((png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL)) != NULL) { + if ((info_ptr = png_create_info_struct(png_ptr)) != NULL) { +- if (setjmp(png_ptr->jmpbuf) == 0) { ++ if (setjmp(png_jmpbuf(png_ptr)) == 0) { + png_init_io(png_ptr, fp); + png_set_IHDR(png_ptr, info_ptr, p->width, p->height, 8, (p->components == 1) ? PNG_COLOR_TYPE_GRAY : PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); + png_write_info(png_ptr, info_ptr); @@ -504,26 +504,32 @@ * Build the image name */ @@ -40,4 +48,3 @@ diff -ru work/dc20ctrl-0.4/pixmaps.c dc20ctrl-0.4/pixmaps.c break; } -Only in dc20ctrl-0.4/: rep |