From 7a917418125b50c8f93b18c4bf8036a1ddae43a3 Mon Sep 17 00:00:00 2001 From: gdt Date: Sat, 7 Jun 2008 23:28:35 +0000 Subject: Update to 0.17. Significant Changes from version 0.16 * Exiv2 utility - [tools] exiv2 now writes a proper XMP sidecar file (it used to just dump the XMP packet to a file). - [tools] exiv2 can now also save Exif and IPTC data in the XMP sidecar file (conversion of Exif/IPTC to/from XMP). * Exiv2 library - 0000546: [exif] Exiv2 crashes while converting Nikon lens information for pretty printing. --- graphics/exiv2/Makefile | 5 ++-- graphics/exiv2/PLIST | 10 ++++++- graphics/exiv2/distinfo | 9 +++--- graphics/exiv2/patches/patch-aa | 62 ----------------------------------------- 4 files changed, 15 insertions(+), 71 deletions(-) delete mode 100644 graphics/exiv2/patches/patch-aa (limited to 'graphics/exiv2') diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile index 17b0d74aabc..417aae184b8 100644 --- a/graphics/exiv2/Makefile +++ b/graphics/exiv2/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2008/06/07 23:01:28 gdt Exp $ +# $NetBSD: Makefile,v 1.19 2008/06/07 23:28:35 gdt Exp $ # -DISTNAME= exiv2-0.16 -PKGREVISION= 1 +DISTNAME= exiv2-0.17 CATEGORIES= graphics MASTER_SITES= http://www.exiv2.org/ diff --git a/graphics/exiv2/PLIST b/graphics/exiv2/PLIST index af0ab795507..4aadc2ee7a7 100644 --- a/graphics/exiv2/PLIST +++ b/graphics/exiv2/PLIST @@ -1,7 +1,9 @@ -@comment $NetBSD: PLIST,v 1.7 2008/01/16 07:54:01 wiz Exp $ +@comment $NetBSD: PLIST,v 1.8 2008/06/07 23:28:35 gdt Exp $ bin/exiv2 include/exiv2/basicio.hpp +include/exiv2/bmpimage.hpp include/exiv2/canonmn.hpp +include/exiv2/convert.hpp include/exiv2/cr2image.hpp include/exiv2/crwimage.hpp include/exiv2/datasets.hpp @@ -11,9 +13,11 @@ include/exiv2/exv_conf.h include/exiv2/exv_msvc.h include/exiv2/fujimn.hpp include/exiv2/futils.hpp +include/exiv2/gifimage.hpp include/exiv2/ifd.hpp include/exiv2/image.hpp include/exiv2/iptc.hpp +include/exiv2/jp2image.hpp include/exiv2/jpgimage.hpp include/exiv2/makernote.hpp include/exiv2/makernote2.hpp @@ -29,11 +33,13 @@ include/exiv2/pentaxmn.hpp include/exiv2/pngchunk.hpp include/exiv2/pngimage.hpp include/exiv2/properties.hpp +include/exiv2/psdimage.hpp include/exiv2/rafimage.hpp include/exiv2/rcsid.hpp include/exiv2/sigmamn.hpp include/exiv2/sonymn.hpp include/exiv2/tags.hpp +include/exiv2/tgaimage.hpp include/exiv2/tiffcomposite.hpp include/exiv2/tifffwd.hpp include/exiv2/tiffimage.hpp @@ -43,6 +49,7 @@ include/exiv2/types.hpp include/exiv2/value.hpp include/exiv2/version.hpp include/exiv2/xmp.hpp +include/exiv2/xmpsidecar.hpp lib/libexiv2.la lib/pkgconfig/exiv2.pc man/man1/exiv2.1 @@ -52,4 +59,5 @@ share/locale/fi/LC_MESSAGES/exiv2.mo share/locale/fr/LC_MESSAGES/exiv2.mo share/locale/pl/LC_MESSAGES/exiv2.mo share/locale/ru/LC_MESSAGES/exiv2.mo +share/locale/sk/LC_MESSAGES/exiv2.mo @dirrm include/exiv2 diff --git a/graphics/exiv2/distinfo b/graphics/exiv2/distinfo index 7c46c3e4d23..4342bed23ea 100644 --- a/graphics/exiv2/distinfo +++ b/graphics/exiv2/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.11 2008/06/07 23:01:28 gdt Exp $ +$NetBSD: distinfo,v 1.12 2008/06/07 23:28:35 gdt Exp $ -SHA1 (exiv2-0.16.tar.gz) = fd5cdec6b60fd52a15c73c30760e099bbfa3cf50 -RMD160 (exiv2-0.16.tar.gz) = b0a67bbf3e9367b58b75170899b5820afed42d33 -Size (exiv2-0.16.tar.gz) = 1591822 bytes -SHA1 (patch-aa) = edb516d5b65c097c5729e370269a6a6950d89d61 +SHA1 (exiv2-0.17.tar.gz) = 281b79a3555caada55aa06314b44088ad2225330 +RMD160 (exiv2-0.17.tar.gz) = a7cd49a233324e7fcf551bdc693edd9f5797adfd +Size (exiv2-0.17.tar.gz) = 1807917 bytes diff --git a/graphics/exiv2/patches/patch-aa b/graphics/exiv2/patches/patch-aa deleted file mode 100644 index 9811c990292..00000000000 --- a/graphics/exiv2/patches/patch-aa +++ /dev/null @@ -1,62 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2008/06/07 23:01:28 gdt Exp $ - -From upstream SVN, svn diff -r 1388:1399. -Fixes http://dev.robotbattle.com/bugs/view.php?id=0000546. - -Index: src/nikonmn.cpp -=================================================================== ---- src/nikonmn.cpp (revision 1398) -+++ src/nikonmn.cpp (revision 1399) -@@ -931,29 +931,31 @@ - std::ostream& Nikon3MakerNote::print0x0084(std::ostream& os, - const Value& value) - { -- if (value.count() == 4) { -- long len1 = value.toLong(0); -- long len2 = value.toLong(1); -- Rational fno1 = value.toRational(2); -- Rational fno2 = value.toRational(3); -- os << len1; -- if (len2 != len1) { -- os << "-" << len2; -- } -- os << "mm "; -- std::ostringstream oss; -- oss.copyfmt(os); -- os << "F" << std::setprecision(2) -- << static_cast(fno1.first) / fno1.second; -- if (fno2 != fno1) { -- os << "-" << std::setprecision(2) -- << static_cast(fno2.first) / fno2.second; -- } -- os.copyfmt(oss); -- } -- else { -+ if ( value.count() != 4 -+ || value.toRational(0).second == 0 -+ || value.toRational(1).second == 0) { - os << "(" << value << ")"; -+ return os; - } -+ long len1 = value.toLong(0); -+ long len2 = value.toLong(1); -+ -+ Rational fno1 = value.toRational(2); -+ Rational fno2 = value.toRational(3); -+ os << len1; -+ if (len2 != len1) { -+ os << "-" << len2; -+ } -+ os << "mm "; -+ std::ostringstream oss; -+ oss.copyfmt(os); -+ os << "F" << std::setprecision(2) -+ << static_cast(fno1.first) / fno1.second; -+ if (fno2 != fno1) { -+ os << "-" << std::setprecision(2) -+ << static_cast(fno2.first) / fno2.second; -+ } -+ os.copyfmt(oss); - return os; - } - -- cgit v1.2.3