hugin: updated to 2019.2.0

Changes since 2019.0.0

2019.2.0 is mainly a bug fix release.
Fixes raw import on Mac OS.
Fixes bugs in verdandi/internal blender.
Scripting interface needs now Python3.
Improvements for high dpi displays (Windows, GTK+3).
Fixes for several small bugs...

11 files changed, 14 insertions, 138 deletions

diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 161c89c441a..2c4901d1fc8 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.95 2019/08/30 17:01:34 nia Exp $
+# $NetBSD: Makefile,v 1.96 2020/01/03 18:15:21 adam Exp $
 
-DISTNAME=	hugin-2019.0.0
-PKGREVISION=	7
+DISTNAME=	hugin-2019.2.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hugin/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/hugin/PLIST b/graphics/hugin/PLIST
index 62cee029eb6..fd20d1d8000 100644
--- a/graphics/hugin/PLIST
+++ b/graphics/hugin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2019/04/30 09:19:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.13 2020/01/03 18:15:21 adam Exp $
 bin/PTBatcherGUI
 bin/align_image_stack
 bin/autooptimiser
@@ -98,8 +98,6 @@ share/hugin/data/normal_smartblend.executor
 share/hugin/data/plugins-templates/dual_use.py
 share/hugin/data/plugins-templates/plugin_skeleton.py
 share/hugin/data/plugins/README_woa.txt
-share/hugin/data/plugins/crop_cp.py
-share/hugin/data/plugins/shooting_pattern.py
 share/hugin/data/plugins/top_five.py
 share/hugin/data/plugins/woa.py
 share/hugin/data/scanned.assistant
diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo
index 740977f07b0..8cfbf10e779 100644
--- a/graphics/hugin/distinfo
+++ b/graphics/hugin/distinfo
@@ -1,24 +1,17 @@
-$NetBSD: distinfo,v 1.22 2019/08/28 01:32:11 markd Exp $
+$NetBSD: distinfo,v 1.23 2020/01/03 18:15:21 adam Exp $
 
-SHA1 (hugin-2019.0.0.tar.bz2) = 269efb3c3785b3b3fe86e73ab2ffcb1bb6e0498f
-RMD160 (hugin-2019.0.0.tar.bz2) = 6d1d7e14a862879e5ac9bc2d9b75c5e9e4d0e15a
-SHA512 (hugin-2019.0.0.tar.bz2) = 49e945523c290a6bf33f265cd9e29343442a056248fc09aeb15ebb1f4197510c25ff8201b5520a9ed8fcac2342eda8b8fa65b9b82ff3930084546e1fc228d9a5
-Size (hugin-2019.0.0.tar.bz2) = 10297887 bytes
-SHA1 (patch-CMakeLists.txt) = ee4703122a37bf34958f857bbedd6c5e7a3843c7
+SHA1 (hugin-2019.2.0.tar.bz2) = e91bfbb286d0d5f40cd93ecb961eb55a37f3f5bb
+RMD160 (hugin-2019.2.0.tar.bz2) = d16c364779a48451b3b222a0dd0efa46535e6ddc
+SHA512 (hugin-2019.2.0.tar.bz2) = 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1
+Size (hugin-2019.2.0.tar.bz2) = 10335030 bytes
+SHA1 (patch-CMakeLists.txt) = b5c72651a150e4c3c095f670eaaeabcb4b4c5749
 SHA1 (patch-CMakeModules_FindPNG.cmake) = 811fd3cf6f819b31129e1560cd8acd1f7ee6defc
 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-CMakeLists.txt b/graphics/hugin/patches/patch-CMakeLists.txt
index 52672b530c8..901784eebd1 100644
--- a/graphics/hugin/patches/patch-CMakeLists.txt
+++ b/graphics/hugin/patches/patch-CMakeLists.txt
@@ -1,12 +1,12 @@
-$NetBSD: patch-CMakeLists.txt,v 1.5 2019/04/30 09:19:25 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.6 2020/01/03 18:15:21 adam Exp $
 
 Do not make an application bundle on OS X.
 
---- CMakeLists.txt.orig	2019-03-23 07:16:59.000000000 +0000
+--- CMakeLists.txt.orig	2019-12-15 15:44:00.000000000 +0000
 +++ CMakeLists.txt
 @@ -2,10 +2,6 @@
- # require at least cmake 3.1
- cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR )
+ # require at least cmake 3.8
+ cmake_minimum_required(VERSION 3.8 FATAL_ERROR )
  
 -# prevent in-tree building
 -if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
@@ -15,7 +15,7 @@ Do not make an application bundle on OS X.
  
  if(COMMAND cmake_policy)
    cmake_policy(SET CMP0003 NEW)
-@@ -595,16 +591,6 @@ IF (APPLE)
+@@ -557,16 +553,6 @@ IF (APPLE)
    ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE)
  ENDIF (APPLE)
  
diff --git a/graphics/hugin/patches/patch-src_hugin1_hugin_AboutDialog.cpp b/graphics/hugin/patches/patch-src_hugin1_hugin_AboutDialog.cpp
deleted file mode 100644
index eba461712e6..00000000000
--- a/graphics/hugin/patches/patch-src_hugin1_hugin_AboutDialog.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 582d902c74b..00000000000
--- a/graphics/hugin/patches/patch-src_hugin1_hugin_PanoOperation.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
deleted file mode 100644
index 34e06ef349b..00000000000
--- a/graphics/hugin/patches/patch-src_hugin1_hugin_RawImport.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$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
deleted file mode 100644
index d2fb9e09c92..00000000000
--- a/graphics/hugin/patches/patch-src_hugin1_hugin_TextureManager.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
deleted file mode 100644
index 2d82aca773f..00000000000
--- a/graphics/hugin/patches/patch-src_hugin1_ptbatcher_FindPanoDialog.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
deleted file mode 100644
index c3b11546f6a..00000000000
--- a/graphics/hugin/patches/patch-src_hugin__base_panodata_Exiv2Helper.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$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
deleted file mode 100644
index 66385e86949..00000000000
--- a/graphics/hugin/patches/patch-src_hugin__base_panodata_SrcPanoImage.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$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"
-