From 8a8e70f5d43006e3450f7c486837683242227eb7 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Thu, 20 Aug 2015 09:22:33 +0200
Subject: [PATCH] hugin: update to 2015.0.0.

---
 .../hugin/patches/hugin-2013-boost-156.diff   | 81 -------------------
 srcpkgs/hugin/template                        | 19 ++---
 2 files changed, 7 insertions(+), 93 deletions(-)
 delete mode 100644 srcpkgs/hugin/patches/hugin-2013-boost-156.diff

diff --git a/srcpkgs/hugin/patches/hugin-2013-boost-156.diff b/srcpkgs/hugin/patches/hugin-2013-boost-156.diff
deleted file mode 100644
index 7af073e95f6..00000000000
--- a/srcpkgs/hugin/patches/hugin-2013-boost-156.diff
+++ /dev/null
@@ -1,81 +0,0 @@
---- src/tools/ParseExp.cpp	2013-10-27 10:19:02.000000000 +0100
-+++ src/tools/ParseExp.cpp	2014-09-12 01:41:15.468973470 +0200
-@@ -50,37 +50,45 @@
- //power function
- struct lazy_pow_
- {
--    template <typename X, typename Y>
--    struct result { typedef X type; };
-+    template<class> struct result;
-+
-+    template <typename F, typename X, typename Y>
-+    struct result<F(X,Y)> { typedef X& type; };
- 
-     template <typename X, typename Y>
--    X operator()(X x, Y y) const
-+    X& operator()(X& x, Y y) const
-     {
--        return std::pow(x, y);
-+        x= std::pow(x, y);
-+        return x;
-     }
- };
- 
- // modulus for double values
- struct lazy_mod_
- {
--    template <typename X, typename Y>
--    struct result { typedef X type; };
-+    template<class> struct result;
-+
-+    template <typename F, typename X, typename Y>
-+    struct result<F(X,Y)> { typedef X& type; };
- 
-     template <typename X, typename Y>
--    X operator()(X x, Y y) const
-+    X& operator()(X& x, Y y) const
-     {
--        return std::fmod(x,y);
-+        x= std::fmod(x,y);
-+        return x;
-     }
- };
- 
- // if statement
- struct lazy_if_
- {
--    template <typename X, typename Y, typename Z>
--    struct result { typedef Y type; };
-+    template<class> struct result;
- 
--    template <typename X, typename Y, typename Z>
--    X operator()(X x, Y y, Z z) const
-+    template <typename F, typename X, typename Y>
-+    struct result<F(X,Y,Y)> { typedef Y& type; };
-+
-+    template <typename X, typename Y>
-+    Y& operator()(X x, Y& y, Y& z) const
-     {
-         return x ? y : z;
-     }
-@@ -89,13 +97,16 @@
- // wrapper for unary function
- struct lazy_ufunc_
- {
--    template <typename F, typename A1>
--    struct result { typedef A1 type; };
-+    template<class> struct result;
-+
-+    template<typename F, typename F1, typename A1>
-+    struct result<F(F1,A1)> { typedef A1& type; };
- 
-     template <typename F, typename A1>
--    A1 operator()(F f, A1 a1) const
-+    A1& operator()(F f, A1& a1) const
-     {
--        return f(a1);
-+        a1= f(a1);
-+        return a1;
-     }
- };
- 
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 232f510ec29..01c2c07bd9a 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,29 +1,24 @@
 # Template file for 'hugin'
 pkgname=hugin
-version=2014.0.0
-revision=5
+version=2015.0.0
+revision=1
 build_style=cmake
 configure_args="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0"
 pycompile_module="hpi.py hsi.py"
 pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
 maintainer="Dominik Honnef <dominik@honnef.co>"
-hostmakedepends="cmake pkg-config exiftool"
-makedepends="wxWidgets-devel tiff-devel libpng-devel libopenexr-devel
- exiv2-devel libfreeglut-devel libpano13-devel boost-devel MesaLib-devel
- lensfun-devel python-devel swig glew-devel libXmu-devel libXi-devel glu-devel"
+hostmakedepends="cmake pkg-config exiftool swig"
+makedepends="wxWidgets-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"
 depends="exiftool"
 license="GPL-2"
 homepage="http://hugin.sourceforge.net/"
 short_desc="An easy to use panoramic imaging toolchain"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}/${pkgname}-${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=f098aa0ede44010d3bb2bb38693177533fd776c45063a338c4c483d7e471ec29
+checksum=2cd93c110be95d439f9e68653f3738d059a26f5c28973f75475ef59cbaa2cbbd
 
 pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			sed -i 's|PTHREAD_MUTEX_RECURSIVE_NP|PTHREAD_MUTEX_RECURSIVE|' \
-				src/foreign/zthread/src/linux/FastRecursiveLock.h;;
-	esac
 	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