exiv2: update to 0.27.0.

[ci skip]
This commit is contained in:
Rasmus Thomsen 2019-01-01 23:17:51 +01:00 committed by Helmut Pozimski
parent 89383f1779
commit 24da9e875e
6 changed files with 33 additions and 70 deletions

View file

@ -559,7 +559,7 @@ libgimpcolor-2.0.so.0 libgimp-2.10.0_1
libgimpmodule-2.0.so.0 libgimp-2.10.0_1
libgmic.so.2 gmic-2.1.8_1
libcgmic.so.2 gmic-2.1.8_1
libexiv2.so.26 exiv2-0.26_1
libexiv2.so.27 exiv2-0.27_1
libKF5Holidays.so.5 kholidays-5.47.0_1
libPhabricatorHelpers.so.5 purpose-5.48.0_1
libKF5PurposeWidgets.so.5 purpose-5.48.0_1

View file

@ -1,22 +0,0 @@
From 5405d61623e82896e498c5c8342dd6f42e689115 Mon Sep 17 00:00:00 2001
From: clanmills <robin@clanmills.com>
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()) {

View file

@ -1,23 +0,0 @@
From 591dea579ae946972fef14bbf799b2d3a12e82d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C4=81ris=20Narti=C5=A1s?= <mn@sungis.lv>
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];

View file

@ -1,15 +0,0 @@
--- 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

View file

@ -0,0 +1,23 @@
diff --git a/src/futils.cpp b/src/futils.cpp
index a30acd9..24250fa 100644
--- src/futils.cpp
+++ src/futils.cpp
@@ -54,7 +54,7 @@
#include <stdexcept>
#ifdef EXV_HAVE_STRERROR_R
-#ifdef _GNU_SOURCE
+#if defined(_GNU_SOURCE) && defined(__GLIBC__)
extern char *strerror_r(int errnum, char *buf, size_t n);
#else
extern int strerror_r(int errnum, char *buf, size_t n);
@@ -348,7 +348,7 @@ namespace Exiv2 {
std::ostringstream os;
#ifdef EXV_HAVE_STRERROR_R
const size_t n = 1024;
-#ifdef _GNU_SOURCE
+#if defined(_GNU_SOURCE) && defined(__GLIBC__)
char *buf = 0;
char buf2[n];
std::memset(buf2, 0x0, n);

View file

@ -1,17 +1,17 @@
# Template file for 'exiv2'
pkgname=exiv2
version=0.26
revision=2
build_style=gnu-configure
wrksrc=exiv2-trunk
version=0.27.0
revision=1
wrksrc="exiv2-${version}-Source"
build_style=cmake
configure_args="-DEXIV2_BUILD_SAMPLES=OFF"
makedepends="zlib-devel expat-devel"
short_desc="Image metadata manipulation"
maintainer="Juan RP <xtraeme@voidlinux.eu>"
license="GPL-2"
maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
license="GPL-2.0-or-later"
homepage="http://www.exiv2.org"
distfiles="http://www.exiv2.org/builds/exiv2-${version}-trunk.tar.gz"
checksum=c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb
disable_parallel_build=yes
distfiles="http://www.exiv2.org/builds/exiv2-${version}-Source.tar.gz"
checksum=ee88bc81539b73c65010651785d094fad0b39760a424b3c16c17e1856cfef2d7
exiv2-devel_package() {
depends="${makedepends} ${sourcepkg}-${version}_${revision}"