Skip to content

Commit

Permalink
exiv2: Update to 0.72.1
Browse files Browse the repository at this point in the history
pkgsrc notes:

upstream has changed their build system to cmake (and meson in the
case of gexiv2)

unfortunately the build system for exiv2-organize has rotted so it
has to be removed for now.

tested on various netbsd versions with gimp, I am expecting breakage,
sorry in advance.

Changes from version 0.27 to 0.27.1
-----------------------------------

Closed (40)
https://github.com/Exiv2/exiv2/milestone/3?closed=1


Changes from version 0.26 to 0.27
---------------------------------

https://github.com/Exiv2/exiv2/milestone/1?closed=1

88 issues have been closed on Redmine

* Build: (11)
- 0001362:	Fix Clang build
			(David Carlos Manuelda)
- 0001358:	Unsuccessful build (Win7, MSVC2015, amd64_x86)
			(Andreas Martin)
- 0001356:	Small patch to configure.py
			(Sridhar Boovaraghavan)
- 0001329:	Error during cmake with gcc version parsing
			(Maxime Daisy)
- 0001310:	Provide support for msys/2.0
- 0001299:	exiv2-0.26-trunk.tar.gz changed on download server
			(Jonathan Riddell)
- 0001270:	Using libexiv2.a/.lib  in multhreaded app segfaults.
			(Ben Touchette)
- 0001237:	Report CMake/MinGW issues to Kitware
- 0001188:	Provide build support for C++11
- 0001174:	Visual Studio Support Enhancements
- 0001121:	Visual Studio support for v0.27

* Basicio: (1)
- 0001374:	excessively often calls stat()
			(Johannes Berg)

* Coverity: (11)
- 0001265:	[ Coverity : /src/basicio.cpp ] Unchecked return value from library , Time of check time of use , Incorrect deallocator used , Dereference before null check , String not null terminated
			(Mahesh Hegde)
- 0001264:	[ Coverity : /src/actions.cpp ] Unchecked return value from library , Logically dead code , Not restoring ostream format
			(Mahesh Hegde)
- 0001263:	[ Coverity : 1396730 Uninitialized scalar field ] /include/exiv2/xmp.hpp
			(Mahesh Hegde)
- 0001262:	[ Coverity : XMPSDK Errors ] Unused value , Explicit null dereferenced
			(Mahesh Hegde)
- 0001261:	[ Coverity : 1296083 Resource leak ] /src/exiv2.cpp
			(Mahesh Hegde)
- 0001260:	[ Coverity : 1296084 Resource leak ] /src/http.cpp
			(Mahesh Hegde)
- 0001259:	[ Coverity : 1396717 Out-of-bounds read ] /src/easyaccess.cpp
			(Mahesh Hegde)
- 0001258:	[ Coverity 1396718 Out-of-bounds access ] /src/webpimage.cpp
			(Mahesh Hegde)
- 0001257:	[ Coverity 1396719 Resource leak ] /src/tiffcomposite.cpp
			(Mahesh Hegde)
- 0001256:	[ Coverity 1396721 : /src/basicio.cpp ]  String not null terminated
			(Mahesh Hegde)
- 0000883:	Use Coverity SCAN on exiv2 code-base
			(Mahesh Hegde)

* Camera: (1)
- 0001352:	Support camera Canon M100
			(Daniel Zucchetto)

* Duplicate: (1)
- 0001307:	exiv2: tiffvisitor.cpp:1299: virtual void Exiv2::Internal::TiffReader::visitDirectory(Exiv2::Internal::TiffDirectory*): Assertion `tc.get()' failed.
			(Henri Salo)

* Exif: (6)
- 0001320:	It is a heap-buffer-overflow in Exiv2::Jp2Image::readMetadata (jp2image.cpp:277)
			(Zhu Liu)
- 0001319:	It is a heap-buffer-overflow in Exiv2::us2Data (types.cpp:346)
			(Zhu Liu)
- 0001318:	Invalid memory address dereference in Exiv2::StringValueBase::read ( in value.cpp:302)
			(Zhu Liu)
- 0001317:	It is a heap-buffer-overflow in Exiv2::s2Data (types.cpp:383)
			(Zhu Liu)
- 0001316:	It is a heap-buffer-overflow in Exiv2::l2Data (types.cpp:398)
			(Zhu Liu)
- 0001315:	Invalid memory address dereference in Exiv2::DataValue::read (value.cpp:193)
			(Zhu Liu)

* Insufficient information: (1)
- 0001347:	Segfault in Digikam when saving/loading certain TIFF images
			(V Engmark)

* Image format: (5)
- 0001353:	Segmentation fault in the software exiv2 when the function Exiv2::tEXtToDataBuf() is finished
			(chung-yi lin)
- 0001346:	Assertion failure in Exiv2::Internal::CiffComponent::doRead() in libexiv2
			(Sanjay Rawat)
- 0001345:	Assertion Failure (SIGABRT) in Exiv2:RafImage::readMetadata() in Libexiv2
			(Sanjay Rawat)
- 0001338:	Exiv2 aborted (crashed) with "Error in `exiv2': free(): invalid next size (fast)"
			(Sanjay Rawat)
- 0001334:	Version 0.26 is returns unwanted data when the key value is received from RW2 files (Panasonic DMC-GF6 camera)
			(Alex Stepanov)

* Lens: (20)
- 0001373:	Tamron SP 24-70mm F/2.8 Di VC USD not recognized properly
			(Achim Kilchert)
- 0001372:	The lens "Tamron AF 18-200mm F3.5-6.3 XR Di II"  is wrongly identified.
			(Julian Hofer)
- 0001370:	Add entry for new(ish) lens - Tamron 10-24mm F/3.5-4.5 Di II VC HLD (B023)
			(Robert Sleator)
- 0001366:	Feature Request Sigma 85mm f/1.4 DG Art Series
			(Christian Fandel)
- 0001365:	Feature Request fr Sigma 135mm f/1.8 DG Art Series
			(Christian Fandel)
- 0001361:	Wrongly identified Canon 2x extender as 1.4x extender with Tamron lens
			(Simon Harhues)
- 0001355:	New lens Tamron 100-400mm F/4.5-6.3 Di VC USD
			(Christian Touzé)
- 0001351:	Add lens: Sigma 120-300mm f/2.8 G VR
			(Nikolai Försterling)
- 0001348:	patch: add Tamron SP AF 150-600mm F/5-6.3 VC USD G2 (A022) for Nikon
			(Mike Romanov)
- 0001339:	Panasonic DMC-TZ70 lens not detected
			(Tim Stahel)
- 0001336:	Support for AF-P DX NIKKOR 10-20mm f/4.5-5.6G VR
			(Šarūnas Burdulis)
- 0001335:	Missing Nikon lense
			(Niels Hansen)
- 0001333:	New Lens: Tamron SP 24-70mm F/2.8 Di VC USD G2 (A032)
			(LP Tech)
- 0001332:	Recognise Tamron 18-200mm F/3.5-6.3 DiII VC B018 on Canon bodies
			(Šarūnas Burdulis)
- 0001328:	Sigma 18-300mm is wrongly reported as a Canon 75-300mm
			(Jean-Luc Jean-Luc Coulon)
- 0001327:	Two Sigma 24-70mm f/2.8 IF EX DG HSM lens definitions ??
			(Philippe Dussart-Desart)
- 0001326:	Tamron 100-300mm f/5-6.3 MACRO 1:4
			(Albert Jasinski)
- 0001323:	Add lens "Sigma 18-300mm f/3.5-6.3 DC Macro OS HS" for Canon ID 197
			(Ronny Heidenreich)
- 0001306:	the lens TAMRON SP 15-30mm F/2.8 Di VC USD A012 is not properly recognised
			(rene ernenwein)
- 0001304:	Lens missing Tamron SP 90mm f/2.8 Di Macro 1:1 VC USD F017
			(Matze G)

* Miscellaneous: (2)
- 0001314:	it is a stack-overflow vulnerability in Exiv2::Internal::stringFormat[abi:cxx11] ( in image.cpp:975 )
			(Zhu Liu)
- 0001305:	Segmentation fault on certain image
			(Oleg Antonyan)

* Makernote: (2)
- 0001343:	Irix 15mm f/2.4 on Nikon
			(Ben Perston)
- 0001324:	Pentax Makernote written twice
			(Dominique Nerriec)

* Metadata: (7)
- 0001341:	Date/Time Original not modified for NEFs
			(Jean-Luc CECCOLI)
- 0001340:	Infinite loop bugs in Libexiv2 Exiv2::Image::printIFDStructure()
			(Sanjay Rawat)
- 0001325:	Crash in exiv2  - Nikon1MakerNote::printBarValue (nikonnm.cpp)
			(Thibaud Mouton)
- 0001322:	Exception in PentaxMakerNote::printShutterCount, source: pentaxmn.cpp
			(Norbert Wagner)
- 0001321:	Invalid memory address dereference in Exiv2::getULong(types.cpp:246)
			(Zhu Liu)
- 0001301:	New lens: Sigma 18-35mm f/1.8 DC HSM Art for Canon
			(Alexander Steffen)
- 0001300:	New lens: Canon EF-S 35mm f/2.8 Macro IS STM
			(Alexander Steffen)

* Not-a-bug: (8)
- 0001369:	New lens Yongnuo 50mm f/1.8 II for Canon
			(Michal Fapso)
- 0001368:	Canon EF-M 15-45 broken LensType
			(Peter Wemmert)
- 0001367:	New Lens Sigma 100-400 mm, F5-6.3 DG for Nikon
			(Thomas G)
- 0001364:	New lens Tamron SP 24-70mm F/2.8 Di VC USD G2
			(Mikko Pantsar)
- 0001350:	Add lens: AF-S DX Nikkor 18-140mm
			(Nikolai Försterling)
- 0001349:	Add lens: Sigma 50-100mm F1.8 DC HSM | A
			(Nikolai Försterling)
- 0001344:	Unknown metadata
			(luv zeng)
- 0001331:	exiv2 fails to delete bulk of metadata in jpeg
			(Denis-Carl Robidoux)

* Tools: (1)
- 0001303:	#1 Use 'releases' feature on GitHub

* Tiff parser: (3)
- 0001360:	exiv2 can't read metadata from tiff file (tiff directory length is too large)
			(T Modes)
- 0001359:	This does not look like a TIFF image
			(jaeho jung)
- 0001330:	Crash in Exiv2::TiffImage::readMetadata
			(Tobias E.)

* Video: (2)
- 0001068:	Video Code Umbrella
- 0001028:	Add GSoC13 video-write code

* Website: (3)
- 0001308:	Move directory /website to svn://dev.exiv2.org/svn/team/website
- 0001302:	Use sha256 Checksums on Downloads and Archive pages of the web site.
- 0001288:	site defaults to http://, and https:// certificate is bogus
			(Matthias Andree)

* Xmp: (3)
- 0001354:	Inconsistency with long XMP namespaces (e.g. 'Iptc4xmpExt')
			(Jens Georg)
- 0001278:	XMP SDK Split
			(Ben Touchette)
- 0000941:	Upgrade xmpsdk source to Adobe's current version
  • Loading branch information
alarixnia committed Jul 15, 2019
1 parent cbf0ea1 commit 216f1ff
Show file tree
Hide file tree
Showing 20 changed files with 109 additions and 268 deletions.
2 changes: 0 additions & 2 deletions graphics/exiv2-organize/DESCR

This file was deleted.

21 changes: 0 additions & 21 deletions graphics/exiv2-organize/Makefile

This file was deleted.

2 changes: 0 additions & 2 deletions graphics/exiv2-organize/PLIST

This file was deleted.

28 changes: 22 additions & 6 deletions graphics/exiv2/Makefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,32 @@
# $NetBSD: Makefile,v 1.40 2019/02/23 09:00:25 tnn Exp $
# $NetBSD: Makefile,v 1.41 2019/07/15 22:07:08 nia Exp $

.include "Makefile.common"
VER= 0.27.1
DISTNAME= exiv2-${VER}-Source
PKGNAME= ${DISTNAME:S/-Source//}
CATEGORIES= graphics
MASTER_SITES= https://www.exiv2.org/builds/

MAINTAINER= [email protected]
HOMEPAGE= https://www.exiv2.org/
COMMENT= Image metadata manipulation
LICENSE= gnu-gpl-v2

USE_CMAKE= yes
USE_TOOLS+= msgfmt
USE_LANGUAGES= c c++
GCC_REQD+= 3.3

CMAKE_ARGS+= -DEXIV2_BUILD_SAMPLES:BOOL=OFF

LDFLAGS.Linux+= -ldl
LDFLAGS.SunOS+= -lsocket -lnsl

USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE= config/exiv2.pc.in

LDFLAGS.Linux+= -ldl
LIBS.SunOS+= -lsocket -lnsl

.include "../../mk/pthread.buildlink3.mk"
.include "../../converters/libiconv/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../textproc/expat/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
33 changes: 0 additions & 33 deletions graphics/exiv2/Makefile.common

This file was deleted.

39 changes: 18 additions & 21 deletions graphics/exiv2/PLIST
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
@comment $NetBSD: PLIST,v 1.18 2018/02/01 16:45:57 he Exp $
@comment $NetBSD: PLIST,v 1.19 2019/07/15 22:07:08 nia Exp $
bin/exiv2
include/exiv2/asfvideo.hpp
include/exiv2/basicio.hpp
include/exiv2/bigtiffimage.hpp
include/exiv2/bmpimage.hpp
include/exiv2/config.h
include/exiv2/convert.hpp
Expand All @@ -12,8 +14,8 @@ include/exiv2/epsimage.hpp
include/exiv2/error.hpp
include/exiv2/exif.hpp
include/exiv2/exiv2.hpp
include/exiv2/exiv2lib_export.h
include/exiv2/exv_conf.h
include/exiv2/exv_msvc.h
include/exiv2/futils.hpp
include/exiv2/gifimage.hpp
include/exiv2/http.hpp
Expand All @@ -22,6 +24,7 @@ include/exiv2/ini.hpp
include/exiv2/iptc.hpp
include/exiv2/jp2image.hpp
include/exiv2/jpgimage.hpp
include/exiv2/matroskavideo.hpp
include/exiv2/metadatum.hpp
include/exiv2/mrwimage.hpp
include/exiv2/orfimage.hpp
Expand All @@ -30,35 +33,29 @@ include/exiv2/pngimage.hpp
include/exiv2/preview.hpp
include/exiv2/properties.hpp
include/exiv2/psdimage.hpp
include/exiv2/quicktimevideo.hpp
include/exiv2/rafimage.hpp
include/exiv2/riffvideo.hpp
include/exiv2/rw2image.hpp
include/exiv2/rwlock.hpp
include/exiv2/svn_version.h
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
include/exiv2/xmp.hpp
include/exiv2/xmp_exiv2.hpp
include/exiv2/xmpsidecar.hpp
lib/libexiv2.la
lib/exiv2/cmake/exiv2Config-noconfig.cmake
lib/exiv2/cmake/exiv2Config.cmake
lib/exiv2/cmake/exiv2ConfigVersion.cmake
lib/libexiv2-xmp.a
lib/libexiv2.so
lib/libexiv2.so.${PKGVERSION}
lib/libexiv2.so.27
lib/pkgconfig/exiv2.pc
man/man1/exiv2.1
man/man1/exiv2samples.1
share/locale/bs/LC_MESSAGES/exiv2.mo
share/locale/de/LC_MESSAGES/exiv2.mo
share/locale/es/LC_MESSAGES/exiv2.mo
share/locale/fi/LC_MESSAGES/exiv2.mo
share/locale/fr/LC_MESSAGES/exiv2.mo
share/locale/gl/LC_MESSAGES/exiv2.mo
share/locale/ms/LC_MESSAGES/exiv2.mo
share/locale/pl/LC_MESSAGES/exiv2.mo
share/locale/pt/LC_MESSAGES/exiv2.mo
share/locale/ru/LC_MESSAGES/exiv2.mo
share/locale/sk/LC_MESSAGES/exiv2.mo
share/locale/sv/LC_MESSAGES/exiv2.mo
share/locale/ug/LC_MESSAGES/exiv2.mo
share/locale/uk/LC_MESSAGES/exiv2.mo
share/locale/vi/LC_MESSAGES/exiv2.mo
6 changes: 3 additions & 3 deletions graphics/exiv2/buildlink3.mk
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# $NetBSD: buildlink3.mk,v 1.17 2018/12/05 10:04:15 bsiegert Exp $
# $NetBSD: buildlink3.mk,v 1.18 2019/07/15 22:07:08 nia Exp $

BUILDLINK_TREE+= exiv2

.if !defined(EXIV2_BUILDLINK3_MK)
EXIV2_BUILDLINK3_MK:=

BUILDLINK_API_DEPENDS.exiv2+= exiv2>=0.26
BUILDLINK_ABI_DEPENDS.exiv2+= exiv2>=0.26
BUILDLINK_API_DEPENDS.exiv2+= exiv2>=0.27
BUILDLINK_ABI_DEPENDS.exiv2+= exiv2>=0.27
BUILDLINK_PKGSRCDIR.exiv2?= ../../graphics/exiv2

.include "../../devel/gettext-lib/buildlink3.mk"
Expand Down
16 changes: 6 additions & 10 deletions graphics/exiv2/distinfo
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
$NetBSD: distinfo,v 1.29 2018/02/01 16:45:57 he Exp $
$NetBSD: distinfo,v 1.30 2019/07/15 22:07:08 nia Exp $

SHA1 (exiv2-0.26-trunk.tar.gz) = e68404958ebfbee39354f5aaaa895ac6abf127a2
RMD160 (exiv2-0.26-trunk.tar.gz) = 5cec04536df26797c56eceef7ac8d5937b811473
SHA512 (exiv2-0.26-trunk.tar.gz) = d1e9cab886e279b045768dd9ec781f07d2d36d573119403d0b76dc571442173aae6972f86ec55c3ea53fb3ee9ca3571eb8fd63a2a6643a970852813e88634a86
Size (exiv2-0.26-trunk.tar.gz) = 5677925 bytes
SHA1 (patch-aa) = 947061d168d5db0d9969fa91ef837b364c641fcb
SHA1 (exiv2-0.27.1-Source.tar.gz) = e80a4d879a1831a855fc6ef980d3212b1ca8e945
RMD160 (exiv2-0.27.1-Source.tar.gz) = fec35a92361c701d98ee14d13166548fa31f07a3
SHA512 (exiv2-0.27.1-Source.tar.gz) = 038b51241f5bfb323eb298695b5397a7d88d5c7d7303828e5e20b3f82c3df2615cee3e7e3426ea17438ca05d5abea10984cfd41f0649ddab72df1d1415bf3529
Size (exiv2-0.27.1-Source.tar.gz) = 27210365 bytes
SHA1 (patch-contrib_organize_Makefile) = 27348fdb0f80092b6e16f27e3ac1dca988eefe70
SHA1 (patch-contrib_organize_helpers.cpp) = ec003c826d463b3e7e571ab4c41baffaca1240e9
SHA1 (patch-include_exiv2_types.hpp) = 829e101c1c5f06de0a497b8c6a052b0a4e667d25
SHA1 (patch-src_Makefile) = d0f145ac851eed22ff3a7ad263fac0af42fd1318
SHA1 (patch-src_actions.cpp) = b796cafb028eb921803617a617344a81e9124bb6
SHA1 (patch-src_http.cpp) = 75a64b80c37c54c0f65cc8455bd730ae01df0bae
SHA1 (patch-src_svn_version.sh) = 41ac5ce78b6b7e78c489ab9ffeaa953e93299e5e
SHA1 (patch-src_convert.cpp) = f97eb7ae6c6a23a38451618e484287f899058c86
15 changes: 0 additions & 15 deletions graphics/exiv2/patches/patch-aa

This file was deleted.

25 changes: 0 additions & 25 deletions graphics/exiv2/patches/patch-src_Makefile

This file was deleted.

21 changes: 0 additions & 21 deletions graphics/exiv2/patches/patch-src_actions.cpp

This file was deleted.

26 changes: 26 additions & 0 deletions graphics/exiv2/patches/patch-src_convert.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
$NetBSD: patch-src_convert.cpp,v 1.1 2019/07/15 22:07:08 nia Exp $

Support NetBSD and SunOS iconv being special.

--- src/convert.cpp.orig 2019-04-26 09:31:16.000000000 +0000
+++ src/convert.cpp
@@ -1545,11 +1545,19 @@ namespace {
char outbuf[256];
char* outptr = outbuf;
size_t outbytesleft = sizeof(outbuf);
+#if defined(__NetBSD__) || 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
18 changes: 0 additions & 18 deletions graphics/exiv2/patches/patch-src_http.cpp

This file was deleted.

21 changes: 0 additions & 21 deletions graphics/exiv2/patches/patch-src_svn_version.sh

This file was deleted.

27 changes: 19 additions & 8 deletions graphics/gexiv2/Makefile
Original file line number Diff line number Diff line change
@@ -1,24 +1,35 @@
# $NetBSD: Makefile,v 1.3 2018/05/14 10:48:57 jperkin Exp $
# $NetBSD: Makefile,v 1.4 2019/07/15 22:07:08 nia Exp $

DISTNAME= gexiv2-0.10.8
DISTNAME= gexiv2-0.12.0
CATEGORIES= graphics devel
MASTER_SITES= http://ftp.acc.umu.se/pub/gnome/sources/gexiv2/0.10/
MASTER_SITES= https://ftp.acc.umu.se/pub/gnome/sources/gexiv2/0.12/
EXTRACT_SUFX= .tar.xz

MAINTAINER= [email protected]
HOMEPAGE= https://wiki.gnome.org/Projects/gexiv2
COMMENT= GObject-based wrapper around the Exiv2 library
LICENSE= gnu-gpl-v2

USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= gmake m4 pkg-config bash
GNU_CONFIGURE= yes
# uses std::auto_ptr, deprecated in c++11
USE_LANGUAGES= c c++03
USE_TOOLS+= pkg-config

PKGCONFIG_OVERRIDE= gexiv2.m4
# workaround for build failure
# https://gitlab.gnome.org/GNOME/json-glib/issues/35
MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/gexiv2

MESON_ARGS+= -Dpython2_girdir=no
MESON_ARGS+= -Dpython3_girdir=no

BUILD_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test

PKGCONFIG_OVERRIDE= gexiv2.pc.in

BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=./gexiv2/gexiv2.map

.include "../../devel/py-meson/build.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/gobject-introspection/buildlink3.mk"
.include "../../graphics/exiv2/buildlink3.mk"
.include "../../lang/vala/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Loading

0 comments on commit 216f1ff

Please sign in to comment.