hugin: update to 2019.2.0.

srcpkgs/hugin/patches/0001-Correct-exiv2-conflicts.patch

@@ -1,118 +0,0 @@
-From e6b350ff0ae13314aff2991381beb8731d2c30be Mon Sep 17 00:00:00 2001
-From: Nathan Owens <ndowens04@gmail.com>
-Date: Wed, 6 Nov 2019 19:48:39 -0600
-Subject: [PATCH] Correct exiv2 conflicts
-
----
- src/hugin1/hugin/AboutDialog.cpp         | 2 +-
- src/hugin1/hugin/PanoOperation.cpp       | 3 +--
- src/hugin1/hugin/RawImport.cpp           | 5 +----
- src/hugin1/hugin/TextureManager.cpp      | 3 +--
- src/hugin1/ptbatcher/FindPanoDialog.cpp  | 3 +--
- src/hugin_base/panodata/Exiv2Helper.cpp  | 3 +--
- src/hugin_base/panodatsrcPanoImage.cpp | 4 +---
- 7 files changed, 7 insertions(+), 16 deletions(-)
-
-diff --git src/hugin1/hugin/AboutDialog.cpp src/hugin1/hugin/AboutDialog.cpp
-index 5603957..d1291aa 100755
---- src/hugin1/hugin/AboutDialog.cpp
-+++ 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 src/hugin1/hugin/PanoOperation.cpp src/hugin1/hugin/PanoOperation.cpp
-index cf7a6c3..7a3f0d7 100755
---- src/hugin1/hugin/PanoOperation.cpp
-+++ 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 src/hugin1/hugin/RawImport.cpp src/hugin1/hugin/RawImport.cpp
-index 2dd4eb9..73bb143 100755
---- src/hugin1/hugin/RawImport.cpp
-+++ 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 src/hugin1/hugin/TextureManager.cpp src/hugin1/hugin/TextureManager.cpp
-index 0d2f5da..9a0822a 100755
---- src/hugin1/hugin/TextureManager.cpp
-+++ 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 src/hugin1/ptbatcher/FindPanoDialog.cpp src/hugin1/ptbatcher/FindPanoDialog.cpp
-index 64774fb..96cd762 100755
---- src/hugin1/ptbatcher/FindPanoDialog.cpp
-+++ 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 src/hugin_base/panodata/Exiv2Helper.cpp src/hugin_base/panodata/Exiv2Helper.cpp
-index bc4c12a..09c6e46 100755
---- src/hugin_base/panodata/Exiv2Helper.cpp
-+++ 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 src/hugin_base/panodata/SrcPanoImage.cpp src/hugin_base/panodata/SrcPanoImage.cpp
-index cc6a565..8484dd9 100755
---- src/hugin_base/panodata/SrcPanoImage.cpp
-+++ src/hugin_base/panodatsrcPanoImage.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"
- 
--- 
-2.24.0
-

srcpkgs/hugin/patches/find-openexr-2_4.patch

@@ -4,8 +4,8 @@
    include(FindLibraryWithDebug)
    find_library_with_debug(OPENEXR_HALF_LIBRARY 
      WIN32_DEBUG_POSTFIX d
--    NAMES Half
+-    NAMES Half-2_3 Half
-+    NAMES Half-2_4 Half
++    NAMES Half-2_4 Half-2_3 Half
      PATHS
        ${_OPENEXRLinkDir}
        ${SYSTEM_LIB_DIRS}
@@ -13,7 +13,7 @@
  
    find_library_with_debug(OPENEXR_IEX_LIBRARY
      WIN32_DEBUG_POSTFIX d
--    NAMES Iex-2_2 Iex
+-    NAMES Iex-2_3 Iex-2_2 Iex
 +    NAMES Iex-2_4 Iex-2_3 Iex-2_2 Iex
      PATHS
        ${_OPENEXRLinkDir}
@@ -22,7 +22,7 @@
  
    find_library_with_debug(OPENEXR_ILMTHREAD_LIBRARY 
      WIN32_DEBUG_POSTFIX d
--    NAMES IlmThread-2_2 IlmThread
+-    NAMES IlmThread-2_3 IlmThread-2_2 IlmThread
 +    NAMES IlmThread-2_4 IlmThread-2_3 IlmThread-2_2 IlmThread
      PATHS
        ${_OPENEXRLinkDir}
@@ -31,7 +31,7 @@
    
    find_library_with_debug(OPENEXR_IMATH_LIBRARY 
      WIN32_DEBUG_POSTFIX d
--    NAMES Imath-2_2 Imath
+-    NAMES Imath-2_3 Imath-2_2 Imath
 +    NAMES Imath-2_4 Imath-2_3 Imath-2_2 Imath
      PATHS
        ${_OPENEXRLinkDir}
@@ -40,7 +40,7 @@
    
    find_library_with_debug(OPENEXR_ILMIMF_LIBRARY 
      WIN32_DEBUG_POSTFIX d
--    NAMES IlmImf-2_2 IlmImf 
+-    NAMES IlmImf-2_3 IlmImf-2_2 IlmImf 
 +    NAMES IlmImf-2_4 IlmImf-2_3 IlmImf-2_2 IlmImf 
      PATHS
        ${_OPENEXRLinkDir}

srcpkgs/hugin/template

@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
-version=2019.0.0
+version=2019.2.0
-revision=3
+revision=1
 wrksrc="${pkgname}-${version}"
 build_style=cmake
 pycompile_module="hpi.py hsi.py"
@@ -9,7 +9,7 @@ pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templa
 hostmakedepends="pkg-config exiftool swig"
 makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgomp-devel
  exiv2-devel libfreeglut-devel libpano13-devel boost-devel vigra-devel sqlite-devel
- lensfun-devel python-devel glew-devel libXmu-devel libXi-devel glu-devel
+ lensfun-devel python3-devel glew-devel libXmu-devel libXi-devel glu-devel
  lcms2-devel lapack-devel"
 depends="exiftool enblend-enfuse"
 short_desc="Easy to use panoramic imaging toolchain"
@@ -17,10 +17,10 @@ maintainer="lemmi <lemmi@nerd2nerd.org>"
 license="GPL-2.0-or-later"
 homepage="http://hugin.sourceforge.net/"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${pkgname}-${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=f94717c5035b776a552163bac5815916e0662008fabefafd790fa54b352e22d1
+checksum=8ba6bdfea246313f142f17f42e066c6888f51b72e4f8814b5e1c84ff56a95a3e
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" python"
+	hostmakedepends+=" python3"
 else
 	makedepends+=" flann-devel"
 fi