Update exiv2 to the latest stable version. Only tested with upcoming digikam 5.8.0. 14971 jpeg pictures don't cause any problems.
I don't expect any problems but to be on the safe side could someone push it into an the next bulk? ok? Comments? Rafael Sadowski Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/exiv2/Makefile,v retrieving revision 1.26 diff -u -p -u -p -r1.26 Makefile --- Makefile 26 Jul 2017 22:45:23 -0000 1.26 +++ Makefile 15 Mar 2018 09:28:45 -0000 @@ -2,20 +2,20 @@ COMMENT= manipulate image meta-data such as exif and ipct -DISTNAME= exiv2-0.25 +DISTNAME= exiv2-0.26-trunk +PKGNAME= exiv2-0.26 CATEGORIES= graphics devel -REVISION= 2 -SHARED_LIBS += exiv2 8.0 # 14.0 +SHARED_LIBS += exiv2 9.0 # 14.0 HOMEPAGE= http://www.exiv2.org/ # GPLv2+ PERMIT_PACKAGE_CDROM= Yes -MASTER_SITES= ${HOMEPAGE} +WANTLIB += ${COMPILER_LIBCXX} c expat iconv intl m z -WANTLIB += c iconv intl m ${COMPILER_LIBCXX} z expat pthread +MASTER_SITES= http://www.exiv2.org/builds/ USE_GMAKE= Yes @@ -26,8 +26,9 @@ BUILD_DEPENDS= devel/gettext-tools LIB_DEPENDS= devel/gettext CONFIGURE_ARGS= --enable-static -CONFIGURE_ENV= LDFLAGS="${LDFLAGS} -pthread" NO_TEST= Yes + +WRKDIST= ${WRKDIR}/exiv2-trunk .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/exiv2/distinfo,v retrieving revision 1.11 diff -u -p -u -p -r1.11 distinfo --- distinfo 21 Nov 2015 15:33:56 -0000 1.11 +++ distinfo 15 Mar 2018 09:28:45 -0000 @@ -1,2 +1,2 @@ -SHA256 (exiv2-0.25.tar.gz) = yAv8d4oV/bBvcSZdssPUnYSTw4LlFsuZuMn5y94276Q= -SIZE (exiv2-0.25.tar.gz) = 5434325 +SHA256 (exiv2-0.26-trunk.tar.gz) = x148SggRv3ANksgjGTc7eoJaIzHBK4s31B61jk8Y6vs= +SIZE (exiv2-0.26-trunk.tar.gz) = 5677925 Index: patch-xmpsdk_src_XMPMeta-Serialize_cpp =================================================================== RCS file: patch-xmpsdk_src_XMPMeta-Serialize_cpp diff -N patch-xmpsdk_src_XMPMeta-Serialize_cpp Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- patches/patch-configure 21 Nov 2015 15:33:56 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-configure,v 1.2 2015/11/21 15:33:56 jca Exp $ - -Don't blindly add -ldl to LDFLAGS. - ---- configure.orig Thu Nov 19 19:50:47 2015 -+++ configure Thu Nov 19 19:52:12 2015 -@@ -17321,6 +17321,8 @@ fi - case "$host_os" in - *mingw* | *cygwin*) - LDFLAGS="$LDFLAGS -no-undefined -lpsapi -lwldap32 -lws2_32" ;; -+*openbsd*) -+ LDFLAGS="$LDFLAGS" ;; - *) - LDFLAGS="$LDFLAGS -ldl" ;; - esac Index: patches/patch-src_Makefile =================================================================== RCS file: /cvs/ports/graphics/exiv2/patches/patch-src_Makefile,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-src_Makefile --- patches/patch-src_Makefile 21 Nov 2015 15:34:46 -0000 1.4 +++ patches/patch-src_Makefile 15 Mar 2018 09:28:45 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-src_Makefile,v 1.4 2015/11/21 15:34:46 jca Exp $ ---- src/Makefile.orig Sun Jun 21 16:20:11 2015 -+++ src/Makefile Thu Nov 19 22:37:08 2015 -@@ -150,7 +150,7 @@ LIBRARY = libexiv2.la +Index: src/Makefile +--- src/Makefile.orig ++++ src/Makefile +@@ -151,7 +151,7 @@ LIBRARY = libexiv2.la # ****************************************************************************** # Initialisations @@ -22,7 +23,7 @@ $OpenBSD: patch-src_Makefile,v 1.4 2015/ @@ -252,7 +252,7 @@ $(BINARY): %: %.o lib @$(LIBTOOL) --mode=link $(LINK.cc) -o $@ $(LIBRARY) $@.o -rpath $(libdir) - $(EXIV2BIN): lib $(EXIV2OBJ) $(EXIV2COBJ) + $(EXIV2EXE): lib $(EXIV2OBJ) $(EXIV2COBJ) - mkdir -pv ../bin 2>&1 > /dev/null + mkdir -p ../bin 2>&1 > /dev/null @$(LIBTOOL) --mode=link $(LINK.cc) -o ../bin/$@ $(LIBRARY) $(EXIV2OBJ) $(EXIV2COBJ) -rpath $(libdir) Index: patches/patch-src_actions_cpp =================================================================== RCS file: patches/patch-src_actions_cpp diff -N patches/patch-src_actions_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_actions_cpp 15 Mar 2018 09:28:45 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/actions.cpp +--- src/actions.cpp.orig ++++ src/actions.cpp +@@ -2049,7 +2049,7 @@ namespace { + /* 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; ++ static pthread_mutex_t cs = PTHREAD_MUTEX_INITIALIZER; + #endif + #endif + Index: patches/patch-src_http_cpp =================================================================== RCS file: /cvs/ports/graphics/exiv2/patches/patch-src_http_cpp,v retrieving revision 1.1 diff -u -p -u -p -r1.1 patch-src_http_cpp --- patches/patch-src_http_cpp 21 Nov 2015 15:34:46 -0000 1.1 +++ patches/patch-src_http_cpp 15 Mar 2018 09:28:45 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-src_http_cpp,v 1.1 2015/11/21 15:34:46 jca Exp $ ---- src/http.cpp.orig Thu Nov 19 22:17:01 2015 -+++ src/http.cpp Thu Nov 19 22:18:16 2015 -@@ -35,6 +35,7 @@ +Index: src/http.cpp +--- src/http.cpp.orig ++++ src/http.cpp +@@ -41,6 +41,7 @@ #include <time.h> #include <sys/stat.h> #include <string.h> Index: patches/patch-src_pentaxmn_cpp =================================================================== RCS file: patches/patch-src_pentaxmn_cpp diff -N patches/patch-src_pentaxmn_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_pentaxmn_cpp 15 Mar 2018 09:28:45 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Fix http://dev.exiv2.org/issues/1305 + +Index: src/pentaxmn.cpp +--- src/pentaxmn.cpp.orig ++++ 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()) { Index: patches/patch-src_version_cpp =================================================================== RCS file: /cvs/ports/graphics/exiv2/patches/patch-src_version_cpp,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-src_version_cpp --- patches/patch-src_version_cpp 21 Nov 2015 15:33:56 -0000 1.4 +++ patches/patch-src_version_cpp 15 Mar 2018 09:28:45 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-src_version_cpp,v 1.4 2015/11/21 15:33:56 jca Exp $ ---- src/version.cpp.orig Sat May 9 00:26:36 2015 -+++ src/version.cpp Thu Nov 19 19:30:30 2015 -@@ -81,6 +81,7 @@ namespace Exiv2 { +Index: src/version.cpp +--- src/version.cpp.orig ++++ src/version.cpp +@@ -126,6 +126,7 @@ namespace Exiv2 { return os.str(); } Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/exiv2/pkg/PLIST,v retrieving revision 1.9 diff -u -p -u -p -r1.9 PLIST --- pkg/PLIST 21 Nov 2015 15:33:56 -0000 1.9 +++ pkg/PLIST 15 Mar 2018 09:28:45 -0000 @@ -19,6 +19,7 @@ include/exiv2/futils.hpp include/exiv2/gifimage.hpp include/exiv2/http.hpp include/exiv2/image.hpp +include/exiv2/ini.hpp include/exiv2/iptc.hpp include/exiv2/jp2image.hpp include/exiv2/jpgimage.hpp @@ -32,12 +33,14 @@ include/exiv2/properties.hpp include/exiv2/psdimage.hpp include/exiv2/rafimage.hpp include/exiv2/rw2image.hpp +include/exiv2/rwlock.hpp include/exiv2/tags.hpp include/exiv2/tgaimage.hpp include/exiv2/tiffimage.hpp include/exiv2/types.hpp include/exiv2/value.hpp include/exiv2/version.hpp +include/exiv2/webpimage.hpp include/exiv2/xmp.hpp include/exiv2/xmpsidecar.hpp lib/libexiv2.a @@ -45,6 +48,7 @@ lib/libexiv2.la @lib lib/libexiv2.so.${LIBexiv2_VERSION} lib/pkgconfig/exiv2.pc @man man/man1/exiv2.1 +@man man/man1/exiv2samples.1 share/locale/bs/ share/locale/bs/LC_MESSAGES/ share/locale/bs/LC_MESSAGES/exiv2.mo
