Attachment #205558 for bug #239028

View | Details | Raw Unified | Return to bug 239028
Collapse All | Expand All




--- exif-gps.cpp.orig	2019-07-07 08:26:16 UTC
+++ exif-gps.cpp
@@ -40,9 +40,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-
-#include "exiv2/image.hpp"
-#include "exiv2/exif.hpp"
+#include <exiv2/exiv2.hpp>
 
 #include "gpsstructure.h"
 #include "exif-gps.h"

Lines 6-12 Date: Mon Jul 27 14:22:37 2015 +0200 Link Here

(-)astro/merkaartor/files/patch-git_e6d015a9 (-5 / +8 lines)
6		6
7	--- src/Docks/GeoImageDock.cpp.orig 2015-07-19 14:50:09 UTC	7	--- src/Docks/GeoImageDock.cpp.orig 2015-07-19 14:50:09 UTC
8	+++ src/Docks/GeoImageDock.cpp	8	+++ src/Docks/GeoImageDock.cpp
9	@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringLis	9	@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringList fileNames)
10		10
11	Exiv2::Image::AutoPtr image;	11	Exiv2::Image::AutoPtr image;
12	Exiv2::ExifData exifData;	12	Exiv2::ExifData exifData;
Lines 15-21 Date: Mon Jul 27 14:22:37 2015 +0200 Link Here
15		15
16	Layer *theLayer;	16	Layer *theLayer;
17	if (photoLayer == NULL) {	17	if (photoLayer == NULL) {
18	@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage(	18	@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString
19	double lat = 0.0, lon = 0.0;	19	double lat = 0.0, lon = 0.0;
20	Exiv2::Image::AutoPtr image;	20	Exiv2::Image::AutoPtr image;
21	Exiv2::ExifData exifData;	21	Exiv2::ExifData exifData;
Lines 26-35 Date: Mon Jul 27 14:22:37 2015 +0200 Link Here
26	return pos;	26	return pos;
27	--- src/Docks/GeoImageDock.h.orig 2015-07-19 14:50:09 UTC	27	--- src/Docks/GeoImageDock.h.orig 2015-07-19 14:50:09 UTC
28	+++ src/Docks/GeoImageDock.h	28	+++ src/Docks/GeoImageDock.h
29	@@ -9,6 +9,7 @@	29	@@ -7,8 +7,8 @@
		30	#include <QtWidgets/QDockWidget>
		31	#include <QtGui/QMouseEvent>
30	#include <QtWidgets/QShortcut>	32	#include <QtWidgets/QShortcut>
31	#include <exiv2/image.hpp>	33	-#include <exiv2/image.hpp>
32	#include <exiv2/exif.hpp>	34	-#include <exiv2/exif.hpp>
		35	+#include <exiv2/exiv2.hpp>
33	+#include <QDrag>	36	+#include <QDrag>
34		37
35	class ImageView;	38	class ImageView;

Lines 2-10 Link Here

(-)graphics/exiv2/Makefile (-3 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= exiv2	4	PORTNAME= exiv2
5	DISTVERSION= 0.27.0	5	DISTVERSION= 0.27.1
6	DISTVERSIONSUFFIX= a-Source	6	DISTVERSIONSUFFIX= -Source
7	PORTREVISION= 1
8	PORTEPOCH= 1	7	PORTEPOCH= 1
9	CATEGORIES= graphics	8	CATEGORIES= graphics
10	MASTER_SITES= http://www.exiv2.org/builds/	9	MASTER_SITES= http://www.exiv2.org/builds/

Lines 1-3 Link Here

(-)graphics/exiv2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1550640374	1	TIMESTAMP = 1557685573
2	SHA256 (exiv2-0.27.0a-Source.tar.gz) = a4adfa7aaf295b0383adead476f8e0493b9d6c6c7570d5884d2ebf8a2871902f	2	SHA256 (exiv2-0.27.1-Source.tar.gz) = f125286980fd1bcb28e188c02a93946951c61e10784720be2301b661a65b3081
3	SIZE (exiv2-0.27.0a-Source.tar.gz) = 27168207	3	SIZE (exiv2-0.27.1-Source.tar.gz) = 27210365




Slightly modified:

From 04c9b181cc2c7741fcb134ccc43f2bafc1f86f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
Date: Sat, 12 Jan 2019 12:15:27 +0000
Subject: [PATCH] Fix #644. Export specializations of BasicError

- Only export BasicError::setMsg which is the only implementation present in the .cpp
- Only export BasicError specialization on __APPLE__

It seems that gcc automatically adds the attribute when the visibility
settings are set to hidden. See this link for more information:
https://reviews.llvm.org/D35388
---
 cmake/mainSetup.cmake   | 6 ++++--
 include/exiv2/error.hpp | 3 ++-
 src/error.cpp           | 6 ++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/cmake/mainSetup.cmake b/cmake/mainSetup.cmake
index 05c16004d..a4d983d4c 100644
--- cmake/mainSetup.cmake
+++ cmake/mainSetup.cmake
@@ -13,8 +13,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 
-set(CMAKE_CXX_VISIBILITY_PRESET hidden)
-set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+    set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
+endif()
 
 set(CMAKE_CXX_STANDARD 98)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/include/exiv2/error.hpp b/include/exiv2/error.hpp
index 0f9714e5b..42a0959c4 100644
--- include/exiv2/error.hpp
+++ include/exiv2/error.hpp
@@ -315,7 +315,7 @@ namespace Exiv2 {
         std::basic_string<charT> arg3_;         //!< Third argument
         std::string              msg_;          //!< Complete error message
 #ifdef EXV_UNICODE_PATH
-    std::wstring             wmsg_;         //!< Complete error message as a wide string
+        std::wstring             wmsg_;         //!< Complete error message as a wide string
 #endif
     }; // class BasicError
 
@@ -389,6 +389,7 @@ namespace Exiv2 {
         return wmsg_.c_str();
     }
 #endif
+
 #ifdef _MSC_VER
 # pragma warning( default : 4275 )
 #endif
diff --git a/src/error.cpp b/src/error.cpp
index 6d3a24bd8..c8e2d9e0d 100644
--- src/error.cpp
+++ src/error.cpp
@@ -224,7 +224,6 @@ namespace Exiv2 {
     {
     }
 
-    //! @cond IGNORE
     template<>
     void BasicError<char>::setMsg()
     {
@@ -257,7 +256,9 @@ namespace Exiv2 {
         wmsg_ = s2ws(msg);
 #endif
     }
-    //! @endcond
+#ifdef __FreeBSD__ 
+    template class EXIV2API BasicError<char>;
+#endif
 
 #ifdef EXV_UNICODE_PATH
     template<>
@@ -291,6 +292,7 @@ namespace Exiv2 {
         wmsg_ = wmsg;
         msg_ = ws2s(wmsg);
     }
+    template class EXIV2API BasicError<wchar_t>;
 #endif
 
     const char* errMsg(int code)




include/exiv2/webpimage.hpp
include/exiv2/xmp_exiv2.hpp
include/exiv2/xmpsidecar.hpp
lib/exiv2/cmake/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake
lib/exiv2/cmake/exiv2Config.cmake
lib/exiv2/cmake/exiv2ConfigVersion.cmake
lib/libexiv2.so
lib/libexiv2.so.0.27.1
lib/libexiv2.so.27
lib/libexiv2-xmp.a
libdata/pkgconfig/exiv2.pc
man/man1/exiv2.1.gz
%%SAMPLE%%man/man1/exiv2samples.1.gz
%%DATADIR%%/cmake/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake
%%DATADIR%%/cmake/exiv2Config.cmake
share/locale/bs/LC_MESSAGES/exiv2.mo
share/locale/ca/LC_MESSAGES/exiv2.mo
share/locale/de/LC_MESSAGES/exiv2.mo

Lines 45-54 UNIQUE_SUFFIX= -${GEGL_VER} Link Here

(-)graphics/gegl/Makefile (-5 / +4 lines)
45	UNIQUE_SUFFIX_FILES= bin/gcut	45	UNIQUE_SUFFIX_FILES= bin/gcut
46		46
47	OPTIONS_SUB= yes	47	OPTIONS_SUB= yes
48	OPTIONS_DEFINE= CAIRO ENSCRIPT EXIV2 FFMPEG PIXBUF GRAPHVIZ JASPER \	48	OPTIONS_DEFINE= CAIRO ENSCRIPT FFMPEG PIXBUF GRAPHVIZ JASPER \
49	LUA OPENEXR RAW PANGO POPPLER LIBRSVG2 SDL SPIRO V4L \	49	LUA OPENEXR RAW PANGO POPPLER LIBRSVG2 SDL SPIRO V4L \
50	EXAMPLES LCMS2 WEBP TIFF GEXIV2	50	EXAMPLES LCMS2 WEBP TIFF GEXIV2
51	OPTIONS_DEFAULT=CAIRO ENSCRIPT EXIV2 PIXBUF GRAPHVIZ JASPER LCMS2 LUA \	51	OPTIONS_DEFAULT=CAIRO ENSCRIPT GEXIV2 PIXBUF GRAPHVIZ JASPER LCMS2 LUA \
52	OPENEXR RAW PANGO POPPLER LIBRSVG2 SDL SPIRO V4L WEBP TIFF	52	OPENEXR RAW PANGO POPPLER LIBRSVG2 SDL SPIRO V4L WEBP TIFF
53		53
54	ENSCRIPT_DESC= Enscript support	54	ENSCRIPT_DESC= Enscript support
Lines 116-124 WEBP_CONFIGURE_WITH= webp Link Here
116	#UMFPACK_CONFIGURE_WITH= umfpack	116	#UMFPACK_CONFIGURE_WITH= umfpack
117	CONFIGURE_ARGS+= --without-umfpack	117	CONFIGURE_ARGS+= --without-umfpack
118		118
119	EXIV2_LIB_DEPENDS= libexiv2.so:graphics/exiv2
120	EXIV2_CONFIGURE_WITH= exiv2
121
122	GEXIV2_LIB_DEPENDS= libgexiv2.so:graphics/gexiv2	119	GEXIV2_LIB_DEPENDS= libgexiv2.so:graphics/gexiv2
123	GEXIV2_CONFIGURE_WITH= gexiv2	120	GEXIV2_CONFIGURE_WITH= gexiv2
124		121
Lines 138-143 post-patch: Link Here
138	${REINPLACE_CMD} -e "s/lua >/lua-${LUA_VER} >/g" \	135	${REINPLACE_CMD} -e "s/lua >/lua-${LUA_VER} >/g" \
139	-e 's\|$lua$$5\.1$\|\1-\2\|g ; s\|x86_64\|amd64\|g' \	136	-e 's\|$lua$$5\.1$\|\1-\2\|g ; s\|x86_64\|amd64\|g' \
140	${WRKSRC}/configure	137	${WRKSRC}/configure
		138	${REINPLACE_CMD} -e '/exp_combine/s\|EXIV2\|GEXIV2\|g' \
		139	${WRKSRC}/tools/Makefile.in
141		140
142	post-patch-EXAMPLES-off:	141	post-patch-EXAMPLES-off:
143	${REINPLACE_CMD} -e 's\|tools examples\|tools\|g' \	142	${REINPLACE_CMD} -e 's\|tools examples\|tools\|g' \




From 0703b6b38f4e6cf8ecc623c09c05ef73c6424ee4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= <pippin@gimp.org>
Date: Tue, 12 Mar 2019 21:58:13 +0100
Subject: [PATCH] tools: port exp_combine to use gexiv2 instead of exiv2
 directly

We already rely on gexiv2, and recent updates of exiv2 broke API this
commandline tool was reliant on.
---
 tools/Makefile.am     |  6 +++---
 tools/exp_combine.cpp | 42 +++++++++++++++++++-----------------------
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/tools/exp_combine.cpp b/tools/exp_combine.cpp
index 6b772d35a..c74f81cf6 100644
--- tools/exp_combine.cpp
+++ tools/exp_combine.cpp
@@ -8,8 +8,7 @@
 
 #include <iostream>
 
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <gexiv2/gexiv2.h>
 
 using namespace std;
 
@@ -54,35 +53,32 @@ die:
 static gfloat
 expcombine_get_file_ev (const gchar *path)
 {
-  /* Open the file and read in the metadata */
-  Exiv2::Image::AutoPtr image;
-  try 
-    {
-      image = Exiv2::ImageFactory::open (path);
-      image->readMetadata ();
-    }
-  catch (Exiv2::Error ex)
-    {
-      g_print ("Error: unable to read metadata from path: '%s'\n", path);
-      exit (EXIT_FAILURE);
-    }
+  GError *error = NULL;
+  GExiv2Metadata *e2m = gexiv2_metadata_new ();
+  gfloat time, aperture, gain = 1.0f;
 
-  Exiv2::ExifData &exifData = image->exifData ();
-  if (exifData.empty ())
-      return NAN;
+  gexiv2_metadata_open_path (e2m, path, &error);
+  if (error)
+  {
+    g_warning ("%s", error->message);
+    exit (EXIT_FAILURE);
+  }
 
   /* Calculate the APEX brightness / EV */
-  gfloat time, aperture, gain = 1.0f;
 
-  time     = exifData["Exif.Photo.ExposureTime"].value().toFloat();
-  aperture = exifData["Exif.Photo.FNumber"     ].value().toFloat();
+  {
+    gint nom, den;
+    gexiv2_metadata_get_exposure_time (e2m, &nom, &den);
+    time = nom * 1.0f / den;
+  }
+  aperture = gexiv2_metadata_get_fnumber (e2m);
 
   /* iso */
-  try
+  if (gexiv2_metadata_has_tag (e2m, "Exif.Image.ISOSpeedRatings"))
     {
-      gain = exifData["Exif.Photo.ISOSpeedRatings"].value().toLong() / 100.0f;
+      gain = gexiv2_metadata_get_iso_speed (e2m) / 100.0f;
     }
-  catch (Exiv2::Error ex)
+  else
     {
       // Assume ISO is set at 100. It's reasonably likely that the ISO is the
       // same across all images anyway, and for our purposes the relative
-- 
2.21.0





--- src/gimplensfun.cpp.orig	2019-07-07 08:42:51 UTC
+++ src/gimplensfun.cpp
@@ -37,8 +37,7 @@ CHANGES:
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
 
 #define VERSIONSTR "0.2.4-dev"
 




--- src/hugin1/hugin/RawImport.cpp.orig	2019-07-07 08:40:09 UTC
+++ src/hugin1/hugin/RawImport.cpp
@@ -35,10 +35,7 @@
 // workaround for a conflict between exiv2 and wxWidgets/CMake built
 #define HAVE_PID_T 1
 #endif
-#include <exiv2/exif.hpp>
-#include <exiv2/image.hpp>
-#include <exiv2/easyaccess.hpp>
-#include <exiv2/xmpsidecar.hpp>
+#include <exiv2/exiv2.hpp>
 #ifdef __WXMSW__
 #include <wx/msw/registry.h>
 #endif




--- src/hugin_base/panodata/SrcPanoImage.cpp.orig	2019-07-07 08:31:01 UTC
+++ src/hugin_base/panodata/SrcPanoImage.cpp
@@ -40,9 +40,7 @@
 #include <vigra/diff2d.hxx>
 #include <vigra/imageinfo.hxx>
 #include <hugin_utils/utils.h>
-#include <exiv2/exif.hpp>
-#include <exiv2/image.hpp>
-#include <exiv2/easyaccess.hpp>
+#include <exiv2/exiv2.hpp>
 #include <lensdb/LensDB.h>
 #include "Exiv2Helper.h"
 

Added Link Here

(-)graphics/luminance-qt5/files/patch-src_Exif_ExifOperations.cpp (+11 lines)
1	--- src/Exif/ExifOperations.cpp.orig 2019-07-07 08:28:28 UTC
2	+++ src/Exif/ExifOperations.cpp
3	@@ -34,7 +34,7 @@
4
5	#include <boost/assign/list_of.hpp>
6
7	-#include <exif.hpp>
8	+#include <exiv2/exiv2.hpp>
9	#include <image.hpp>
10
11	#include "ExifOperations.h"

Lines 1-6 Link Here

(-)graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp (-2 / +10 lines)
1	--- src/DkCore/DkMetaData.cpp.orig 2019-03-08 21:53:21 UTC	1	--- src/DkCore/DkMetaData.cpp.orig 2019-07-07 07:58:56 UTC
2	+++ src/DkCore/DkMetaData.cpp	2	+++ src/DkCore/DkMetaData.cpp
3	@@ -1262,7 +1262,7 @@ void DkMetaDataT::printMetaData() const {	3	@@ -40,6 +40,7 @@
		4	#include <QVector2D>
		5	#include <QApplication>
		6	#pragma warning(pop) // no warnings from includes - end
		7	+#include <iostream>
		8
		9	namespace nmc {
		10
		11	@@ -1262,7 +1263,7 @@ void DkMetaDataT::printMetaData() const {
4		12
5	std::string xmpPacket;	13	std::string xmpPacket;
6	if (0 != Exiv2::XmpParser::encode(xmpPacket, xmpData)) {	14	if (0 != Exiv2::XmpParser::encode(xmpPacket, xmpData)) {

Added Link Here

(-)graphics/photivo/files/patch-Sources_ptImageHelper.cpp (+10 lines)
1	--- Sources/ptImageHelper.cpp.orig 2019-07-07 08:34:52 UTC
2	+++ Sources/ptImageHelper.cpp
3	@@ -34,6 +34,7 @@
4	#pragma GCC diagnostic pop
5	#include <wand/magick_wand.h>
6
7	+#include <iostream>
8	#include <vector>
9	#include <QStringList>
10




--- cplusplus/scripts/getanddostuff/manipulation.h.orig	2019-07-07 08:24:57 UTC
+++ cplusplus/scripts/getanddostuff/manipulation.h
@@ -37,8 +37,7 @@
 #include "../../logger.h"
 
 #ifdef EXIV2
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
 #endif
 
 class GetAndDoStuffManipulation : public QObject {




--- cplusplus/scripts/getmetadata.h.orig	2019-07-07 08:22:25 UTC
+++ cplusplus/scripts/getmetadata.h
@@ -34,8 +34,7 @@
 #include "../logger.h"
 
 #ifdef EXIV2
-#include <exiv2/image.hpp>
-#include <exiv2/exif.hpp>
+#include <exiv2/exiv2.hpp>
 #endif
 
 class GetMetaData : public QObject {




https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch

--- ufraw_exiv2.cc.orig	2016-11-13 04:00:05 UTC
+++ ufraw_exiv2.cc
@@ -15,9 +15,8 @@
 #include "ufraw.h"
 
 #ifdef HAVE_EXIV2
-#include <exiv2/image.hpp>
-#include <exiv2/easyaccess.hpp>
-#include <exiv2/exif.hpp>
+#include <iostream>
+#include <exiv2/exiv2.hpp>
 #include <sstream>
 #include <cassert>
 
@@ -67,7 +66,11 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf)
         if (exifData.empty()) {
             std::string error(uf->filename);
             error += ": No Exif data found in the file";

         }
 
         /* List of tag names taken from exiv2's printSummary() in actions.cpp */





--- libs/libmythmetadata/imagemetadata.cpp.orig	2019-07-07 08:48:08 UTC
+++ libs/libmythmetadata/imagemetadata.cpp
@@ -7,14 +7,7 @@
 #include "exitcodes.h"        // for ffprobe
 
 // libexiv2 for Exif metadata
-//#include <exiv2/exiv2.hpp>
-// Note: Older versions of Exiv2 don't have the exiv2.hpp include
-// file.  Using image.hpp instead seems to work.
-#ifdef _MSC_VER
-#include <exiv2/src/image.hpp>
-#else
-#include <exiv2/image.hpp>
-#endif
+#include <exiv2/exiv2.hpp>
 
 // To read FFMPEG Metadata
 extern "C" {

Lines 1-6 Link Here

(-)multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp (-3 / +11 lines)
1	--- src/image/exiv2.cpp.orig 2009-01-30 22:18:25.000000000 +0100	1	--- src/image/exiv2.cpp.orig 2009-01-30 21:18:25 UTC
2	+++ src/image/exiv2.cpp 2011-07-15 15:48:34.000000000 +0200	2	+++ src/image/exiv2.cpp
3	@@ -47,7 +47,8 @@	3	@@ -1,6 +1,5 @@
		4	#include <Python.h>
		5	-#include <exiv2/image.hpp>
		6	-#include <exiv2/exif.hpp>
		7	+#include <exiv2/exiv2.hpp>
		8
		9	PyObject parse(PyObject self, PyObject *args)
		10	{
		11	@@ -47,7 +46,8 @@ PyObject parse(PyObject self, PyObject *args)
4	Py_DECREF(entry);	12	Py_DECREF(entry);
5	}	13	}
6		14

Return to bug 239028

Added Link Here

(-)astro/gpscorrelate/files/patch-exif-gps.cpp (+13 lines)
1	--- exif-gps.cpp.orig 2019-07-07 08:26:16 UTC
2	+++ exif-gps.cpp
3	@@ -40,9 +40,7 @@
4	#include <sys/stat.h>
5	#include <unistd.h>
6
7	-
8	-#include "exiv2/image.hpp"
9	-#include "exiv2/exif.hpp"
10	+#include <exiv2/exiv2.hpp>
11
12	#include "gpsstructure.h"
13	#include "exif-gps.h"

Removed Link Here

(-)graphics/exiv2/files/patch-git_04c9b1 (-88 lines)
1	Slightly modified:
2
3	From 04c9b181cc2c7741fcb134ccc43f2bafc1f86f19 Mon Sep 17 00:00:00 2001
4	From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
5	Date: Sat, 12 Jan 2019 12:15:27 +0000
6	Subject: [PATCH] Fix #644. Export specializations of BasicError
7
8	- Only export BasicError::setMsg which is the only implementation present in the .cpp
9	- Only export BasicError specialization on __APPLE__
10
11	It seems that gcc automatically adds the attribute when the visibility
12	settings are set to hidden. See this link for more information:
13	https://reviews.llvm.org/D35388
14	---
15	cmake/mainSetup.cmake \| 6 ++++--
16	include/exiv2/error.hpp \| 3 ++-
17	src/error.cpp \| 6 ++++--
18	3 files changed, 10 insertions(+), 5 deletions(-)
19
20	diff --git a/cmake/mainSetup.cmake b/cmake/mainSetup.cmake
21	index 05c16004d..a4d983d4c 100644
22	--- cmake/mainSetup.cmake
23	+++ cmake/mainSetup.cmake
24	@@ -13,8 +13,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
25	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
26	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
27
28	-set(CMAKE_CXX_VISIBILITY_PRESET hidden)
29	-set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
30	+if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
31	+ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
32	+ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
33	+endif()
34
35	set(CMAKE_CXX_STANDARD 98)
36	set(CMAKE_CXX_STANDARD_REQUIRED ON)
37	diff --git a/include/exiv2/error.hpp b/include/exiv2/error.hpp
38	index 0f9714e5b..42a0959c4 100644
39	--- include/exiv2/error.hpp
40	+++ include/exiv2/error.hpp
41	@@ -315,7 +315,7 @@ namespace Exiv2 {
42	std::basic_string<charT> arg3_; //!< Third argument
43	std::string msg_; //!< Complete error message
44	#ifdef EXV_UNICODE_PATH
45	- std::wstring wmsg_; //!< Complete error message as a wide string
46	+ std::wstring wmsg_; //!< Complete error message as a wide string
47	#endif
48	}; // class BasicError
49
50	@@ -389,6 +389,7 @@ namespace Exiv2 {
51	return wmsg_.c_str();
52	}
53	#endif
54	+
55	#ifdef _MSC_VER
56	# pragma warning( default : 4275 )
57	#endif
58	diff --git a/src/error.cpp b/src/error.cpp
59	index 6d3a24bd8..c8e2d9e0d 100644
60	--- src/error.cpp
61	+++ src/error.cpp
62	@@ -224,7 +224,6 @@ namespace Exiv2 {
63	{
64	}
65
66	- //! @cond IGNORE
67	template<>
68	void BasicError<char>::setMsg()
69	{
70	@@ -257,7 +256,9 @@ namespace Exiv2 {
71	wmsg_ = s2ws(msg);
72	#endif
73	}
74	- //! @endcond
75	+#ifdef __FreeBSD__
76	+ template class EXIV2API BasicError<char>;
77	+#endif
78
79	#ifdef EXV_UNICODE_PATH
80	template<>
81	@@ -291,6 +292,7 @@ namespace Exiv2 {
82	wmsg_ = wmsg;
83	msg_ = ws2s(wmsg);
84	}
85	+ template class EXIV2API BasicError<wchar_t>;
86	#endif
87
88	const char* errMsg(int code)

Lines 82-96 include/exiv2/version.hpp Link Here

(-)graphics/exiv2/pkg-plist (-4 / +5 lines)
82	include/exiv2/webpimage.hpp	82	include/exiv2/webpimage.hpp
83	include/exiv2/xmp_exiv2.hpp	83	include/exiv2/xmp_exiv2.hpp
84	include/exiv2/xmpsidecar.hpp	84	include/exiv2/xmpsidecar.hpp
		85	lib/exiv2/cmake/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake
		86	lib/exiv2/cmake/exiv2Config.cmake
		87	lib/exiv2/cmake/exiv2ConfigVersion.cmake
85	lib/libexiv2.so	88	lib/libexiv2.so
86	lib/libexiv2.so.0.27.0	89	lib/libexiv2.so.0.27.1
87	lib/libexiv2.so.27	90	lib/libexiv2.so.27
88	lib/libxmp.a	91	lib/libexiv2-xmp.a
89	libdata/pkgconfig/exiv2.pc	92	libdata/pkgconfig/exiv2.pc
90	man/man1/exiv2.1.gz	93	man/man1/exiv2.1.gz
91	%%SAMPLE%%man/man1/exiv2samples.1.gz	94	%%SAMPLE%%man/man1/exiv2samples.1.gz
92	%%DATADIR%%/cmake/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake
93	%%DATADIR%%/cmake/exiv2Config.cmake
94	share/locale/bs/LC_MESSAGES/exiv2.mo	95	share/locale/bs/LC_MESSAGES/exiv2.mo
95	share/locale/ca/LC_MESSAGES/exiv2.mo	96	share/locale/ca/LC_MESSAGES/exiv2.mo
96	share/locale/de/LC_MESSAGES/exiv2.mo	97	share/locale/de/LC_MESSAGES/exiv2.mo

Added Link Here

(-)graphics/gegl/files/patch-git_0703b6 (+84 lines)
1	From 0703b6b38f4e6cf8ecc623c09c05ef73c6424ee4 Mon Sep 17 00:00:00 2001
2	From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= <pippin@gimp.org>
3	Date: Tue, 12 Mar 2019 21:58:13 +0100
4	Subject: [PATCH] tools: port exp_combine to use gexiv2 instead of exiv2
5	directly
6
7	We already rely on gexiv2, and recent updates of exiv2 broke API this
8	commandline tool was reliant on.
9	---
10	tools/Makefile.am \| 6 +++---
11	tools/exp_combine.cpp \| 42 +++++++++++++++++++-----------------------
12	2 files changed, 22 insertions(+), 26 deletions(-)
13
14	diff --git a/tools/exp_combine.cpp b/tools/exp_combine.cpp
15	index 6b772d35a..c74f81cf6 100644
16	--- tools/exp_combine.cpp
17	+++ tools/exp_combine.cpp
18	@@ -8,8 +8,7 @@
19
20	#include <iostream>
21
22	-#include <exiv2/image.hpp>
23	-#include <exiv2/exif.hpp>
24	+#include <gexiv2/gexiv2.h>
25
26	using namespace std;
27
28	@@ -54,35 +53,32 @@ die:
29	static gfloat
30	expcombine_get_file_ev (const gchar *path)
31	{
32	- /* Open the file and read in the metadata */
33	- Exiv2::Image::AutoPtr image;
34	- try
35	- {
36	- image = Exiv2::ImageFactory::open (path);
37	- image->readMetadata ();
38	- }
39	- catch (Exiv2::Error ex)
40	- {
41	- g_print ("Error: unable to read metadata from path: '%s'\n", path);
42	- exit (EXIT_FAILURE);
43	- }
44	+ GError *error = NULL;
45	+ GExiv2Metadata *e2m = gexiv2_metadata_new ();
46	+ gfloat time, aperture, gain = 1.0f;
47
48	- Exiv2::ExifData &exifData = image->exifData ();
49	- if (exifData.empty ())
50	- return NAN;
51	+ gexiv2_metadata_open_path (e2m, path, &error);
52	+ if (error)
53	+ {
54	+ g_warning ("%s", error->message);
55	+ exit (EXIT_FAILURE);
56	+ }
57
58	/* Calculate the APEX brightness / EV */
59	- gfloat time, aperture, gain = 1.0f;
60
61	- time = exifData["Exif.Photo.ExposureTime"].value().toFloat();
62	- aperture = exifData["Exif.Photo.FNumber" ].value().toFloat();
63	+ {
64	+ gint nom, den;
65	+ gexiv2_metadata_get_exposure_time (e2m, &nom, &den);
66	+ time = nom * 1.0f / den;
67	+ }
68	+ aperture = gexiv2_metadata_get_fnumber (e2m);
69
70	/* iso */
71	- try
72	+ if (gexiv2_metadata_has_tag (e2m, "Exif.Image.ISOSpeedRatings"))
73	{
74	- gain = exifData["Exif.Photo.ISOSpeedRatings"].value().toLong() / 100.0f;
75	+ gain = gexiv2_metadata_get_iso_speed (e2m) / 100.0f;
76	}
77	- catch (Exiv2::Error ex)
78	+ else
79	{
80	// Assume ISO is set at 100. It's reasonably likely that the ISO is the
81	// same across all images anyway, and for our purposes the relative
82	--
83	2.21.0
84

Added Link Here

(-)graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp (+12 lines)
1	--- src/gimplensfun.cpp.orig 2019-07-07 08:42:51 UTC
2	+++ src/gimplensfun.cpp
3	@@ -37,8 +37,7 @@ CHANGES:
4	#include <libgimp/gimp.h>
5	#include <libgimp/gimpui.h>
6
7	-#include <exiv2/image.hpp>
8	-#include <exiv2/exif.hpp>
9	+#include <exiv2/exiv2.hpp>
10
11	#define VERSIONSTR "0.2.4-dev"
12

Added Link Here

(-)graphics/hugin/files/patch-src_hugin1_hugin_RawImport.cpp (+14 lines)
1	--- src/hugin1/hugin/RawImport.cpp.orig 2019-07-07 08:40:09 UTC
2	+++ src/hugin1/hugin/RawImport.cpp
3	@@ -35,10 +35,7 @@
4	// workaround for a conflict between exiv2 and wxWidgets/CMake built
5	#define HAVE_PID_T 1
6	#endif
7	-#include <exiv2/exif.hpp>
8	-#include <exiv2/image.hpp>
9	-#include <exiv2/easyaccess.hpp>
10	-#include <exiv2/xmpsidecar.hpp>
11	+#include <exiv2/exiv2.hpp>
12	#ifdef __WXMSW__
13	#include <wx/msw/registry.h>
14	#endif

Added Link Here

(-)graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp (+13 lines)
1	--- src/hugin_base/panodata/SrcPanoImage.cpp.orig 2019-07-07 08:31:01 UTC
2	+++ src/hugin_base/panodata/SrcPanoImage.cpp
3	@@ -40,9 +40,7 @@
4	#include <vigra/diff2d.hxx>
5	#include <vigra/imageinfo.hxx>
6	#include <hugin_utils/utils.h>
7	-#include <exiv2/exif.hpp>
8	-#include <exiv2/image.hpp>
9	-#include <exiv2/easyaccess.hpp>
10	+#include <exiv2/exiv2.hpp>
11	#include <lensdb/LensDB.h>
12	#include "Exiv2Helper.h"
13

Added Link Here

(-)graphics/photoqt/files/patch-cplusplus_scripts_getanddostuff_manipulation.h (+12 lines)
1	--- cplusplus/scripts/getanddostuff/manipulation.h.orig 2019-07-07 08:24:57 UTC
2	+++ cplusplus/scripts/getanddostuff/manipulation.h
3	@@ -37,8 +37,7 @@
4	#include "../../logger.h"
5
6	#ifdef EXIV2
7	-#include <exiv2/image.hpp>
8	-#include <exiv2/exif.hpp>
9	+#include <exiv2/exiv2.hpp>
10	#endif
11
12	class GetAndDoStuffManipulation : public QObject {

Added Link Here

(-)graphics/photoqt/files/patch-cplusplus_scripts_getmetadata.h (+12 lines)
1	--- cplusplus/scripts/getmetadata.h.orig 2019-07-07 08:22:25 UTC
2	+++ cplusplus/scripts/getmetadata.h
3	@@ -34,8 +34,7 @@
4	#include "../logger.h"
5
6	#ifdef EXIV2
7	-#include <exiv2/image.hpp>
8	-#include <exiv2/exif.hpp>
9	+#include <exiv2/exiv2.hpp>
10	#endif
11
12	class GetMetaData : public QObject {

Lines 1-19 Link Here

(-)graphics/ufraw/files/patch-gentoo_b5b414 (-5 / +5 lines)
1	https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch	1	https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
2		2
3	--- ufraw_exiv2.cc 2015-06-16 05:58:38.000000000 +0200	3	--- ufraw_exiv2.cc.orig 2016-11-13 04:00:05 UTC
4	+++ ufraw_exiv2.cc 2018-12-29 22:51:23.291894430 +0100	4	+++ ufraw_exiv2.cc
5	@@ -15,9 +15,7 @@	5	@@ -15,9 +15,8 @@
6	#include "ufraw.h"	6	#include "ufraw.h"
7		7
8	#ifdef HAVE_EXIV2	8	#ifdef HAVE_EXIV2
9	-#include <exiv2/image.hpp>	9	-#include <exiv2/image.hpp>
10	-#include <exiv2/easyaccess.hpp>	10	-#include <exiv2/easyaccess.hpp>
11	-#include <exiv2/exif.hpp>	11	-#include <exiv2/exif.hpp>
		12	+#include <iostream>
12	+#include <exiv2/exiv2.hpp>	13	+#include <exiv2/exiv2.hpp>
13	#include <sstream>	14	#include <sstream>
14	#include <cassert>	15	#include <cassert>
15		16
16	@@ -67,7 +65,11 @@	17	@@ -67,7 +66,11 @@ extern "C" int ufraw_exif_read_input(ufraw_data *uf)
17	if (exifData.empty()) {	18	if (exifData.empty()) {
18	std::string error(uf->filename);	19	std::string error(uf->filename);
19	error += ": No Exif data found in the file";	20	error += ": No Exif data found in the file";
Lines 25-28 https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/ufraw/files/ufraw-0.22- Link Here
25	}	26	}
26		27
27	/* List of tag names taken from exiv2's printSummary() in actions.cpp */	28	/* List of tag names taken from exiv2's printSummary() in actions.cpp */
28

Added Link Here

(-)multimedia/mythtv/files/patch-libs_libmythmetadata_imagemetadata.cpp (+18 lines)
1	--- libs/libmythmetadata/imagemetadata.cpp.orig 2019-07-07 08:48:08 UTC
2	+++ libs/libmythmetadata/imagemetadata.cpp
3	@@ -7,14 +7,7 @@
4	#include "exitcodes.h" // for ffprobe
5
6	// libexiv2 for Exif metadata
7	-//#include <exiv2/exiv2.hpp>
8	-// Note: Older versions of Exiv2 don't have the exiv2.hpp include
9	-// file. Using image.hpp instead seems to work.
10	-#ifdef _MSC_VER
11	-#include <exiv2/src/image.hpp>
12	-#else
13	-#include <exiv2/image.hpp>
14	-#endif
15	+#include <exiv2/exiv2.hpp>
16
17	// To read FFMPEG Metadata
18	extern "C" {