CVS commit: pkgsrc/graphics/exiv2

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jul  1 22:13:15 UTC 2023

Modified Files:
        pkgsrc/graphics/exiv2: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/graphics/exiv2/patches: patch-cmake_config.h.cmake
Added Files:
        pkgsrc/graphics/exiv2/patches: patch-src_futils.cpp
Removed Files:
        pkgsrc/graphics/exiv2/patches: patch-contrib_organize_Makefile
            patch-contrib_organize_helpers.cpp patch-include_exiv2_types.hpp
            patch-src_convert.cpp

Log Message:
exiv2: update to 0.28.0, again.

geeqie already supports it, patches for two others incoming.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/graphics/exiv2/Makefile
cvs rdiff -u -r1.24 -r1.25 pkgsrc/graphics/exiv2/PLIST
cvs rdiff -u -r1.21 -r1.22 pkgsrc/graphics/exiv2/buildlink3.mk
cvs rdiff -u -r1.44 -r1.45 pkgsrc/graphics/exiv2/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/graphics/exiv2/patches/patch-contrib_organize_Makefile \
    pkgsrc/graphics/exiv2/patches/patch-src_convert.cpp
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/graphics/exiv2/patches/patch-contrib_organize_helpers.cpp \
    pkgsrc/graphics/exiv2/patches/patch-include_exiv2_types.hpp
cvs rdiff -u -r0 -r1.4 pkgsrc/graphics/exiv2/patches/patch-src_futils.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/exiv2/Makefile
diff -u pkgsrc/graphics/exiv2/Makefile:1.54 pkgsrc/graphics/exiv2/Makefile:1.55
--- pkgsrc/graphics/exiv2/Makefile:1.54 Wed May 17 10:49:15 2023
+++ pkgsrc/graphics/exiv2/Makefile      Sat Jul  1 22:13:14 2023
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.54 2023/05/17 10:49:15 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2023/07/01 22:13:14 wiz Exp $
 
-DISTNAME=      exiv2-0.27.6-Source
+DISTNAME=      exiv2-0.28.0-Source
 PKGNAME=       ${DISTNAME:S/-Source//}
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Exiv2/}
 GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://www.exiv2.org/
+HOMEPAGE=      https://exiv2.org/
 COMMENT=       Image metadata manipulation
 LICENSE=       gnu-gpl-v2
 
@@ -34,9 +34,11 @@ CXXFLAGS.SunOS+=     -fPIC
 PKGCONFIG_OVERRIDE=    cmake/exiv2.pc.in
 
 .include "../../devel/cmake/build.mk"
+.include "../../archivers/brotli/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.include "../../textproc/inih/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/exiv2/PLIST
diff -u pkgsrc/graphics/exiv2/PLIST:1.24 pkgsrc/graphics/exiv2/PLIST:1.25
--- pkgsrc/graphics/exiv2/PLIST:1.24    Wed May 17 10:49:15 2023
+++ pkgsrc/graphics/exiv2/PLIST Sat Jul  1 22:13:14 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2023/05/17 10:49:15 wiz Exp $
+@comment $NetBSD: PLIST,v 1.25 2023/07/01 22:13:14 wiz Exp $
 bin/exiv2
 include/exiv2/asfvideo.hpp
 include/exiv2/basicio.hpp
@@ -20,7 +20,7 @@ include/exiv2/futils.hpp
 include/exiv2/gifimage.hpp
 include/exiv2/http.hpp
 include/exiv2/image.hpp
-include/exiv2/ini.hpp
+include/exiv2/image_types.hpp
 include/exiv2/iptc.hpp
 include/exiv2/jp2image.hpp
 include/exiv2/jpgimage.hpp
@@ -29,6 +29,7 @@ include/exiv2/metadatum.hpp
 include/exiv2/mrwimage.hpp
 include/exiv2/orfimage.hpp
 include/exiv2/pgfimage.hpp
+include/exiv2/photoshop.hpp
 include/exiv2/pngimage.hpp
 include/exiv2/preview.hpp
 include/exiv2/properties.hpp
@@ -37,14 +38,11 @@ include/exiv2/quicktimevideo.hpp
 include/exiv2/rafimage.hpp
 include/exiv2/riffvideo.hpp
 include/exiv2/rw2image.hpp
-include/exiv2/rwlock.hpp
 include/exiv2/slice.hpp
-include/exiv2/ssh.hpp
 include/exiv2/tags.hpp
 include/exiv2/tgaimage.hpp
 include/exiv2/tiffimage.hpp
 include/exiv2/types.hpp
-include/exiv2/utilsvideo.hpp
 include/exiv2/value.hpp
 include/exiv2/version.hpp
 include/exiv2/webpimage.hpp
@@ -53,9 +51,8 @@ include/exiv2/xmpsidecar.hpp
 lib/cmake/exiv2/exiv2Config-release.cmake
 lib/cmake/exiv2/exiv2Config.cmake
 lib/cmake/exiv2/exiv2ConfigVersion.cmake
-lib/libexiv2-xmp.a
 lib/libexiv2.so
 lib/libexiv2.so.${PKGVERSION}
-lib/libexiv2.so.27
+lib/libexiv2.so.28
 lib/pkgconfig/exiv2.pc
 man/man1/exiv2.1

Index: pkgsrc/graphics/exiv2/buildlink3.mk
diff -u pkgsrc/graphics/exiv2/buildlink3.mk:1.21 pkgsrc/graphics/exiv2/buildlink3.mk:1.22
--- pkgsrc/graphics/exiv2/buildlink3.mk:1.21    Wed May 17 10:49:15 2023
+++ pkgsrc/graphics/exiv2/buildlink3.mk Sat Jul  1 22:13:14 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.21 2023/05/17 10:49:15 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.22 2023/07/01 22:13:14 wiz Exp $
 
 BUILDLINK_TREE+=       exiv2
 
@@ -6,12 +6,13 @@ BUILDLINK_TREE+=      exiv2
 EXIV2_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.exiv2+=  exiv2>=0.27
-BUILDLINK_ABI_DEPENDS.exiv2+=  exiv2>=0.27
+BUILDLINK_ABI_DEPENDS.exiv2+=  exiv2>=0.28.0
 BUILDLINK_PKGSRCDIR.exiv2?=    ../../graphics/exiv2
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.include "../../textproc/inih/buildlink3.mk"
 .endif # EXIV2_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -exiv2

Index: pkgsrc/graphics/exiv2/distinfo
diff -u pkgsrc/graphics/exiv2/distinfo:1.44 pkgsrc/graphics/exiv2/distinfo:1.45
--- pkgsrc/graphics/exiv2/distinfo:1.44 Wed May 17 10:49:15 2023
+++ pkgsrc/graphics/exiv2/distinfo      Sat Jul  1 22:13:14 2023
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.44 2023/05/17 10:49:15 wiz Exp $
+$NetBSD: distinfo,v 1.45 2023/07/01 22:13:14 wiz Exp $
 
-BLAKE2s (exiv2-0.27.6-Source.tar.gz) = a59ddbc2e0d4cfd741b1178525dc33e957280326cc9f5cd430ec33a6d7dc9181
-SHA512 (exiv2-0.27.6-Source.tar.gz) = 045d7fb391202b53897336094812600680141a292367a9194e9529bccb8ab54465190ea0f0636970114402a38840b33b2fcf2edf7b6c616f3e585fa295a887a4
-Size (exiv2-0.27.6-Source.tar.gz) = 32280263 bytes
+BLAKE2s (exiv2-0.28.0-Source.tar.gz) = dcb2df9e21ec4a140e6fe44025279d906f4248490671fbadaed6a0aaf94cb4ac
+SHA512 (exiv2-0.28.0-Source.tar.gz) = 5c523ee8c2156417df978048e8e5c5009f77b05eb546ca7063c00dd4f468aa89b1aa60fe4411a638bcf75adc72042bb2ecb3c023b5367f6b756f486c00776dfb
+Size (exiv2-0.28.0-Source.tar.gz) = 44893310 bytes
 SHA1 (patch-cmake_compilerFlags.cmake) = 9f56d637e5dc99d7377a8d57ca9be9aab5833a76
-SHA1 (patch-cmake_config.h.cmake) = b7e0336e5ca55a9df08958a05d8ac2a2c800e836
-SHA1 (patch-contrib_organize_Makefile) = 27348fdb0f80092b6e16f27e3ac1dca988eefe70
-SHA1 (patch-contrib_organize_helpers.cpp) = ec003c826d463b3e7e571ab4c41baffaca1240e9
-SHA1 (patch-include_exiv2_types.hpp) = 829e101c1c5f06de0a497b8c6a052b0a4e667d25
-SHA1 (patch-src_convert.cpp) = b600c1f6f6bf3ac6323ef51203603b248f9c0432
+SHA1 (patch-cmake_config.h.cmake) = 5e8b863c505b32619efc71de6b6086fedfe75ba6
+SHA1 (patch-src_futils.cpp) = 2c11b118ecf4c588ebaaef91d490ed718238940c

Index: pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake
diff -u pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake:1.4 pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake:1.5
--- pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake:1.4        Wed May 17 10:49:15 2023
+++ pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake    Sat Jul  1 22:13:15 2023
@@ -1,4 +1,7 @@
-$NetBSD: patch-cmake_config.h.cmake,v 1.4 2023/05/17 10:49:15 wiz Exp $
+$NetBSD: patch-cmake_config.h.cmake,v 1.5 2023/07/01 22:13:15 wiz Exp $
+
+Support newer NetBSD versions.
+https://github.com/Exiv2/exiv2/pull/2626
 
 --- cmake/config.h.cmake.orig  2019-07-29 06:33:06.000000000 +0000
 +++ cmake/config.h.cmake

Added files:

Index: pkgsrc/graphics/exiv2/patches/patch-src_futils.cpp
diff -u /dev/null pkgsrc/graphics/exiv2/patches/patch-src_futils.cpp:1.4
--- /dev/null   Sat Jul  1 22:13:15 2023
+++ pkgsrc/graphics/exiv2/patches/patch-src_futils.cpp  Sat Jul  1 22:13:15 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_futils.cpp,v 1.4 2023/07/01 22:13:15 wiz Exp $
+
+Fix build on NetBSD.
+https://github.com/Exiv2/exiv2/pull/2625
+
+--- src/futils.cpp.orig        2023-05-08 16:01:13.000000000 +0000
++++ src/futils.cpp
+@@ -360,7 +360,7 @@ std::string getProcessPath() {
+     TCHAR pathbuf[MAX_PATH];
+     GetModuleFileName(nullptr, pathbuf, MAX_PATH);
+     auto path = fs::path(pathbuf);
+-#elif __has_include(<libproc.h>)
++#elif defined(PROC_PIDPATHINFO_MAXSIZE)
+     char pathbuf[PROC_PIDPATHINFO_MAXSIZE];
+     proc_pidpath(getpid(), pathbuf, sizeof(pathbuf));
+     auto path = fs::path(pathbuf);