diff options
| author | wiz <wiz> | 2011-01-20 16:48:11 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-01-20 16:48:11 +0000 |
| commit | 7cd9e2ef257ffc4f906c30f32b9bf8bdbc051de9 (patch) | |
| tree | dcf31a876fab04dcc7c073f361155077bfd47ac9 /graphics/lensfun | |
| parent | be173910928262e8df795503495f958c2a8b3b9e (diff) | |
| download | pkgsrc-7cd9e2ef257ffc4f906c30f32b9bf8bdbc051de9.tar.gz | |
Fix build with png-1.5.
Diffstat (limited to 'graphics/lensfun')
| -rw-r--r-- | graphics/lensfun/distinfo | 3 | ||||
| -rw-r--r-- | graphics/lensfun/patches/patch-ac | 44 |
2 files changed, 46 insertions, 1 deletions
diff --git a/graphics/lensfun/distinfo b/graphics/lensfun/distinfo index 3920a728006..dbbd2c0939f 100644 --- a/graphics/lensfun/distinfo +++ b/graphics/lensfun/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.4 2011/01/17 16:38:20 drochner Exp $ +$NetBSD: distinfo,v 1.5 2011/01/20 16:48:11 wiz Exp $ SHA1 (lensfun-0.2.5.tar.bz2) = 7e8568cb131b6e2090264274483721a959f6b9bc RMD160 (lensfun-0.2.5.tar.bz2) = 2f421cefb65d271b937e3d61f41f8536fd078971 Size (lensfun-0.2.5.tar.bz2) = 470733 bytes SHA1 (patch-aa) = d31dd742f232aa8a75f50f14f782918ba11a8119 SHA1 (patch-ab) = 5455bda9546dce6cc5b4a73429092afdee04bd23 +SHA1 (patch-ac) = b85c98cc11a5795bede4fb22438d547ca302b38b SHA1 (patch-ad) = f9d54534d3be809e8517ec262e776c9d1785acd8 SHA1 (patch-ae) = c7f47ac5081d52244f38d0fc40795c7cb00f40e4 diff --git a/graphics/lensfun/patches/patch-ac b/graphics/lensfun/patches/patch-ac new file mode 100644 index 00000000000..4fee8b2e9de --- /dev/null +++ b/graphics/lensfun/patches/patch-ac @@ -0,0 +1,44 @@ +$NetBSD: patch-ac,v 1.3 2011/01/20 16:48:11 wiz Exp $ + +Fix build with png-1.5. + +--- libs/auxfun/image.cpp.orig 2008-05-02 06:56:04.000000000 +0000 ++++ libs/auxfun/image.cpp +@@ -94,7 +94,7 @@ bool Image::LoadPNG () + + png_init_io (png, file); + +- if (setjmp (png->jmpbuf)) ++ if (setjmp (png_jmpbuf(png))) + // If we get here, we had a problem reading the file + goto nomem; + +@@ -157,7 +157,7 @@ bool Image::LoadPNG () + row_pointers = new png_bytep [Height]; + + if (!row_pointers +- || setjmp (png->jmpbuf)) // Set a new exception handler ++ || setjmp (png_jmpbuf(png))) // Set a new exception handler + { + delete [] row_pointers; + nomem: +@@ -214,7 +214,7 @@ bool Image::SavePNG (const char *fName) + } + + /* Catch processing errors */ +- if (setjmp(png->jmpbuf)) ++ if (setjmp(png_jmpbuf(png))) + /* If we get here, we had a problem writing the file */ + goto error2; + +@@ -273,10 +273,6 @@ bool Image::SavePNG (const char *fName) + /* It is REQUIRED to call this to finish writing the rest of the file */ + png_write_end (png, info); + +- /* if you malloced the palette, free it here */ +- if (info->palette) +- free (info->palette); +- + /* clean up after the write, and free any memory allocated */ + png_destroy_write_struct (&png, &info); + |