pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/exiv2
Module Name: pkgsrc
Committed By: wiz
Date: Wed May 17 10:49: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-contrib_organize_Makefile
patch-contrib_organize_helpers.cpp patch-include_exiv2_types.hpp
patch-src_convert.cpp
Removed Files:
pkgsrc/graphics/exiv2/patches: patch-src_futils.cpp
Log Message:
exiv2: downgrade
Too much breakage:
https://github.com/Exiv2/exiv2/issues/2630
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 pkgsrc/graphics/exiv2/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/exiv2/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/exiv2/buildlink3.mk
cvs rdiff -u -r1.43 -r1.44 pkgsrc/graphics/exiv2/distinfo
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake
cvs rdiff -u -r0 -r1.4 \
pkgsrc/graphics/exiv2/patches/patch-contrib_organize_Makefile \
pkgsrc/graphics/exiv2/patches/patch-src_convert.cpp
cvs rdiff -u -r0 -r1.3 \
pkgsrc/graphics/exiv2/patches/patch-contrib_organize_helpers.cpp \
pkgsrc/graphics/exiv2/patches/patch-include_exiv2_types.hpp
cvs rdiff -u -r1.2 -r0 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.53 pkgsrc/graphics/exiv2/Makefile:1.54
--- pkgsrc/graphics/exiv2/Makefile:1.53 Tue May 16 20:25:00 2023
+++ pkgsrc/graphics/exiv2/Makefile Wed May 17 10:49:15 2023
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.53 2023/05/16 20:25:00 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2023/05/17 10:49:15 wiz Exp $
-DISTNAME= exiv2-0.28.0-Source
+DISTNAME= exiv2-0.27.6-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://exiv2.org/
+HOMEPAGE= https://www.exiv2.org/
COMMENT= Image metadata manipulation
LICENSE= gnu-gpl-v2
@@ -34,11 +34,9 @@ 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.23 pkgsrc/graphics/exiv2/PLIST:1.24
--- pkgsrc/graphics/exiv2/PLIST:1.23 Tue May 16 20:25:00 2023
+++ pkgsrc/graphics/exiv2/PLIST Wed May 17 10:49:15 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2023/05/16 20:25:00 wiz Exp $
+@comment $NetBSD: PLIST,v 1.24 2023/05/17 10:49:15 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/image_types.hpp
+include/exiv2/ini.hpp
include/exiv2/iptc.hpp
include/exiv2/jp2image.hpp
include/exiv2/jpgimage.hpp
@@ -29,7 +29,6 @@ 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
@@ -38,11 +37,14 @@ 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
@@ -51,8 +53,9 @@ 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.28
+lib/libexiv2.so.27
lib/pkgconfig/exiv2.pc
man/man1/exiv2.1
Index: pkgsrc/graphics/exiv2/buildlink3.mk
diff -u pkgsrc/graphics/exiv2/buildlink3.mk:1.20 pkgsrc/graphics/exiv2/buildlink3.mk:1.21
--- pkgsrc/graphics/exiv2/buildlink3.mk:1.20 Tue May 16 20:28:45 2023
+++ pkgsrc/graphics/exiv2/buildlink3.mk Wed May 17 10:49:15 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2023/05/16 20:28:45 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2023/05/17 10:49:15 wiz Exp $
BUILDLINK_TREE+= exiv2
@@ -6,13 +6,12 @@ BUILDLINK_TREE+= exiv2
EXIV2_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.exiv2+= exiv2>=0.27
-BUILDLINK_ABI_DEPENDS.exiv2+= exiv2>=0.28.0
+BUILDLINK_ABI_DEPENDS.exiv2+= exiv2>=0.27
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.43 pkgsrc/graphics/exiv2/distinfo:1.44
--- pkgsrc/graphics/exiv2/distinfo:1.43 Tue May 16 20:38:21 2023
+++ pkgsrc/graphics/exiv2/distinfo Wed May 17 10:49:15 2023
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.43 2023/05/16 20:38:21 wiz Exp $
+$NetBSD: distinfo,v 1.44 2023/05/17 10:49:15 wiz Exp $
-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
+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
SHA1 (patch-cmake_compilerFlags.cmake) = 9f56d637e5dc99d7377a8d57ca9be9aab5833a76
-SHA1 (patch-cmake_config.h.cmake) = 5e8b863c505b32619efc71de6b6086fedfe75ba6
-SHA1 (patch-src_futils.cpp) = 2c11b118ecf4c588ebaaef91d490ed718238940c
+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
Index: pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake
diff -u pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake:1.3 pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake:1.4
--- pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake:1.3 Tue May 16 20:38:21 2023
+++ pkgsrc/graphics/exiv2/patches/patch-cmake_config.h.cmake Wed May 17 10:49:15 2023
@@ -1,7 +1,4 @@
-$NetBSD: patch-cmake_config.h.cmake,v 1.3 2023/05/16 20:38:21 wiz Exp $
-
-Support newer NetBSD versions.
-https://github.com/Exiv2/exiv2/pull/2626
+$NetBSD: patch-cmake_config.h.cmake,v 1.4 2023/05/17 10:49:15 wiz Exp $
--- 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-contrib_organize_Makefile
diff -u /dev/null pkgsrc/graphics/exiv2/patches/patch-contrib_organize_Makefile:1.4
--- /dev/null Wed May 17 10:49:15 2023
+++ pkgsrc/graphics/exiv2/patches/patch-contrib_organize_Makefile Wed May 17 10:49:15 2023
@@ -0,0 +1,29 @@
+$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=)
Index: pkgsrc/graphics/exiv2/patches/patch-src_convert.cpp
diff -u /dev/null pkgsrc/graphics/exiv2/patches/patch-src_convert.cpp:1.4
--- /dev/null Wed May 17 10:49:15 2023
+++ pkgsrc/graphics/exiv2/patches/patch-src_convert.cpp Wed May 17 10:49:15 2023
@@ -0,0 +1,26 @@
+$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
Index: pkgsrc/graphics/exiv2/patches/patch-contrib_organize_helpers.cpp
diff -u /dev/null pkgsrc/graphics/exiv2/patches/patch-contrib_organize_helpers.cpp:1.3
--- /dev/null Wed May 17 10:49:16 2023
+++ pkgsrc/graphics/exiv2/patches/patch-contrib_organize_helpers.cpp Wed May 17 10:49:15 2023
@@ -0,0 +1,15 @@
+$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;
+ }
Index: pkgsrc/graphics/exiv2/patches/patch-include_exiv2_types.hpp
diff -u /dev/null pkgsrc/graphics/exiv2/patches/patch-include_exiv2_types.hpp:1.3
--- /dev/null Wed May 17 10:49:16 2023
+++ pkgsrc/graphics/exiv2/patches/patch-include_exiv2_types.hpp Wed May 17 10:49:15 2023
@@ -0,0 +1,14 @@
+$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
Home |
Main Index |
Thread Index |
Old Index