diff --git a/common/shlibs b/common/shlibs index 536447e0020..885d82c379a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -496,7 +496,7 @@ libgimpconfig-2.0.so.0 libgimp-2.8.10_3 libgimpmath-2.0.so.0 libgimp-2.8.10_3 libgimpcolor-2.0.so.0 libgimp-2.8.10_3 libgimpmodule-2.0.so.0 libgimp-2.8.10_3 -libexiv2.so.14 exiv2-0.25_1 +libexiv2.so.26 exiv2-0.26_1 libKF5Holidays.so.5 kholidays-16.12.0_1 libsearchclient.so.0 strigi-0.7.2_1 libstreamanalyzer.so.0 strigi-0.7.2_1 diff --git a/srcpkgs/exiv2/patches/5405d616.patch b/srcpkgs/exiv2/patches/5405d616.patch new file mode 100644 index 00000000000..516b9807e74 --- /dev/null +++ b/srcpkgs/exiv2/patches/5405d616.patch @@ -0,0 +1,22 @@ +From 5405d61623e82896e498c5c8342dd6f42e689115 Mon Sep 17 00:00:00 2001 +From: clanmills +Date: Tue, 12 Sep 2017 09:14:42 +0100 +Subject: [PATCH] Fix http://dev.exiv2.org/issues/1305 + +--- + src/pentaxmn.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp +index 4fc38be0..b22cb43b 100644 +--- src/pentaxmn.cpp ++++ src/pentaxmn.cpp +@@ -1167,6 +1167,8 @@ namespace Exiv2 { + + std::ostream& PentaxMakerNote::printShutterCount(std::ostream& os, const Value& value, const ExifData* metadata) + { ++ if ( ! metadata ) return os << "undefined" ; ++ + ExifData::const_iterator dateIt = metadata->findKey( + ExifKey("Exif.PentaxDng.Date")); + if (dateIt == metadata->end()) { diff --git a/srcpkgs/exiv2/patches/f9d0be42.patch b/srcpkgs/exiv2/patches/f9d0be42.patch new file mode 100644 index 00000000000..f92c0a1c2c6 --- /dev/null +++ b/srcpkgs/exiv2/patches/f9d0be42.patch @@ -0,0 +1,23 @@ +From 591dea579ae946972fef14bbf799b2d3a12e82d4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?M=C4=81ris=20Narti=C5=A1s?= +Date: Mon, 18 Sep 2017 23:37:40 +0300 +Subject: [PATCH] Fix crash on undefined metadata on some Nikon images. + Identical to commit:5405d61623e82896e498c5c8342dd6f42e689115 + +--- + src/nikonmn.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp +index 92047755..8c42e317 100644 +--- src/nikonmn.cpp ++++ src/nikonmn.cpp +@@ -299,6 +299,8 @@ namespace Exiv2 { + const Value& value, + const ExifData* exifData) + { ++ if ( ! exifData ) return os << "undefined" ; ++ + if ( value.count() >= 9 ) { + ByteOrder bo = getKeyString("Exif.MakerNote.ByteOrder",exifData) == "MM" ? bigEndian : littleEndian; + byte p[4]; diff --git a/srcpkgs/exiv2/patches/musl-mutex-initializer.patch b/srcpkgs/exiv2/patches/musl-mutex-initializer.patch new file mode 100644 index 00000000000..29ba671a9cf --- /dev/null +++ b/srcpkgs/exiv2/patches/musl-mutex-initializer.patch @@ -0,0 +1,15 @@ +--- src/actions.cpp.orig 2017-09-19 11:49:12.000000000 +0000 ++++ src/actions.cpp 2017-09-19 11:49:26.682396655 +0000 +@@ -2049,7 +2049,11 @@ + /* This is the critical section object (statically allocated). */ + static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER; + #else +- static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; ++ #if !defined(__GLIBC__) ++ static pthread_mutex_t cs = {{{PTHREAD_MUTEX_RECURSIVE}}}; ++ #else ++ static pthread_mutex_t cs = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; ++ #endif + #endif + #endif + diff --git a/srcpkgs/exiv2/template b/srcpkgs/exiv2/template index cffb838c515..ea6259dc6be 100644 --- a/srcpkgs/exiv2/template +++ b/srcpkgs/exiv2/template @@ -1,15 +1,16 @@ # Template file for 'exiv2' pkgname=exiv2 -version=0.25 -revision=3 +version=0.26 +revision=1 build_style=gnu-configure +wrksrc=exiv2-trunk makedepends="zlib-devel expat-devel" short_desc="Image metadata manipulation" maintainer="Juan RP " license="GPL-2" homepage="http://www.exiv2.org" -distfiles="${homepage}/exiv2-$version.tar.gz" -checksum=c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 +distfiles="http://www.exiv2.org/builds/exiv2-${version}-trunk.tar.gz" +checksum=c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb exiv2-devel_package() { depends="${makedepends} ${sourcepkg}-${version}_${revision}"