Received: by mail.netbsd.org (Postfix, from userid 605) id 4180484D28; Tue, 16 May 2023 20:25:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 702B084CD0 for ; Tue, 16 May 2023 20:25:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id xy-33Hrt1LyW for ; Tue, 16 May 2023 20:25:00 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 7D39E84CCC for ; Tue, 16 May 2023 20:25:00 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 70C4EFA87; Tue, 16 May 2023 20:25:00 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1684268700247370" MIME-Version: 1.0 Date: Tue, 16 May 2023 20:25:00 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/graphics/exiv2 To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20230516202500.70C4EFA87@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1684268700247370 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Tue May 16 20:25:00 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. No short list of changes found, long version here: https://github.com/Exiv2/exiv2/issues/2406#issuecomment-1529139799 To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 pkgsrc/graphics/exiv2/Makefile cvs rdiff -u -r1.22 -r1.23 pkgsrc/graphics/exiv2/PLIST cvs rdiff -u -r1.18 -r1.19 pkgsrc/graphics/exiv2/buildlink3.mk cvs rdiff -u -r1.41 -r1.42 pkgsrc/graphics/exiv2/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake cvs rdiff -u -r1.2 -r0 \ pkgsrc/graphics/exiv2/patches/patch-contrib_organize_Makefile \ pkgsrc/graphics/exiv2/patches/patch-src_convert.cpp cvs rdiff -u -r1.1 -r0 \ pkgsrc/graphics/exiv2/patches/patch-contrib_organize_helpers.cpp \ pkgsrc/graphics/exiv2/patches/patch-include_exiv2_types.hpp cvs rdiff -u -r0 -r1.1 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. --_----------=_1684268700247370 Content-Disposition: inline Content-Length: 7022 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/exiv2/Makefile diff -u pkgsrc/graphics/exiv2/Makefile:1.52 pkgsrc/graphics/exiv2/Makefile:1.53 --- pkgsrc/graphics/exiv2/Makefile:1.52 Wed Apr 26 19:01:35 2023 +++ pkgsrc/graphics/exiv2/Makefile Tue May 16 20:25:00 2023 @@ -1,13 +1,13 @@ -# $NetBSD: Makefile,v 1.52 2023/04/26 19:01:35 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2023/05/16 20:25:00 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 -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.22 pkgsrc/graphics/exiv2/PLIST:1.23 --- pkgsrc/graphics/exiv2/PLIST:1.22 Wed Apr 26 19:01:35 2023 +++ pkgsrc/graphics/exiv2/PLIST Tue May 16 20:25:00 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2023/04/26 19:01:35 wiz Exp $ +@comment $NetBSD: PLIST,v 1.23 2023/05/16 20:25:00 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.18 pkgsrc/graphics/exiv2/buildlink3.mk:1.19 --- pkgsrc/graphics/exiv2/buildlink3.mk:1.18 Mon Jul 15 22:07:08 2019 +++ pkgsrc/graphics/exiv2/buildlink3.mk Tue May 16 20:25:00 2023 @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2019/07/15 22:07:08 nia Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2023/05/16 20:25:00 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 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.41 pkgsrc/graphics/exiv2/distinfo:1.42 --- pkgsrc/graphics/exiv2/distinfo:1.41 Wed Apr 26 19:01:35 2023 +++ pkgsrc/graphics/exiv2/distinfo Tue May 16 20:25:00 2023 @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.41 2023/04/26 19:01:35 wiz Exp $ +$NetBSD: distinfo,v 1.42 2023/05/16 20:25:00 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) = 95bf728a5090bfabaa8f1d401c70d47cf6fd59ab +SHA1 (patch-src_futils.cpp) = b64e163f0350cf5d8773096a48cc09fc732f979a Index: pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake diff -u pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake:1.1 pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake:1.2 --- pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake:1.1 Fri Oct 25 09:44:26 2019 +++ pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake Tue May 16 20:25:00 2023 @@ -1,4 +1,6 @@ -$NetBSD: patch-cmake_config.h.cmake,v 1.1 2019/10/25 09:44:26 kamil Exp $ +$NetBSD: patch-cmake_config.h.cmake,v 1.2 2023/05/16 20:25:00 wiz Exp $ + +Support newer NetBSD versions. --- 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.1 --- /dev/null Tue May 16 20:25:00 2023 +++ pkgsrc/graphics/exiv2/patches/patch-src_futils.cpp Tue May 16 20:25:00 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-src_futils.cpp,v 1.1 2023/05/16 20:25:00 wiz Exp $ + +Fix build on NetBSD. + +--- 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() ++#elif defined(PROC_PIDPATHINFO_MAXSIZE) + char pathbuf[PROC_PIDPATHINFO_MAXSIZE]; + proc_pidpath(getpid(), pathbuf, sizeof(pathbuf)); + auto path = fs::path(pathbuf); --_----------=_1684268700247370--