From 013c258cbedc6a18237c4d645fd9dff52ad66d99 Mon Sep 17 00:00:00 2001
From: lemmi <lemmi@nerd2nerd.org>
Date: Tue, 9 Apr 2019 12:27:18 +0200
Subject: [PATCH] hugin: update to 2019.0.0.

---
 srcpkgs/hugin/patches/exiv-0.27.patch | 28 -----------------------
 srcpkgs/hugin/template                | 33 ++++++++++++---------------
 2 files changed, 15 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/hugin/patches/exiv-0.27.patch

diff --git a/srcpkgs/hugin/patches/exiv-0.27.patch b/srcpkgs/hugin/patches/exiv-0.27.patch
deleted file mode 100644
index 7f00134123..0000000000
--- a/srcpkgs/hugin/patches/exiv-0.27.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/hugin_base/panodata/Exiv2Helper.cpp
-+++ src/hugin_base/panodata/Exiv2Helper.cpp
-@@ -29,6 +29,7 @@
- #include "hugin_math/hugin_math.h"
- #include "hugin_utils/utils.h"  
- #include "exiv2/easyaccess.hpp"
-+#include "exiv2/version.hpp"
- 
- namespace HuginBase
- {
-@@ -232,7 +233,7 @@
-                     return false;
-                 };
-             };
--#if EXIV2_TEST_VERSION(0,23,0)
-+#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,23,0)
-             if (_getExiv2Value(exifData, "Exif.PentaxDng.RedBalance", val1) &&
-                 _getExiv2Value(exifData, "Exif.PentaxDng.BlueBalance", val2))
-             {
-@@ -563,7 +564,7 @@
-             std::string lensName;
-             // first we are reading LensModel in Exif section, this is only available
-             // with EXIF >= 2.3
--#if EXIV2_TEST_VERSION(0,22,0)
-+#if defined EXIV2_VERSION && EXIV2_VERSION >= EXIV2_MAKE_VERSION(0,22,0)
-             //the string "Exif.Photo.LensModel" is only defined in exiv2 0.22.0 and above
-             if(_getExiv2Value(exifData, "Exif.Photo.LensModel", lensName))
- #else
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 4746291ae1..30da996181 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
-version=2018.0.0
-revision=11
+version=2019.0.0
+revision=1
 wrksrc="${pkgname}-${version}"
 build_style=cmake
 pycompile_module="hpi.py hsi.py"
@@ -12,30 +12,27 @@ makedepends="wxWidgets-gtk3-devel tiff-devel libpng-devel libopenexr-devel libgo
  lensfun-devel python-devel glew-devel libXmu-devel libXi-devel glu-devel
  lcms2-devel lapack-devel"
 depends="exiftool enblend-enfuse"
-short_desc="An easy to use panoramic imaging toolchain"
+short_desc="Easy to use panoramic imaging toolchain"
 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=d3af0d066ac50e3bb243a175a64ecda136d87178419457e8822e11bcf0e565cb
+checksum=f94717c5035b776a552163bac5815916e0662008fabefafd790fa54b352e22d1
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python"
+else
+	makedepends+=" flann-devel"
 fi
 
 pre_configure() {
-	sed -i '/<sys\/sysctl.h>/d' src/hugin_base/hugin_utils/platform.cpp
-	sed -i 's|-O3||g' src/celeste/CMakeLists.txt
-	# Fix compiling against lensfun-0.3.0
-	sed '/LF_DIST_MODEL_FOV1/d' -i src/hugin_base/lensdb/LensDB.cpp
-
-	# workaround for cmake to find wx-config-gtk3
-	# can be removed once there is only one 'wx-config'
-	if [ "$CROSS_BUILD" ]; then
-		# cannot override wxWidgets_CONFIG_EXECUTABLE set in
-		# the cross toolchain file otherwise
-		ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
-	else
-		sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
-	fi
+ 	# workaround for cmake to find wx-config-gtk3
+ 	# can be removed once there is only one 'wx-config'
+ 	if [ "$CROSS_BUILD" ]; then
+ 		# cannot override wxWidgets_CONFIG_EXECUTABLE set in
+ 		# the cross toolchain file otherwise
+ 		ln -s ${XBPS_WRAPPERDIR}/wx-config{-gtk3,}
+ 	else
+ 		sed -i "1i\set(wxWidgets_CONFIG_EXECUTABLE wx-config-gtk3)" CMakeLists.txt
+ 	fi
 }