Mercurial > mxe-octave

changeset 1463:57824ee353ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade package: exiv2
author Volker Grabsch <vog@notjusthosting.com>
date Thu, 02 Dec 2010 20:11:29 +0100
parents 61dda1d437e2
children 190d7ba8703e
files src/exiv2-1-fixes.patch src/exiv2.mk
diffstat 2 files changed, 2 insertions(+), 50 deletions(-) [+]
line wrap: on
line diff
--- a/src/exiv2-1-fixes.patch	Wed Dec 01 03:44:21 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-This file is part of mingw-cross-env.
-See doc/index.html for further information.
-
-This patch has been taken from:
-http://dev.exiv2.org/projects/exiv2/repository/revisions/2370
-
---- trunk/src/psdimage.cpp	(revision 2369)
-+++ trunk/src/psdimage.cpp	(revision 2370)
-@@ -419,24 +419,24 @@
-             uint32_t curOffset = io_->tell();
- 
-             // Write IPTC_NAA resource block
--            if (   resourceId == kPhotoshopResourceID_IPTC_NAA
--                || (resourceId > kPhotoshopResourceID_IPTC_NAA && iptcDone == false)) {
-+            if ((resourceId == kPhotoshopResourceID_IPTC_NAA  ||
-+                 resourceId >  kPhotoshopResourceID_IPTC_NAA) && iptcDone == false) {
-                 newResLength += writeIptcData(iptcData_, outIo);
-                 resourceSize = (resourceSize + 1) & ~1;    // adjust for padding
-                 iptcDone = true;
-             }
- 
-             // Write ExifInfo resource block
--            else if (   resourceId == kPhotoshopResourceID_ExifInfo
--                     || (resourceId > kPhotoshopResourceID_ExifInfo && exifDone == false)) {
-+            else if ((resourceId == kPhotoshopResourceID_ExifInfo  ||
-+                      resourceId >  kPhotoshopResourceID_ExifInfo) && exifDone == false) {
-                 newResLength += writeExifData(exifData_, outIo);
-                 resourceSize = (resourceSize + 1) & ~1;    // adjust for padding
-                 exifDone = true;
-             }
- 
-             // Write XMPpacket resource block
--            else if (   resourceId == kPhotoshopResourceID_XMPPacket
--                     || (resourceId > kPhotoshopResourceID_XMPPacket && xmpDone == false)) {
-+            else if ((resourceId == kPhotoshopResourceID_XMPPacket  ||
-+                      resourceId >  kPhotoshopResourceID_XMPPacket) && xmpDone == false) {
-                 newResLength += writeXmpData(xmpData_, outIo);
-                 resourceSize = (resourceSize + 1) & ~1;    // adjust for padding
-                 xmpDone = true;
-@@ -456,7 +456,7 @@
-                 us2Data(buf, resourceId, bigEndian);
-                 if (outIo.write(buf, 2) != 2) throw Error(21);
-                 // Write resource name as Pascal string
--                buf[0] = resourceNameLength & 0x000f;
-+                buf[0] = resourceNameLength & 0x00ff;
-                 if (outIo.write(buf, 1) != 1) throw Error(21);
-                 buf[0] = resourceNameFirstChar;
-                 if (outIo.write(buf, 1) != 1) throw Error(21);
--- a/src/exiv2.mk	Wed Dec 01 03:44:21 2010 +0100
+++ b/src/exiv2.mk	Thu Dec 02 20:11:29 2010 +0100
@@ -4,8 +4,8 @@
 # Exiv2
 PKG             := exiv2
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.20
-$(PKG)_CHECKSUM := 3ebab0acd114a463fe11881bd95f1c3e258c7c0c
+$(PKG)_VERSION  := 0.21
+$(PKG)_CHECKSUM := 0961422a647e052a8db6e56e8818ab3217c37b01
 $(PKG)_SUBDIR   := exiv2-$($(PKG)_VERSION)
 $(PKG)_FILE     := exiv2-$($(PKG)_VERSION).tar.gz
 $(PKG)_WEBSITE  := http://www.exiv2.org/