Sat Jul 1 22:13:15 2023 UTC ()
exiv2: update to 0.28.0, again.

geeqie already supports it, patches for two others incoming.


(wiz)
diff -r1.54 -r1.55 pkgsrc/graphics/exiv2/Makefile
diff -r1.24 -r1.25 pkgsrc/graphics/exiv2/PLIST
diff -r1.21 -r1.22 pkgsrc/graphics/exiv2/buildlink3.mk
diff -r1.44 -r1.45 pkgsrc/graphics/exiv2/distinfo
diff -r1.4 -r1.5 pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake
diff -r1.4 -r0 pkgsrc/graphics/exiv2/patches/patch-contrib_organize_Makefile
diff -r1.4 -r0 pkgsrc/graphics/exiv2/patches/patch-src_convert.cpp
diff -r1.3 -r0 pkgsrc/graphics/exiv2/patches/patch-contrib_organize_helpers.cpp
diff -r1.3 -r0 pkgsrc/graphics/exiv2/patches/patch-include_exiv2_types.hpp
diff -r0 -r1.4 pkgsrc/graphics/exiv2/patches/patch-src_futils.cpp
cvs diff -r1.54 -r1.55 pkgsrc/graphics/exiv2/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/exiv2/Makefile 2023/05/17 10:49:15 1.54
+++ pkgsrc/graphics/exiv2/Makefile 2023/07/01 22:13:14 1.55
@@ -1,42 +1,44 @@ @@ -1,42 +1,44 @@
1# $NetBSD: Makefile,v 1.54 2023/05/17 10:49:15 wiz Exp $ 1# $NetBSD: Makefile,v 1.55 2023/07/01 22:13:14 wiz Exp $
2 2
3DISTNAME= exiv2-0.27.6-Source 3DISTNAME= exiv2-0.28.0-Source
4PKGNAME= ${DISTNAME:S/-Source//} 4PKGNAME= ${DISTNAME:S/-Source//}
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= ${MASTER_SITE_GITHUB:=Exiv2/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=Exiv2/}
7GITHUB_RELEASE= v${PKGVERSION_NOREV} 7GITHUB_RELEASE= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.exiv2.org/ 10HOMEPAGE= https://exiv2.org/
11COMMENT= Image metadata manipulation 11COMMENT= Image metadata manipulation
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14CHECK_PORTABILITY_SKIP+= contrib/coverity.sh 14CHECK_PORTABILITY_SKIP+= contrib/coverity.sh
15 15
16USE_TOOLS+= msgfmt 16USE_TOOLS+= msgfmt
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18GCC_REQD+= 3.3 18GCC_REQD+= 3.3
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22CMAKE_ARGS+= -DEXIV2_BUILD_SAMPLES:BOOL=OFF 22CMAKE_ARGS+= -DEXIV2_BUILD_SAMPLES:BOOL=OFF
23# turn on BMFF support -- will be default as of 1.00 23# turn on BMFF support -- will be default as of 1.00
24CMAKE_ARGS+= -DEXIV2_ENABLE_BMFF:BOOL=ON 24CMAKE_ARGS+= -DEXIV2_ENABLE_BMFF:BOOL=ON
25.if ${OPSYS} == "Darwin" 25.if ${OPSYS} == "Darwin"
26CMAKE_ARGS+= -DIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include 26CMAKE_ARGS+= -DIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include
27.endif 27.endif
28 28
29LDFLAGS.Linux+= -ldl 29LDFLAGS.Linux+= -ldl
30LDFLAGS.SunOS+= -lsocket -lnsl 30LDFLAGS.SunOS+= -lsocket -lnsl
31 31
32CXXFLAGS.SunOS+= -fPIC 32CXXFLAGS.SunOS+= -fPIC
33 33
34PKGCONFIG_OVERRIDE= cmake/exiv2.pc.in 34PKGCONFIG_OVERRIDE= cmake/exiv2.pc.in
35 35
36.include "../../devel/cmake/build.mk" 36.include "../../devel/cmake/build.mk"
 37.include "../../archivers/brotli/buildlink3.mk"
37.include "../../converters/libiconv/buildlink3.mk" 38.include "../../converters/libiconv/buildlink3.mk"
38.include "../../devel/gettext-lib/buildlink3.mk" 39.include "../../devel/gettext-lib/buildlink3.mk"
39.include "../../devel/zlib/buildlink3.mk" 40.include "../../devel/zlib/buildlink3.mk"
40.include "../../textproc/expat/buildlink3.mk" 41.include "../../textproc/expat/buildlink3.mk"
 42.include "../../textproc/inih/buildlink3.mk"
41.include "../../mk/pthread.buildlink3.mk" 43.include "../../mk/pthread.buildlink3.mk"
42.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.24 -r1.25 pkgsrc/graphics/exiv2/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/exiv2/PLIST 2023/05/17 10:49:15 1.24
+++ pkgsrc/graphics/exiv2/PLIST 2023/07/01 22:13:14 1.25
@@ -1,61 +1,58 @@ @@ -1,61 +1,58 @@
1@comment $NetBSD: PLIST,v 1.24 2023/05/17 10:49:15 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.25 2023/07/01 22:13:14 wiz Exp $
2bin/exiv2 2bin/exiv2
3include/exiv2/asfvideo.hpp 3include/exiv2/asfvideo.hpp
4include/exiv2/basicio.hpp 4include/exiv2/basicio.hpp
5include/exiv2/bmffimage.hpp 5include/exiv2/bmffimage.hpp
6include/exiv2/bmpimage.hpp 6include/exiv2/bmpimage.hpp
7include/exiv2/config.h 7include/exiv2/config.h
8include/exiv2/convert.hpp 8include/exiv2/convert.hpp
9include/exiv2/cr2image.hpp 9include/exiv2/cr2image.hpp
10include/exiv2/crwimage.hpp 10include/exiv2/crwimage.hpp
11include/exiv2/datasets.hpp 11include/exiv2/datasets.hpp
12include/exiv2/easyaccess.hpp 12include/exiv2/easyaccess.hpp
13include/exiv2/epsimage.hpp 13include/exiv2/epsimage.hpp
14include/exiv2/error.hpp 14include/exiv2/error.hpp
15include/exiv2/exif.hpp 15include/exiv2/exif.hpp
16include/exiv2/exiv2.hpp 16include/exiv2/exiv2.hpp
17include/exiv2/exiv2lib_export.h 17include/exiv2/exiv2lib_export.h
18include/exiv2/exv_conf.h 18include/exiv2/exv_conf.h
19include/exiv2/futils.hpp 19include/exiv2/futils.hpp
20include/exiv2/gifimage.hpp 20include/exiv2/gifimage.hpp
21include/exiv2/http.hpp 21include/exiv2/http.hpp
22include/exiv2/image.hpp 22include/exiv2/image.hpp
23include/exiv2/ini.hpp 23include/exiv2/image_types.hpp
24include/exiv2/iptc.hpp 24include/exiv2/iptc.hpp
25include/exiv2/jp2image.hpp 25include/exiv2/jp2image.hpp
26include/exiv2/jpgimage.hpp 26include/exiv2/jpgimage.hpp
27include/exiv2/matroskavideo.hpp 27include/exiv2/matroskavideo.hpp
28include/exiv2/metadatum.hpp 28include/exiv2/metadatum.hpp
29include/exiv2/mrwimage.hpp 29include/exiv2/mrwimage.hpp
30include/exiv2/orfimage.hpp 30include/exiv2/orfimage.hpp
31include/exiv2/pgfimage.hpp 31include/exiv2/pgfimage.hpp
 32include/exiv2/photoshop.hpp
32include/exiv2/pngimage.hpp 33include/exiv2/pngimage.hpp
33include/exiv2/preview.hpp 34include/exiv2/preview.hpp
34include/exiv2/properties.hpp 35include/exiv2/properties.hpp
35include/exiv2/psdimage.hpp 36include/exiv2/psdimage.hpp
36include/exiv2/quicktimevideo.hpp 37include/exiv2/quicktimevideo.hpp
37include/exiv2/rafimage.hpp 38include/exiv2/rafimage.hpp
38include/exiv2/riffvideo.hpp 39include/exiv2/riffvideo.hpp
39include/exiv2/rw2image.hpp 40include/exiv2/rw2image.hpp
40include/exiv2/rwlock.hpp 
41include/exiv2/slice.hpp 41include/exiv2/slice.hpp
42include/exiv2/ssh.hpp 
43include/exiv2/tags.hpp 42include/exiv2/tags.hpp
44include/exiv2/tgaimage.hpp 43include/exiv2/tgaimage.hpp
45include/exiv2/tiffimage.hpp 44include/exiv2/tiffimage.hpp
46include/exiv2/types.hpp 45include/exiv2/types.hpp
47include/exiv2/utilsvideo.hpp 
48include/exiv2/value.hpp 46include/exiv2/value.hpp
49include/exiv2/version.hpp 47include/exiv2/version.hpp
50include/exiv2/webpimage.hpp 48include/exiv2/webpimage.hpp
51include/exiv2/xmp_exiv2.hpp 49include/exiv2/xmp_exiv2.hpp
52include/exiv2/xmpsidecar.hpp 50include/exiv2/xmpsidecar.hpp
53lib/cmake/exiv2/exiv2Config-release.cmake 51lib/cmake/exiv2/exiv2Config-release.cmake
54lib/cmake/exiv2/exiv2Config.cmake 52lib/cmake/exiv2/exiv2Config.cmake
55lib/cmake/exiv2/exiv2ConfigVersion.cmake 53lib/cmake/exiv2/exiv2ConfigVersion.cmake
56lib/libexiv2-xmp.a 
57lib/libexiv2.so 54lib/libexiv2.so
58lib/libexiv2.so.${PKGVERSION} 55lib/libexiv2.so.${PKGVERSION}
59lib/libexiv2.so.27 56lib/libexiv2.so.28
60lib/pkgconfig/exiv2.pc 57lib/pkgconfig/exiv2.pc
61man/man1/exiv2.1 58man/man1/exiv2.1
cvs diff -r1.21 -r1.22 pkgsrc/graphics/exiv2/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/exiv2/buildlink3.mk 2023/05/17 10:49:15 1.21
+++ pkgsrc/graphics/exiv2/buildlink3.mk 2023/07/01 22:13:14 1.22
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: buildlink3.mk,v 1.21 2023/05/17 10:49:15 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.22 2023/07/01 22:13:14 wiz Exp $
2 2
3BUILDLINK_TREE+= exiv2 3BUILDLINK_TREE+= exiv2
4 4
5.if !defined(EXIV2_BUILDLINK3_MK) 5.if !defined(EXIV2_BUILDLINK3_MK)
6EXIV2_BUILDLINK3_MK:= 6EXIV2_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.exiv2+= exiv2>=0.27 8BUILDLINK_API_DEPENDS.exiv2+= exiv2>=0.27
9BUILDLINK_ABI_DEPENDS.exiv2+= exiv2>=0.27 9BUILDLINK_ABI_DEPENDS.exiv2+= exiv2>=0.28.0
10BUILDLINK_PKGSRCDIR.exiv2?= ../../graphics/exiv2 10BUILDLINK_PKGSRCDIR.exiv2?= ../../graphics/exiv2
11 11
12.include "../../devel/gettext-lib/buildlink3.mk" 12.include "../../devel/gettext-lib/buildlink3.mk"
13.include "../../devel/zlib/buildlink3.mk" 13.include "../../devel/zlib/buildlink3.mk"
14.include "../../textproc/expat/buildlink3.mk" 14.include "../../textproc/expat/buildlink3.mk"
 15.include "../../textproc/inih/buildlink3.mk"
15.endif # EXIV2_BUILDLINK3_MK 16.endif # EXIV2_BUILDLINK3_MK
16 17
17BUILDLINK_TREE+= -exiv2 18BUILDLINK_TREE+= -exiv2
cvs diff -r1.44 -r1.45 pkgsrc/graphics/exiv2/distinfo (expand / switch to unified diff)

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

--- pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake 2023/05/17 10:49:15 1.4
+++ pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake 2023/07/01 22:13:15 1.5
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-cmake_config.h.cmake,v 1.4 2023/05/17 10:49:15 wiz Exp $ 1$NetBSD: patch-cmake_config.h.cmake,v 1.5 2023/07/01 22:13:15 wiz Exp $
 2
 3Support newer NetBSD versions.
 4https://github.com/Exiv2/exiv2/pull/2626
2 5
3--- cmake/config.h.cmake.orig 2019-07-29 06:33:06.000000000 +0000 6--- cmake/config.h.cmake.orig 2019-07-29 06:33:06.000000000 +0000
4+++ cmake/config.h.cmake 7+++ cmake/config.h.cmake
5@@ -35,7 +35,17 @@ 8@@ -35,7 +35,17 @@
6  9
7 /* Define to `const' or to empty, depending on the second argument of `iconv'. */ 10 /* Define to `const' or to empty, depending on the second argument of `iconv'. */
8 #cmakedefine ICONV_ACCEPTS_CONST_INPUT 11 #cmakedefine ICONV_ACCEPTS_CONST_INPUT
9-#if defined(ICONV_ACCEPTS_CONST_INPUT) || defined(__NetBSD__) 12-#if defined(ICONV_ACCEPTS_CONST_INPUT) || defined(__NetBSD__)
10+ 13+
11+#if defined(__NetBSD__) 14+#if defined(__NetBSD__)
12+#include <sys/param.h> 15+#include <sys/param.h>
13+#if __NetBSD_Prereq__(9,99,17) 16+#if __NetBSD_Prereq__(9,99,17)
14+#define NETBSD_POSIX_ICONV 1 17+#define NETBSD_POSIX_ICONV 1
File Deleted: pkgsrc/graphics/exiv2/patches/Attic/patch-contrib_organize_Makefile
File Deleted: pkgsrc/graphics/exiv2/patches/Attic/patch-src_convert.cpp
File Deleted: pkgsrc/graphics/exiv2/patches/Attic/patch-contrib_organize_helpers.cpp
File Deleted: pkgsrc/graphics/exiv2/patches/Attic/patch-include_exiv2_types.hpp
File Added: pkgsrc/graphics/exiv2/patches/patch-src_futils.cpp
$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);