# HG changeset patch # User Mark Brand # Date 1316382145 -7200 # Node ID a5e9e90cf187a018eebb33b69d14eec9594e6ab2 # Parent 315d848caee2d7bde524bfe1f9beed72f3e0cfac update packages exiv2 gnutls imagemagick x264 diff -r 315d848caee2 -r a5e9e90cf187 src/exiv2-r2469.patch --- a/src/exiv2-r2469.patch Sun Sep 18 12:34:09 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +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/issues/764 - -Index: trunk/src/psdimage.cpp -=================================================================== ---- trunk/src/psdimage.cpp (revision 2468) -+++ trunk/src/psdimage.cpp (revision 2469) -@@ -400,7 +400,7 @@ - uint32_t resourceType = getULong(buf, bigEndian); - - if (resourceType != kPhotoshopResourceType) { -- break; // bad resource type -+ throw Error(3, "Photoshop"); // bad resource type - } - uint16_t resourceId = getUShort(buf + 4, bigEndian); - uint32_t resourceNameLength = buf[6]; -@@ -416,13 +416,13 @@ - if (io_->read(buf, 4) != 4) throw Error(3, "Photoshop"); - - uint32_t resourceSize = getULong(buf, bigEndian); -+ uint32_t pResourceSize = (resourceSize + 1) & ~1; // padded resource size - uint32_t curOffset = io_->tell(); - - // Write IPTC_NAA resource block - if ((resourceId == kPhotoshopResourceID_IPTC_NAA || - resourceId > kPhotoshopResourceID_IPTC_NAA) && iptcDone == false) { - newResLength += writeIptcData(iptcData_, outIo); -- resourceSize = (resourceSize + 1) & ~1; // adjust for padding - iptcDone = true; - } - -@@ -430,7 +430,6 @@ - else if ((resourceId == kPhotoshopResourceID_ExifInfo || - resourceId > kPhotoshopResourceID_ExifInfo) && exifDone == false) { - newResLength += writeExifData(exifData_, outIo); -- resourceSize = (resourceSize + 1) & ~1; // adjust for padding - exifDone = true; - } - -@@ -438,7 +437,6 @@ - else if ((resourceId == kPhotoshopResourceID_XMPPacket || - resourceId > kPhotoshopResourceID_XMPPacket) && xmpDone == false) { - newResLength += writeXmpData(xmpData_, outIo); -- resourceSize = (resourceSize + 1) & ~1; // adjust for padding - xmpDone = true; - } - -@@ -467,10 +465,9 @@ - - readTotal = 0; - toRead = 0; -- resourceSize = (resourceSize + 1) & ~1; // pad to even -- while (readTotal < resourceSize) { -- toRead = static_cast(resourceSize - readTotal) < lbuf.size_ -- ? static_cast(resourceSize - readTotal) : lbuf.size_; -+ while (readTotal < pResourceSize) { -+ toRead = static_cast(pResourceSize - readTotal) < lbuf.size_ -+ ? static_cast(pResourceSize - readTotal) : lbuf.size_; - if (io_->read(lbuf.pData_, toRead) != toRead) { - throw Error(3, "Photoshop"); - } -@@ -478,11 +475,11 @@ - if (outIo.write(lbuf.pData_, toRead) != toRead) throw Error(21); - } - if (outIo.error()) throw Error(21); -- newResLength += resourceSize + adjResourceNameLen + 12; -+ newResLength += pResourceSize + adjResourceNameLen + 12; - } - -- io_->seek(curOffset + resourceSize, BasicIo::beg); -- oldResLength -= (12 + adjResourceNameLen + resourceSize); -+ io_->seek(curOffset + pResourceSize, BasicIo::beg); -+ oldResLength -= (12 + adjResourceNameLen + pResourceSize); - } - - // Append IPTC_NAA resource block, if not yet written diff -r 315d848caee2 -r a5e9e90cf187 src/exiv2-r2472.patch --- a/src/exiv2-r2472.patch Sun Sep 18 12:34:09 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +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/issues/767 - -Index: trunk/config/configure.ac -=================================================================== ---- trunk/config/configure.ac (revision 2471) -+++ trunk/config/configure.ac (revision 2472) -@@ -31,12 +31,6 @@ - AC_PROG_LN_S - AC_PROG_MAKE_SET - AC_CANONICAL_HOST --# Add flag for DLL on Windows --case "$host_os" in --*mingw* | *cygwin*) -- LDFLAGS="$LDFLAGS -no-undefined" -- ;; --esac - - # --------------------------------------------------------------------------- - # i18n support -@@ -204,6 +198,17 @@ - fi - AC_SUBST(EXV_LIB_STATIC) - -+# Add flag for DLL on Windows -+# -+# This must happen after all other configure checks, because -+# the "-no-undefined" flag is only for libtool and may not be -+# passed to GCC by accident. -+case "$host_os" in -+*mingw* | *cygwin*) -+ LDFLAGS="$LDFLAGS -no-undefined" -+ ;; -+esac -+ - # --------------------------------------------------------------------------- - # Create output files. - # --------------------------------------------------------------------------- diff -r 315d848caee2 -r a5e9e90cf187 src/exiv2-r2571.patch --- a/src/exiv2-r2571.patch Sun Sep 18 12:34:09 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +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/2571 - ---- a/config/exiv2.pc.in -+++ b/config/exiv2.pc.in -@@ -7,5 +7,5 @@ Name: exiv2 - Description: Image metadata library and tools - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lexiv2 @EXV_LIB_STATIC@ --Libs.private: @LDFLAGS@ @EXPAT_LDFLAGS@ @LTLIBINTL@ @LTLIBICONV@ @LIBS@ @EXPAT_LIBS@ -+Libs.private: @EXPAT_LDFLAGS@ @LTLIBINTL@ @LTLIBICONV@ @LIBS@ @EXPAT_LIBS@ - Cflags: -I${includedir} diff -r 315d848caee2 -r a5e9e90cf187 src/exiv2.mk --- a/src/exiv2.mk Sun Sep 18 12:34:09 2011 +0200 +++ b/src/exiv2.mk Sun Sep 18 23:42:25 2011 +0200 @@ -4,8 +4,8 @@ # Exiv2 PKG := exiv2 $(PKG)_IGNORE := -$(PKG)_VERSION := 0.21.1 -$(PKG)_CHECKSUM := d33e0efbad5d6a7af7f2e6d1d0beb6e7c941cfca +$(PKG)_VERSION := 0.22 +$(PKG)_CHECKSUM := 35211d853a986fe1b008fca14db090726e8dcce3 $(PKG)_SUBDIR := exiv2-$($(PKG)_VERSION) $(PKG)_FILE := exiv2-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.exiv2.org/ @@ -20,8 +20,6 @@ endef define $(PKG)_BUILD - # rebuild configure script as one of the patches modifies configure.ac - $(MAKE) -C '$(1)/config' -f config.make # wine confuses the cross-compiling detection, so set it explicitly $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' cd '$(1)' && ./configure \ diff -r 315d848caee2 -r a5e9e90cf187 src/gnutls.mk --- a/src/gnutls.mk Sun Sep 18 12:34:09 2011 +0200 +++ b/src/gnutls.mk Sun Sep 18 23:42:25 2011 +0200 @@ -3,8 +3,8 @@ # GnuTLS PKG := gnutls -$(PKG)_VERSION := 2.12.10 -$(PKG)_CHECKSUM := 52ed0bfa3dc7900f8da22f29eaace6ec34439223 +$(PKG)_VERSION := 2.12.11 +$(PKG)_CHECKSUM := 30c8977c3f32b48e523e09cb8ce8952d80520a4f $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.gnu.org/software/gnutls/ diff -r 315d848caee2 -r a5e9e90cf187 src/imagemagick.mk --- a/src/imagemagick.mk Sun Sep 18 12:34:09 2011 +0200 +++ b/src/imagemagick.mk Sun Sep 18 23:42:25 2011 +0200 @@ -4,8 +4,8 @@ # ImageMagick PKG := imagemagick $(PKG)_IGNORE := -$(PKG)_VERSION := 6.7.2-5 -$(PKG)_CHECKSUM := 0af2f0fb913f390b0b25bc4e57b344b0d54c3560 +$(PKG)_VERSION := 6.7.2-7 +$(PKG)_CHECKSUM := 13198d502e95abb305c23c3d56378e9139fcb7c3 $(PKG)_SUBDIR := ImageMagick-$($(PKG)_VERSION) $(PKG)_FILE := ImageMagick-$($(PKG)_VERSION).tar.xz $(PKG)_WEBSITE := http://www.imagemagick.org/ diff -r 315d848caee2 -r a5e9e90cf187 src/x264.mk --- a/src/x264.mk Sun Sep 18 12:34:09 2011 +0200 +++ b/src/x264.mk Sun Sep 18 23:42:25 2011 +0200 @@ -4,8 +4,8 @@ # x264 PKG := x264 $(PKG)_IGNORE := -$(PKG)_VERSION := 20110913-2245 -$(PKG)_CHECKSUM := f9ffd65596851349124bf713a52ea0534c3adaad +$(PKG)_VERSION := 20110917-2245 +$(PKG)_CHECKSUM := 14b20146966a1d850895b05bbed732f3b5ca2630 $(PKG)_SUBDIR := $(PKG)-snapshot-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-snapshot-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.videolan.org/developers/x264.html