kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

exiv2: update to 0.28.0, again.

Browse source 
geeqie already supports it, patches for two others incoming.
This commit is contained in:
wiz 2023-07-01 22:13:14 +00:00
parent e6dee9a81d
commit a711a71345
10 changed files with 38 additions and 106 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
graphics/exiv2/Makefile
View file

@ -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
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"

11
graphics/exiv2/PLIST
View file

@ -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

5
graphics/exiv2/buildlink3.mk
View file

@ -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

15
graphics/exiv2/distinfo
View file

@ -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

5
graphics/exiv2/patches/patch-cmake_config.h.cmake
View file

@ -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

29
graphics/exiv2/patches/patch-contrib_organize_Makefile
View file

@ -1,29 +0,0 @@
$NetBSD: patch-contrib_organize_Makefile,v 1.4 2023/05/17 10:49:15 wiz Exp $
Adjust for pkgsrc build.
--- contrib/organize/Makefile.orig 2011-02-28 20:05:59.000000000 +0000
+++ contrib/organize/Makefile
@@ -50,7 +50,6 @@ all: ozbin
# Include system configuration
top_srcdir = ../..
include $(top_srcdir)/config/config.mk
-include boost.mk
# ******************************************************************************
# Source files
@@ -68,12 +67,12 @@ SHELL = /bin/sh
.PRECIOUS: %.cpp
-CPPFLAGS := -I$(BOOST_INC_DIR) `pkg-config exiv2 --cflags`
+CPPFLAGS += -DBOOST_FILESYSTEM_DEPRECATED -I${PREFIX}/include/boost `pkg-config exiv2 --cflags`
ifdef HAVE_STDINT
CPPFLAGS += -DEXV_HAVE_STDINT_H=1
endif
-LDFLAGS := $(BOOST_LIBS) `pkg-config exiv2 --libs`
+LDFLAGS += -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib -lboost_system -lboost_filesystem -lboost_regex -lboost_program_options `pkg-config exiv2 --libs`
OZOBJ = $(OZSRC:.cpp=.o) $(OZMAIN:.cpp=.o)
OZBIN = $(OZMAIN:.cpp=)

15
graphics/exiv2/patches/patch-contrib_organize_helpers.cpp
View file

@ -1,15 +0,0 @@
$NetBSD: patch-contrib_organize_helpers.cpp,v 1.3 2023/05/17 10:49:15 wiz Exp $
Pointers have no sign.
--- contrib/organize/helpers.cpp.orig 2016-12-22 14:15:48.253723125 +0000
+++ contrib/organize/helpers.cpp
@@ -204,7 +204,7 @@ std::string iptc_day(const Exiv2::Image
bool file_get_tm(const fs::path &path, std::tm &tm)
{
std::time_t timer = fs::last_write_time(path);
- if(time > 0) {
+ if(time) {
tm = *localtime(&timer);
return true;
}

14
graphics/exiv2/patches/patch-include_exiv2_types.hpp
View file

@ -1,14 +0,0 @@
$NetBSD: patch-include_exiv2_types.hpp,v 1.3 2023/05/17 10:49:15 wiz Exp $
Remove bogus forward declaration.
--- include/exiv2/types.hpp.orig 2015-06-08 14:39:59.000000000 +0000
+++ include/exiv2/types.hpp
@@ -78,7 +78,6 @@ typedef __int64 int64_t;
// *****************************************************************************
// forward declarations
-struct tm;
// *****************************************************************************
// namespace extensions

26
graphics/exiv2/patches/patch-src_convert.cpp
View file

@ -1,26 +0,0 @@
$NetBSD: patch-src_convert.cpp,v 1.4 2023/05/17 10:49:15 wiz Exp $
Support NetBSD and SunOS iconv being special.
--- src/convert.cpp.orig 2019-07-29 06:33:07.000000000 +0000
+++ src/convert.cpp
@@ -1545,11 +1545,19 @@ namespace {
char outbuf[256];
char* outptr = outbuf;
size_t outbytesleft = sizeof(outbuf);
+#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
+ size_t rc = iconv(cd,
+ const_cast<const char **>(&inptr),
+ &inbytesleft,
+ &outptr,
+ &outbytesleft);
+#else
size_t rc = iconv(cd,
&inptr,
&inbytesleft,
&outptr,
&outbytesleft);
+#endif
const size_t outbytesProduced = sizeof(outbuf) - outbytesleft;
if (rc == size_t(-1) && errno != E2BIG) {
#ifndef SUPPRESS_WARNINGS

16
graphics/exiv2/patches/patch-src_futils.cpp Normal file
View file

@ -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);