Attachment 205558 Details for Bug 239028 – v1

[patch] v1

exiv2-0.27.1.v1.diff (text/plain), 18.46 KB, created by Tobias C. Berner on 2019-07-07 08:58:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias C. Berner

Created: 2019-07-07 08:58:21 UTC

Size: 18.46 KB

patch

obsolete

>diff --git astro/gpscorrelate/files/patch-exif-gps.cpp astro/gpscorrelate/files/patch-exif-gps.cpp
>new file mode 100644
>index 000000000000..441fcf55569c
>--- /dev/null
>+++ astro/gpscorrelate/files/patch-exif-gps.cpp
>@@ -0,0 +1,13 @@
>+--- 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"
>diff --git astro/merkaartor/files/patch-git_e6d015a9 astro/merkaartor/files/patch-git_e6d015a9
>index 36f389ea6c86..2b6e58ebd75e 100644
>--- astro/merkaartor/files/patch-git_e6d015a9
>+++ astro/merkaartor/files/patch-git_e6d015a9
>@@ -6,7 +6,7 @@ Date:   Mon Jul 27 14:22:37 2015 +0200
> 
> --- src/Docks/GeoImageDock.cpp.orig	2015-07-19 14:50:09 UTC
> +++ src/Docks/GeoImageDock.cpp
>-@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringLis
>+@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringList fileNames)
>  
>      Exiv2::Image::AutoPtr image;
>      Exiv2::ExifData exifData;
>@@ -15,7 +15,7 @@ Date:   Mon Jul 27 14:22:37 2015 +0200
>  
>      Layer *theLayer;
>      if (photoLayer == NULL) {
>-@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage(
>+@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString 
>      double lat = 0.0, lon = 0.0;
>      Exiv2::Image::AutoPtr image;
>      Exiv2::ExifData exifData;
>@@ -26,10 +26,13 @@ Date:   Mon Jul 27 14:22:37 2015 +0200
>          return pos;
> --- src/Docks/GeoImageDock.h.orig	2015-07-19 14:50:09 UTC
> +++ src/Docks/GeoImageDock.h
>-@@ -9,6 +9,7 @@
>+@@ -7,8 +7,8 @@
>+ #include <QtWidgets/QDockWidget>
>+ #include <QtGui/QMouseEvent>
>  #include <QtWidgets/QShortcut>
>- #include <exiv2/image.hpp>
>- #include <exiv2/exif.hpp>
>+-#include <exiv2/image.hpp>
>+-#include <exiv2/exif.hpp>
>++#include <exiv2/exiv2.hpp>
> +#include <QDrag>
>  
>  class ImageView;
>diff --git graphics/exiv2/Makefile graphics/exiv2/Makefile
>index 73a4c350637d..3ac826b7cdfb 100644
>--- graphics/exiv2/Makefile
>+++ graphics/exiv2/Makefile
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	exiv2
>-DISTVERSION=	0.27.0
>-DISTVERSIONSUFFIX=	a-Source
>-PORTREVISION=	1
>+DISTVERSION=	0.27.1
>+DISTVERSIONSUFFIX=	-Source
> PORTEPOCH=	1
> CATEGORIES=	graphics
> MASTER_SITES=	http://www.exiv2.org/builds/
>diff --git graphics/exiv2/distinfo graphics/exiv2/distinfo
>index aa82b1230a3f..da955a15ddb0 100644
>--- graphics/exiv2/distinfo
>+++ graphics/exiv2/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1550640374
>-SHA256 (exiv2-0.27.0a-Source.tar.gz) = a4adfa7aaf295b0383adead476f8e0493b9d6c6c7570d5884d2ebf8a2871902f
>-SIZE (exiv2-0.27.0a-Source.tar.gz) = 27168207
>+TIMESTAMP = 1557685573
>+SHA256 (exiv2-0.27.1-Source.tar.gz) = f125286980fd1bcb28e188c02a93946951c61e10784720be2301b661a65b3081
>+SIZE (exiv2-0.27.1-Source.tar.gz) = 27210365
>diff --git graphics/exiv2/files/patch-git_04c9b1 graphics/exiv2/files/patch-git_04c9b1
>deleted file mode 100644
>index 55f3cce0cb79..000000000000
>--- graphics/exiv2/files/patch-git_04c9b1
>+++ /dev/null
>@@ -1,88 +0,0 @@
>-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)
>diff --git graphics/exiv2/pkg-plist graphics/exiv2/pkg-plist
>index b34eb5e13a7d..0a30988d1c46 100644
>--- graphics/exiv2/pkg-plist
>+++ graphics/exiv2/pkg-plist
>@@ -82,15 +82,16 @@ include/exiv2/version.hpp
> 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.0
>+lib/libexiv2.so.0.27.1
> lib/libexiv2.so.27
>-lib/libxmp.a
>+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
>diff --git graphics/gegl/Makefile graphics/gegl/Makefile
>index c72a3f4adb01..6cf87f22b37d 100644
>--- graphics/gegl/Makefile
>+++ graphics/gegl/Makefile
>@@ -45,10 +45,10 @@ UNIQUE_SUFFIX=	-${GEGL_VER}
> UNIQUE_SUFFIX_FILES=	bin/gcut
> 
> OPTIONS_SUB=	yes
>-OPTIONS_DEFINE=	CAIRO ENSCRIPT EXIV2 FFMPEG PIXBUF GRAPHVIZ JASPER \
>+OPTIONS_DEFINE=	CAIRO ENSCRIPT FFMPEG PIXBUF GRAPHVIZ JASPER \
> 		LUA OPENEXR RAW PANGO POPPLER LIBRSVG2 SDL SPIRO V4L \
> 		EXAMPLES LCMS2 WEBP TIFF GEXIV2
>-OPTIONS_DEFAULT=CAIRO ENSCRIPT EXIV2 PIXBUF GRAPHVIZ JASPER LCMS2 LUA \
>+OPTIONS_DEFAULT=CAIRO ENSCRIPT GEXIV2 PIXBUF GRAPHVIZ JASPER LCMS2 LUA \
> 		OPENEXR RAW PANGO POPPLER LIBRSVG2 SDL SPIRO V4L WEBP TIFF
> 
> ENSCRIPT_DESC=	Enscript support
>@@ -116,9 +116,6 @@ WEBP_CONFIGURE_WITH=	webp
> #UMFPACK_CONFIGURE_WITH=	umfpack
> CONFIGURE_ARGS+=	--without-umfpack
> 
>-EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
>-EXIV2_CONFIGURE_WITH=	exiv2
>-
> GEXIV2_LIB_DEPENDS=	libgexiv2.so:graphics/gexiv2
> GEXIV2_CONFIGURE_WITH=	gexiv2
> 
>@@ -138,6 +135,8 @@ post-patch:
> 	${REINPLACE_CMD} -e "s/lua >/lua-${LUA_VER} >/g" \
> 		-e 's|$lua$$5\.1$|\1-\2|g ; s|x86_64|amd64|g' \
> 		${WRKSRC}/configure
>+	${REINPLACE_CMD} -e  '/exp_combine/s|EXIV2|GEXIV2|g' \
>+		${WRKSRC}/tools/Makefile.in
> 
> post-patch-EXAMPLES-off:
> 	${REINPLACE_CMD} -e 's|tools examples|tools|g' \
>diff --git graphics/gegl/files/patch-git_0703b6 graphics/gegl/files/patch-git_0703b6
>new file mode 100644
>index 000000000000..5d331a5052e2
>--- /dev/null
>+++ graphics/gegl/files/patch-git_0703b6
>@@ -0,0 +1,84 @@
>+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
>+
>diff --git graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp
>new file mode 100644
>index 000000000000..0252e4b0cf90
>--- /dev/null
>+++ graphics/gimp-lensfun-plugin/files/patch-src_gimplensfun.cpp
>@@ -0,0 +1,12 @@
>+--- 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"
>+ 
>diff --git graphics/hugin/files/patch-src_hugin1_hugin_RawImport.cpp graphics/hugin/files/patch-src_hugin1_hugin_RawImport.cpp
>new file mode 100644
>index 000000000000..6dde1324baa3
>--- /dev/null
>+++ graphics/hugin/files/patch-src_hugin1_hugin_RawImport.cpp
>@@ -0,0 +1,14 @@
>+--- 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
>diff --git graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp
>new file mode 100644
>index 000000000000..26e0aa6a2ad4
>--- /dev/null
>+++ graphics/hugin/files/patch-src_hugin__base_panodata_SrcPanoImage.cpp
>@@ -0,0 +1,13 @@
>+--- 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"
>+ 
>diff --git graphics/luminance-qt5/files/patch-src_Exif_ExifOperations.cpp graphics/luminance-qt5/files/patch-src_Exif_ExifOperations.cpp
>new file mode 100644
>index 000000000000..77d199a6259d
>--- /dev/null
>+++ graphics/luminance-qt5/files/patch-src_Exif_ExifOperations.cpp
>@@ -0,0 +1,11 @@
>+--- src/Exif/ExifOperations.cpp.orig	2019-07-07 08:28:28 UTC
>++++ src/Exif/ExifOperations.cpp
>+@@ -34,7 +34,7 @@
>+ 
>+ #include <boost/assign/list_of.hpp>
>+ 
>+-#include <exif.hpp>
>++#include <exiv2/exiv2.hpp>
>+ #include <image.hpp>
>+ 
>+ #include "ExifOperations.h"
>diff --git graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp
>index 6c2b2932778a..ccc25805bf76 100644
>--- graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp
>+++ graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp
>@@ -1,6 +1,14 @@
>---- src/DkCore/DkMetaData.cpp.orig	2019-03-08 21:53:21 UTC
>+--- src/DkCore/DkMetaData.cpp.orig	2019-07-07 07:58:56 UTC
> +++ src/DkCore/DkMetaData.cpp
>-@@ -1262,7 +1262,7 @@ void DkMetaDataT::printMetaData() const {
>+@@ -40,6 +40,7 @@
>+ #include <QVector2D>
>+ #include <QApplication>
>+ #pragma warning(pop)		// no warnings from includes - end
>++#include <iostream>
>+ 
>+ namespace nmc {
>+ 
>+@@ -1262,7 +1263,7 @@ void DkMetaDataT::printMetaData() const {
>  
>  	std::string xmpPacket;
>  	if (0 != Exiv2::XmpParser::encode(xmpPacket, xmpData)) {
>diff --git graphics/photivo/files/patch-Sources_ptImageHelper.cpp graphics/photivo/files/patch-Sources_ptImageHelper.cpp
>new file mode 100644
>index 000000000000..2ff34459498c
>--- /dev/null
>+++ graphics/photivo/files/patch-Sources_ptImageHelper.cpp
>@@ -0,0 +1,10 @@
>+--- Sources/ptImageHelper.cpp.orig	2019-07-07 08:34:52 UTC
>++++ Sources/ptImageHelper.cpp
>+@@ -34,6 +34,7 @@
>+ #pragma GCC diagnostic pop
>+ #include <wand/magick_wand.h>
>+ 
>++#include <iostream>
>+ #include <vector>
>+ #include <QStringList>
>+ 
>diff --git graphics/photoqt/files/patch-cplusplus_scripts_getanddostuff_manipulation.h graphics/photoqt/files/patch-cplusplus_scripts_getanddostuff_manipulation.h
>new file mode 100644
>index 000000000000..0d5f1d33ac5e
>--- /dev/null
>+++ graphics/photoqt/files/patch-cplusplus_scripts_getanddostuff_manipulation.h
>@@ -0,0 +1,12 @@
>+--- 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 {
>diff --git graphics/photoqt/files/patch-cplusplus_scripts_getmetadata.h graphics/photoqt/files/patch-cplusplus_scripts_getmetadata.h
>new file mode 100644
>index 000000000000..5e808ab72b7d
>--- /dev/null
>+++ graphics/photoqt/files/patch-cplusplus_scripts_getmetadata.h
>@@ -0,0 +1,12 @@
>+--- 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 {
>diff --git graphics/ufraw/files/patch-gentoo_b5b414 graphics/ufraw/files/patch-gentoo_b5b414
>index f9f107b26ebc..039244de4f2b 100644
>--- graphics/ufraw/files/patch-gentoo_b5b414
>+++ graphics/ufraw/files/patch-gentoo_b5b414
>@@ -1,19 +1,20 @@
> https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/ufraw/files/ufraw-0.22-exiv2-0.27.patch
> 
>---- ufraw_exiv2.cc	2015-06-16 05:58:38.000000000 +0200
>-+++ ufraw_exiv2.cc	2018-12-29 22:51:23.291894430 +0100
>-@@ -15,9 +15,7 @@
>+--- 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 +65,11 @@
>+@@ -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";
>@@ -25,4 +26,3 @@ https://gitweb.gentoo.org/repo/gentoo.git/tree/media-gfx/ufraw/files/ufraw-0.22-
>          }
>  
>          /* List of tag names taken from exiv2's printSummary() in actions.cpp */
>-
>diff --git multimedia/mythtv/files/patch-libs_libmythmetadata_imagemetadata.cpp multimedia/mythtv/files/patch-libs_libmythmetadata_imagemetadata.cpp
>new file mode 100644
>index 000000000000..5cc747752168
>--- /dev/null
>+++ multimedia/mythtv/files/patch-libs_libmythmetadata_imagemetadata.cpp
>@@ -0,0 +1,18 @@
>+--- 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" {
>diff --git multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp
>index 0c4a6266a94a..2054c05394c6 100644
>--- multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp
>+++ multimedia/py-kaa-metadata/files/patch-src-image-exiv2.cpp
>@@ -1,6 +1,14 @@
>---- src/image/exiv2.cpp.orig	2009-01-30 22:18:25.000000000 +0100
>-+++ src/image/exiv2.cpp	2011-07-15 15:48:34.000000000 +0200
>-@@ -47,7 +47,8 @@
>+--- src/image/exiv2.cpp.orig	2009-01-30 21:18:25 UTC
>++++ src/image/exiv2.cpp
>+@@ -1,6 +1,5 @@
>+ #include <Python.h>
>+-#include <exiv2/image.hpp>
>+-#include <exiv2/exif.hpp>
>++#include <exiv2/exiv2.hpp>
>+ 
>+ PyObject *parse(PyObject *self, PyObject *args)
>+ {
>+@@ -47,7 +46,8 @@ PyObject *parse(PyObject *self, PyObject *args)
>  		Py_DECREF(entry);
>  	    }
>

Actions: View | Diff

Attachments on bug 239028: 205558