hugin: fix build with exiv2-0.27.x

9 files changed, 124 insertions, 3 deletions

diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index df14297fecf..09dbef70037 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.93 2019/08/22 12:23:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.94 2019/08/28 01:32:11 markd Exp $
 
 DISTNAME=	hugin-2019.0.0
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hugin/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo
index 4640e7850bf..740977f07b0 100644
--- a/graphics/hugin/distinfo
+++ b/graphics/hugin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2019/04/30 09:19:25 adam Exp $
+$NetBSD: distinfo,v 1.22 2019/08/28 01:32:11 markd Exp $
 
 SHA1 (hugin-2019.0.0.tar.bz2) = 269efb3c3785b3b3fe86e73ab2ffcb1bb6e0498f
 RMD160 (hugin-2019.0.0.tar.bz2) = 6d1d7e14a862879e5ac9bc2d9b75c5e9e4d0e15a
@@ -9,9 +9,16 @@ SHA1 (patch-CMakeModules_FindPNG.cmake) = 811fd3cf6f819b31129e1560cd8acd1f7ee6de
 SHA1 (patch-doc_deghosting_mask.pod) = fe5462b10966420b0cf3fab004854d9dab3bfb4f
 SHA1 (patch-src_hugin1_base__wx_wxPanoCommand.cpp) = d5bf8f747ae86338e728c472d3dc04bf4c84f182
 SHA1 (patch-src_hugin1_calibrate__lens_LensCalFrame.cpp) = 9b815a681317cb19880e7bb6ef170bc14d01b28b
+SHA1 (patch-src_hugin1_hugin_AboutDialog.cpp) = 26bf60e2b6ea894e234b7b965444f644c7fc69a2
 SHA1 (patch-src_hugin1_hugin_CPEditorPanel.cpp) = d373c00d4783b3edc1bad5a67339163a0c23d8c5
 SHA1 (patch-src_hugin1_hugin_GLPreviewFrame.cpp) = fda8db4abf3ab10332d4309c90f0ef4f845c76a6
+SHA1 (patch-src_hugin1_hugin_PanoOperation.cpp) = 29ba955377ddd79bd55a206b34cfc1a67c0e6ea8
+SHA1 (patch-src_hugin1_hugin_RawImport.cpp) = 0096072a3aa0fbdddca1f659ec7f6ae297401f3a
+SHA1 (patch-src_hugin1_hugin_TextureManager.cpp) = 169cc0905ce08dc449ff7d9be756bdd6c0238525
 SHA1 (patch-src_hugin1_ptbatcher_BatchFrame.cpp) = 51ce24f1eb99cc5c0151758299eb1ecc34128171
+SHA1 (patch-src_hugin1_ptbatcher_FindPanoDialog.cpp) = 24e44d2e4c2f59e7448205cd4b190db986280d21
+SHA1 (patch-src_hugin__base_panodata_Exiv2Helper.cpp) = 917c80e5b36b320a09e22638050085e0e22c4dd9
+SHA1 (patch-src_hugin__base_panodata_SrcPanoImage.cpp) = 06d100c9c39661c2143b44adb888a9690cbccade
 SHA1 (patch-src_hugin__script__interface_hsi.i) = b11a52579fd12fdf7c51fef63049d285cb2b52e1
 SHA1 (patch-src_tools_align_image_stack.cpp) = fc2759f0722365d4c5339c5c8bc1eda1a6bf7a71
 SHA1 (patch-src_tools_tca__correct.cpp) = 73a86d3086336f168de5fb1cc02378a3ecc43104
diff --git a/graphics/hugin/patches/patch-src_hugin1_hugin_AboutDialog.cpp b/graphics/hugin/patches/patch-src_hugin1_hugin_AboutDialog.cpp
new file mode 100644
index 00000000000..eba461712e6
--- /dev/null
+++ b/graphics/hugin/patches/patch-src_hugin1_hugin_AboutDialog.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_hugin1_hugin_AboutDialog.cpp,v 1.1 2019/08/28 01:32:12 markd Exp $
+
+work with exiv2-0.27.x
+
+--- src/hugin1/hugin/AboutDialog.cpp.orig	2018-12-22 15:09:01.000000000 +0000
++++ src/hugin1/hugin/AboutDialog.cpp
+@@ -42,7 +42,7 @@ extern "C"
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include "exiv2/exiv2.hpp"
++#include <exiv2/exiv2.hpp>
+ #include "lensdb/LensDB.h"
+ #include "sqlite3.h"
+ #include <lcms2.h>
diff --git a/graphics/hugin/patches/patch-src_hugin1_hugin_PanoOperation.cpp b/graphics/hugin/patches/patch-src_hugin1_hugin_PanoOperation.cpp
new file mode 100644
index 00000000000..582d902c74b
--- /dev/null
+++ b/graphics/hugin/patches/patch-src_hugin1_hugin_PanoOperation.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_hugin1_hugin_PanoOperation.cpp,v 1.1 2019/08/28 01:32:12 markd Exp $
+
+work with exiv2-0.27.x
+
+--- src/hugin1/hugin/PanoOperation.cpp.orig	2019-02-02 10:11:01.000000000 +0000
++++ src/hugin1/hugin/PanoOperation.cpp
+@@ -36,8 +36,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/exiv2.hpp>
+ #include "base_wx/LensTools.h"
+ #include "base_wx/wxLensDB.h"
+ #include "hugin/ResetDialog.h"
diff --git a/graphics/hugin/patches/patch-src_hugin1_hugin_RawImport.cpp b/graphics/hugin/patches/patch-src_hugin1_hugin_RawImport.cpp
new file mode 100644
index 00000000000..34e06ef349b
--- /dev/null
+++ b/graphics/hugin/patches/patch-src_hugin1_hugin_RawImport.cpp
@@ -0,0 +1,18 @@
+$NetBSD: patch-src_hugin1_hugin_RawImport.cpp,v 1.1 2019/08/28 01:32:12 markd Exp $
+
+work with exiv2-0.27.x
+
+--- src/hugin1/hugin/RawImport.cpp.orig	2019-02-02 10:11:01.000000000 +0000
++++ 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 a/graphics/hugin/patches/patch-src_hugin1_hugin_TextureManager.cpp b/graphics/hugin/patches/patch-src_hugin1_hugin_TextureManager.cpp
new file mode 100644
index 00000000000..d2fb9e09c92
--- /dev/null
+++ b/graphics/hugin/patches/patch-src_hugin1_hugin_TextureManager.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_hugin1_hugin_TextureManager.cpp,v 1.1 2019/08/28 01:32:12 markd Exp $
+
+work with exiv2-0.27.x
+
+--- src/hugin1/hugin/TextureManager.cpp.orig	2019-02-28 17:21:39.000000000 +0000
++++ src/hugin1/hugin/TextureManager.cpp
+@@ -65,8 +65,7 @@
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include "exiv2/exiv2.hpp"
+-#include "exiv2/preview.hpp"
++#include <exiv2/exiv2.hpp>
+ 
+ TextureManager::TextureManager(HuginBase::Panorama *pano, ViewState *view_state_in)
+ {
diff --git a/graphics/hugin/patches/patch-src_hugin1_ptbatcher_FindPanoDialog.cpp b/graphics/hugin/patches/patch-src_hugin1_ptbatcher_FindPanoDialog.cpp
new file mode 100644
index 00000000000..2d82aca773f
--- /dev/null
+++ b/graphics/hugin/patches/patch-src_hugin1_ptbatcher_FindPanoDialog.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_hugin1_ptbatcher_FindPanoDialog.cpp,v 1.1 2019/08/28 01:32:12 markd Exp $
+
+work with exiv2-0.27.x
+
+--- src/hugin1/ptbatcher/FindPanoDialog.cpp.orig	2019-01-27 09:53:22.000000000 +0000
++++ src/hugin1/ptbatcher/FindPanoDialog.cpp
+@@ -36,8 +36,7 @@
+ // workaround for a conflict between exiv2 and wxWidgets/CMake built
+ #define HAVE_PID_T 1
+ #endif
+-#include "exiv2/exiv2.hpp"
+-#include "exiv2/preview.hpp"
++#include <exiv2/exiv2.hpp>
+ #ifdef _WIN32
+ #include <commctrl.h>
+ #endif
diff --git a/graphics/hugin/patches/patch-src_hugin__base_panodata_Exiv2Helper.cpp b/graphics/hugin/patches/patch-src_hugin__base_panodata_Exiv2Helper.cpp
new file mode 100644
index 00000000000..c3b11546f6a
--- /dev/null
+++ b/graphics/hugin/patches/patch-src_hugin__base_panodata_Exiv2Helper.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_hugin__base_panodata_Exiv2Helper.cpp,v 1.1 2019/08/28 01:32:12 markd Exp $
+
+work with exiv2-0.27.x
+
+--- src/hugin_base/panodata/Exiv2Helper.cpp.orig	2018-11-12 17:45:31.000000000 +0000
++++ src/hugin_base/panodata/Exiv2Helper.cpp
+@@ -28,8 +28,7 @@
+ #include "Exiv2Helper.h"
+ #include "hugin_math/hugin_math.h"
+ #include "hugin_utils/utils.h"  
+-#include "exiv2/easyaccess.hpp"
+-#include "exiv2/version.hpp"
++#include <exiv2/exiv2.hpp>
+ 
+ namespace HuginBase
+ {
diff --git a/graphics/hugin/patches/patch-src_hugin__base_panodata_SrcPanoImage.cpp b/graphics/hugin/patches/patch-src_hugin__base_panodata_SrcPanoImage.cpp
new file mode 100644
index 00000000000..66385e86949
--- /dev/null
+++ b/graphics/hugin/patches/patch-src_hugin__base_panodata_SrcPanoImage.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_hugin__base_panodata_SrcPanoImage.cpp,v 1.1 2019/08/28 01:32:12 markd Exp $
+
+work with exiv2-0.27.x
+
+--- src/hugin_base/panodata/SrcPanoImage.cpp.orig	2019-02-16 08:18:55.000000000 +0000
++++ 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"
+