Changes 2016.0.0:

The first improvement concerns icc color profiles: Hugin has already copied the icc profile into the output file when stitching panoramas. Now also the display in the GUIs takes the icc profile into account. Celeste_standalone and cpfind read now also the icc profile and use it during its processings.
Beside the known output options Hugin now includes a user defined output sequence. With this option the user can create more flexible variants for the output. As an example a zero-noise output sequence is delivered with Hugin 2016.0.
Some buttons in the Hugin GUI now have a context menu for easier access to some function:
Show all in the fast preview window to allow better interaction with stacked projects.
Celeste button in the cp tab (panorama editor): the button can now be used to create control points or to clean control points with celeste or statistical methods.
The identify tool in the fast preview window now also shows the image numbers on top of the images. (This can be suppressed by pressing the alt button).

11 files changed, 131 insertions, 52 deletions

diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 27c25269946..d430df5eda1 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2015/10/18 15:56:56 adam Exp $
+# $NetBSD: Makefile,v 1.57 2016/04/07 19:23:26 adam Exp $
 
-DISTNAME=	hugin-2015.0.0
+DISTNAME=	hugin-2016.0.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=hugin/}
 EXTRACT_SUFX=	.tar.bz2
@@ -38,6 +38,7 @@ SUBST_SED.apple=	-e 's,(APPLE),(ELPPA),g'
 .include "../../graphics/glut/buildlink3.mk"
 .include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/lensfun/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
 .include "../../graphics/libpano13/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/vigra/buildlink3.mk"
diff --git a/graphics/hugin/PLIST b/graphics/hugin/PLIST
index 3b9249ac795..e199ec41dbd 100644
--- a/graphics/hugin/PLIST
+++ b/graphics/hugin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2015/12/24 12:59:29 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2016/04/07 19:23:26 adam Exp $
 bin/PTBatcherGUI
 bin/align_image_stack
 bin/autooptimiser
@@ -74,9 +74,15 @@ share/applications/PTBatcherGUI.desktop
 share/applications/calibrate_lens_gui.desktop
 share/applications/hugin.desktop
 share/applications/pto_gen.desktop
+share/hugin/data/blended_stacks.executor
 share/hugin/data/celeste.model
 share/hugin/data/default.setting
+share/hugin/data/fused_layers.executor
+share/hugin/data/hdr_pano.executor
 share/hugin/data/hugin_exiftool_copy.arg
+share/hugin/data/normal_enblend.executor
+share/hugin/data/normal_smartblend.executor
+share/hugin/data/zeronoise.executor
 share/hugin/xrc/about.xrc
 share/hugin/xrc/batch_frame.xrc
 share/hugin/xrc/batch_menu.xrc
@@ -607,6 +613,10 @@ share/hugin/xrc/data/preview_white_balance.png
 share/hugin/xrc/data/preview_white_balance_small.png
 share/hugin/xrc/data/ptbatcher.ico
 share/hugin/xrc/data/ptbatcher.png
+share/hugin/xrc/data/ptbatcher_pause.ico
+share/hugin/xrc/data/ptbatcher_pause.png
+share/hugin/xrc/data/ptbatcher_running.ico
+share/hugin/xrc/data/ptbatcher_running.png
 share/hugin/xrc/data/pto_icon.ico
 share/hugin/xrc/data/pto_icon.png
 share/hugin/xrc/data/redo.png
diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo
index 61647eec2eb..da24586d403 100644
--- a/graphics/hugin/distinfo
+++ b/graphics/hugin/distinfo
@@ -1,17 +1,19 @@
-$NetBSD: distinfo,v 1.15 2015/11/04 17:41:19 agc Exp $
+$NetBSD: distinfo,v 1.16 2016/04/07 19:23:26 adam Exp $
 
-SHA1 (hugin-2015.0.0.tar.bz2) = be7153a0791f2147153e93e8711912ef23b60b61
-RMD160 (hugin-2015.0.0.tar.bz2) = d5780454dc6e2c3c5315d3c5b755d5f6fd17bf1c
-SHA512 (hugin-2015.0.0.tar.bz2) = bb2acf4dea80d43280778f67594dd1ddb0c2e186bcbaafe460fe47e0bd464ae2191b9b25344245e7267316e602ac2179cc838a0dcecb0d408c2206890a5ab6a2
-Size (hugin-2015.0.0.tar.bz2) = 10611519 bytes
-SHA1 (patch-CMakeLists.txt) = 3edb8ff7c07ca499221fe7c5fd8faf0de120d168
-SHA1 (patch-CMakeModules_FindGLUT.cmake) = 22185536efa1883f84bb97fe31efc3ef8df1f9fd
+SHA1 (hugin-2016.0.0.tar.bz2) = 6811e19f1c10da163e1c4228779beb4c12448db9
+RMD160 (hugin-2016.0.0.tar.bz2) = 9d73e78accbfae2194b347d3d7f7c3932adc018a
+SHA512 (hugin-2016.0.0.tar.bz2) = 029b30c39bb29de5cfb3c8d7d713d58662abf14311279e984f62cf7287edb9c9efdafdcb6990ba320d6098c4dd1de09dd9ceec9925eb52dafd234261a9615fd1
+Size (hugin-2016.0.0.tar.bz2) = 10508576 bytes
+SHA1 (patch-CMakeLists.txt) = 54f11138438c2650673a4056f85fa7e6bf869d00
 SHA1 (patch-CMakeModules_FindPNG.cmake) = 811fd3cf6f819b31129e1560cd8acd1f7ee6defc
 SHA1 (patch-doc_deghosting_mask.pod) = fe5462b10966420b0cf3fab004854d9dab3bfb4f
 SHA1 (patch-src_hugin1_base__wx_StitchingExecutor.cpp) = c30a62b1da413fce9524d7d558ec5bb1f21eb65e
+SHA1 (patch-src_hugin1_base__wx_platform.cpp) = f0f544438a4818e9bbad9fd0f7fb0af06f1bdf4e
 SHA1 (patch-src_hugin1_base__wx_wxPanoCommand.cpp) = d5bf8f747ae86338e728c472d3dc04bf4c84f182
 SHA1 (patch-src_hugin1_calibrate__lens_LensCalFrame.cpp) = 9b815a681317cb19880e7bb6ef170bc14d01b28b
-SHA1 (patch-src_hugin1_icpfind_AutoCtrlPointCreator.cpp) = 213399693c9b7e680d472ee281183fde42e58e9a
+SHA1 (patch-src_hugin1_hugin_CPEditorPanel.cpp) = d373c00d4783b3edc1bad5a67339163a0c23d8c5
+SHA1 (patch-src_hugin1_hugin_GLPreviewFrame.cpp) = 47bae7f5c57f8c7028dee4451840dcb2a2bb1f39
+SHA1 (patch-src_hugin1_icpfind_AutoCtrlPointCreator.cpp) = 2016aec03f6ef24fc7e70b289702a87df48b382a
 SHA1 (patch-src_hugin1_ptbatcher_BatchFrame.cpp) = 51ce24f1eb99cc5c0151758299eb1ecc34128171
-SHA1 (patch-src_tools_align_image_stack.cpp) = d83099c308665173fde059502a89b90adf167736
-SHA1 (patch-src_tools_tca__correct.cpp) = b5b39c5cc7096903bb7d537230eeb6328677b2d2
+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 aab89d5d035..906196f4d5e 100644
--- a/graphics/hugin/patches/patch-CMakeLists.txt
+++ b/graphics/hugin/patches/patch-CMakeLists.txt
@@ -1,11 +1,22 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2015/10/18 15:56:56 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2016/04/07 19:23:26 adam Exp $
 
 Correct 'man' path.
 Do not make an application bundle on OS X.
 
---- CMakeLists.txt.orig	2013-06-26 11:19:08.000000000 +0000
+--- CMakeLists.txt.orig	2016-01-23 08:37:46.000000000 +0000
 +++ CMakeLists.txt
-@@ -423,7 +423,7 @@ IF (NOT MANDIR AND NOT $ENV{MANDIR} STRE
+@@ -2,10 +2,6 @@
+ # require at least cmake 2.8
+ cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR )
+ 
+-# prevent in-tree building
+-if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
+-    message(FATAL_ERROR "In-source builds are not allowed.")
+-endif()
+ 
+ if(COMMAND cmake_policy)
+   cmake_policy(SET CMP0003 NEW)
+@@ -518,7 +514,7 @@ IF (NOT MANDIR AND NOT $ENV{MANDIR} STRE
  ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
      SET (MANDIR "man")
  ELSE(NOT MANDIR AND NOT $ENV{MANDIR} STREQUAL "")
@@ -14,7 +25,7 @@ Do not make an application bundle on OS X.
  ENDIF(NOT MANDIR AND NOT $ENV{MANDIR} STREQUAL "")
  
  SET(LOCALEDIR share/locale) 
-@@ -447,16 +447,6 @@ IF (APPLE)
+@@ -543,16 +539,6 @@ IF (APPLE)
    ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE)
  ENDIF (APPLE)
  
diff --git a/graphics/hugin/patches/patch-CMakeModules_FindGLUT.cmake b/graphics/hugin/patches/patch-CMakeModules_FindGLUT.cmake
deleted file mode 100644
index 1a8bb750a13..00000000000
--- a/graphics/hugin/patches/patch-CMakeModules_FindGLUT.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-CMakeModules_FindGLUT.cmake,v 1.1 2015/10/18 15:56:56 adam Exp $
-
-Fix configure phase on OS X.
-
---- CMakeModules/FindGLUT.cmake.orig	2014-02-12 17:14:43.000000000 +0000
-+++ CMakeModules/FindGLUT.cmake
-@@ -31,10 +31,7 @@ ELSE (WIN32)
-   

-   IF (APPLE)

-     # These values for Apple could probably do with improvement.

--    FIND_PATH( GLUT_INCLUDE_DIR glut.h

--      /System/Library/Frameworks/GLUT.framework/Versions/A/Headers

--      ${OPENGL_LIBRARY_DIR}

--      )

-+    SET(GLUT_INCLUDE_DIR "/usr/include")

-     SET(GLUT_glut_LIBRARY "-framework GLUT" CACHE STRING "GLUT library for OSX") 

-     SET(GLUT_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX")

-   ELSE (APPLE)

diff --git a/graphics/hugin/patches/patch-src_hugin1_base__wx_platform.cpp b/graphics/hugin/patches/patch-src_hugin1_base__wx_platform.cpp
new file mode 100644
index 00000000000..003c7d9e02c
--- /dev/null
+++ b/graphics/hugin/patches/patch-src_hugin1_base__wx_platform.cpp
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_hugin1_base__wx_platform.cpp,v 1.1 2016/04/07 19:23:26 adam Exp $
+
+Re-order includes to fix building.
+
+--- src/hugin1/base_wx/platform.cpp.orig	2016-02-19 22:26:02.000000000 +0000
++++ src/hugin1/base_wx/platform.cpp
+@@ -24,9 +24,9 @@
+  *
+  */
+ 
+-#include "platform.h"
+ 
+ #include <hugin_utils/utils.h>
++#include "platform.h"
+ 
+ #if defined __WXMAC__ || defined __WXOSX_COCOA__
+ 
diff --git a/graphics/hugin/patches/patch-src_hugin1_hugin_CPEditorPanel.cpp b/graphics/hugin/patches/patch-src_hugin1_hugin_CPEditorPanel.cpp
new file mode 100644
index 00000000000..81862d8d6f6
--- /dev/null
+++ b/graphics/hugin/patches/patch-src_hugin1_hugin_CPEditorPanel.cpp
@@ -0,0 +1,32 @@
+$NetBSD: patch-src_hugin1_hugin_CPEditorPanel.cpp,v 1.1 2016/04/07 19:23:26 adam Exp $
+
+Re-order includes to fix building.
+
+--- src/hugin1/hugin/CPEditorPanel.cpp.orig	2016-02-19 22:28:54.000000000 +0000
++++ src/hugin1/hugin/CPEditorPanel.cpp
+@@ -34,6 +34,12 @@
+ #include "panoinc.h"
+ // both includes above need to come before other wx includes on OSX
+ 
++// more vigra include if needed
++#include "vigra/cornerdetection.hxx"
++#include "vigra/localminmax.hxx"
++#include "vigra_ext/openmp_vigra.h"
++#include "vigra_ext/Correlation.h"
++#include "vigra_ext/cms.h"
+ // hugin's
+ #include "hugin/huginApp.h"
+ #include "hugin/config_defaults.h"
+@@ -54,12 +60,6 @@
+ #include <float.h>
+ #include <vector>
+ 
+-// more vigra include if needed
+-#include "vigra/cornerdetection.hxx"
+-#include "vigra/localminmax.hxx"
+-#include "vigra_ext/openmp_vigra.h"
+-#include "vigra_ext/Correlation.h"
+-#include "vigra_ext/cms.h"
+ 
+ // Celeste header
+ #include "Celeste.h"
diff --git a/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp b/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp
new file mode 100644
index 00000000000..d355d469d5f
--- /dev/null
+++ b/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp
@@ -0,0 +1,24 @@
+$NetBSD: patch-src_hugin1_hugin_GLPreviewFrame.cpp,v 1.1 2016/04/07 19:23:26 adam Exp $
+
+Re-order includes to fix building.
+
+--- src/hugin1/hugin/GLPreviewFrame.cpp.orig	2016-02-19 22:31:49.000000000 +0000
++++ src/hugin1/hugin/GLPreviewFrame.cpp
+@@ -41,6 +41,8 @@
+ #include "panoinc_WX.h"
+ #include "panoinc.h"
+ 
++#include "vigra_ext/InterestPoints.h"
++#include "vigra_ext/Correlation.h"
+ #include "base_wx/platform.h"
+ #include "base_wx/wxPlatform.h"
+ #include "base_wx/LensTools.h"
+@@ -65,8 +67,6 @@
+ #include "hugin/PanoOperation.h"
+ #include "hugin/PanoOutputDialog.h"
+ #include "base_wx/PTWXDlg.h"
+-#include "vigra_ext/InterestPoints.h"
+-#include "vigra_ext/Correlation.h"
+ #include "algorithms/control_points/CleanCP.h"
+ #include "hugin_utils/openmp_lock.h"
+ 
diff --git a/graphics/hugin/patches/patch-src_hugin1_icpfind_AutoCtrlPointCreator.cpp b/graphics/hugin/patches/patch-src_hugin1_icpfind_AutoCtrlPointCreator.cpp
index 0c8117dd88f..3013379fcbb 100644
--- a/graphics/hugin/patches/patch-src_hugin1_icpfind_AutoCtrlPointCreator.cpp
+++ b/graphics/hugin/patches/patch-src_hugin1_icpfind_AutoCtrlPointCreator.cpp
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_hugin1_icpfind_AutoCtrlPointCreator.cpp,v 1.2 2015/10/18 15:56:56 adam Exp $
+$NetBSD: patch-src_hugin1_icpfind_AutoCtrlPointCreator.cpp,v 1.3 2016/04/07 19:23:26 adam Exp $
 
 Fix building with Clang.
 
---- src/hugin1/icpfind/AutoCtrlPointCreator.cpp.orig	2014-06-14 11:02:49.000000000 +0000
+--- src/hugin1/icpfind/AutoCtrlPointCreator.cpp.orig	2016-02-19 22:03:11.000000000 +0000
 +++ src/hugin1/icpfind/AutoCtrlPointCreator.cpp
 @@ -28,7 +28,7 @@
  #include "panoinc.h"
  
  #include <fstream>
--#ifdef __GNUC__
-+#if defined(__GNUC__) && !defined(__clang__)
+-#if defined (__GNUC__) && !defined (__FreeBSD__)
++#if defined(__GNUC__) && !defined(__FreeBSD__) && !defined(__clang__)
  #include <ext/stdio_filebuf.h>
  #endif
  
diff --git a/graphics/hugin/patches/patch-src_tools_align_image_stack.cpp b/graphics/hugin/patches/patch-src_tools_align_image_stack.cpp
index 3159f344bca..98f3e69ac99 100644
--- a/graphics/hugin/patches/patch-src_tools_align_image_stack.cpp
+++ b/graphics/hugin/patches/patch-src_tools_align_image_stack.cpp
@@ -1,21 +1,21 @@
-$NetBSD: patch-src_tools_align_image_stack.cpp,v 1.1 2015/10/18 15:56:56 adam Exp $
+$NetBSD: patch-src_tools_align_image_stack.cpp,v 1.2 2016/04/07 19:23:26 adam Exp $
 
 Avoid conflict with another variable called 'lock'.
 
---- src/tools/align_image_stack.cpp.orig	2015-06-20 19:13:37.000000000 +0000
+--- src/tools/align_image_stack.cpp.orig	2016-02-19 22:03:11.000000000 +0000
 +++ src/tools/align_image_stack.cpp
-@@ -121,7 +121,7 @@ static void usage(const char* name)
+@@ -113,7 +113,7 @@ static void usage(const char* name)
  }
  
  typedef std::multimap<double, vigra::Diff2D> MapPoints;
 -static hugin_omp::Lock lock;
 +static hugin_omp::Lock mylock;
  
- template <class ImageType>
- void FineTuneInterestPoints(Panorama& pano,
-@@ -193,7 +193,7 @@ void FineTuneInterestPoints(Panorama& pa
+ namespace detail
+ {
+@@ -202,7 +202,7 @@ void FineTuneInterestPoints(HuginBase::P
                         res.maxpos.y,
-                        stereo ? ControlPoint::Y : ControlPoint::X_Y);
+                        stereo ? HuginBase::ControlPoint::Y : HuginBase::ControlPoint::X_Y);
          {
 -            hugin_omp::ScopedLock sl(lock);
 +            hugin_omp::ScopedLock sl(mylock);
diff --git a/graphics/hugin/patches/patch-src_tools_tca__correct.cpp b/graphics/hugin/patches/patch-src_tools_tca__correct.cpp
index 2061c384c7a..e605bd68309 100644
--- a/graphics/hugin/patches/patch-src_tools_tca__correct.cpp
+++ b/graphics/hugin/patches/patch-src_tools_tca__correct.cpp
@@ -1,11 +1,11 @@
-$NetBSD: patch-src_tools_tca__correct.cpp,v 1.1 2015/10/18 15:56:56 adam Exp $
+$NetBSD: patch-src_tools_tca__correct.cpp,v 1.2 2016/04/07 19:23:26 adam Exp $
 
 Avoid conflict with another variable called 'lock'.
 
---- src/tools/tca_correct.cpp.orig	2015-06-20 19:58:52.000000000 +0000
+--- src/tools/tca_correct.cpp.orig	2016-02-19 22:03:11.000000000 +0000
 +++ src/tools/tca_correct.cpp
-@@ -465,7 +465,7 @@ static void usage(const char* name)
-          << "    commandline arguments for fulla" << endl;
+@@ -449,7 +449,7 @@ static void usage(const char* name)
+          << "    commandline arguments for fulla" << std::endl;
  }
  
 -static hugin_omp::Lock lock;
@@ -13,12 +13,12 @@ Avoid conflict with another variable called 'lock'.
  typedef std::multimap<double, vigra::Diff2D> MapPoints;
  
  template <class ImageType>
-@@ -584,7 +584,7 @@ void createCtrlPoints(Panorama& pano, co
+@@ -567,7 +567,7 @@ void createCtrlPoints(HuginBase::Panoram
          }
          if (!cps.empty())
          {
 -            hugin_omp::ScopedLock sl(lock);
 +            hugin_omp::ScopedLock sl(mylock);
-             for (CPVector::const_iterator it = cps.begin(); it != cps.end(); ++it)
+             for (HuginBase::CPVector::const_iterator it = cps.begin(); it != cps.end(); ++it)
              {
                  pano.addCtrlPoint(*it);