luminance-hdr: updated to 2.6.0

Changes in 2.6.0
NEW: New tonemapping operator kimkautz08
NEW: New tonemapping operator lischinski06
NEW: New tonemapping operator vanhateren06
NEW: New tonemapping operator ferwerda96
NEW: Preview of created HDR in HDR Wizard
NEW: Post processing gamma and saturation

great speedup and better memory usage for all tonemapping operators
speedup for hdr creation
usual bug fixing

8 files changed, 69 insertions, 117 deletions

diff --git a/graphics/luminance-hdr/Makefile b/graphics/luminance-hdr/Makefile
index 0508686246e..3597fb054dd 100644
--- a/graphics/luminance-hdr/Makefile
+++ b/graphics/luminance-hdr/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2021/01/01 09:52:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.51 2021/01/03 18:52:31 adam Exp $
 
-DISTNAME=	luminance-hdr-2.4.0
-PKGREVISION=	46
+DISTNAME=	luminance-hdr-2.6.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qtpfsgui/}
 EXTRACT_SUFX=	.tar.bz2
@@ -11,9 +10,11 @@ HOMEPAGE=	http://qtpfsgui.sourceforge.net/
 COMMENT=	GUI application that aims to provide a workflow for HDR imaging
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=	pkg-config
-USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
+USE_LANGUAGES=	c c++
+USE_TOOLS+=	pkg-config
+
+CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/cfitsio/buildlink3.mk"
@@ -22,8 +23,10 @@ USE_CMAKE=	yes
 .include "../../graphics/libraw/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../math/eigen3/buildlink3.mk"
 .include "../../math/fftwf/buildlink3.mk"
 .include "../../math/gsl/buildlink3.mk"
+.include "../../parallel/openmp/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
 .include "../../x11/qt5-qtwebkit/buildlink3.mk"
diff --git a/graphics/luminance-hdr/PLIST b/graphics/luminance-hdr/PLIST
index 268d055db97..2076f726266 100644
--- a/graphics/luminance-hdr/PLIST
+++ b/graphics/luminance-hdr/PLIST
@@ -1,12 +1,37 @@
-@comment $NetBSD: PLIST,v 1.2 2018/01/01 22:29:37 rillig Exp $
+@comment $NetBSD: PLIST,v 1.3 2021/01/03 18:52:31 adam Exp $
 bin/luminance-hdr
 bin/luminance-hdr-cli
-share/applications/luminance-hdr.desktop
+share/appdata/net.sourceforge.qtpfsgui.LuminanceHDR.appdata.xml
+share/applications/net.sourceforge.qtpfsgui.LuminanceHDR.desktop
 share/icons/hicolor/48x48/apps/luminance-hdr.png
-share/luminance-hdr/AUTHORS
-share/luminance-hdr/Changelog
-share/luminance-hdr/LICENSE
-share/luminance-hdr/README
+share/luminance-hdr/doc/AUTHORS
+share/luminance-hdr/doc/Changelog
+share/luminance-hdr/doc/LICENSE
+share/luminance-hdr/doc/README.md
+share/luminance-hdr/hdrhtml/hdrhtml_c_b2.csv
+share/luminance-hdr/hdrhtml/hdrhtml_c_b3.csv
+share/luminance-hdr/hdrhtml/hdrhtml_c_b4.csv
+share/luminance-hdr/hdrhtml/hdrhtml_c_b5.csv
+share/luminance-hdr/hdrhtml/hdrhtml_default_templ/hdrhtml_image_templ.html
+share/luminance-hdr/hdrhtml/hdrhtml_default_templ/hdrhtml_page_templ.html
+share/luminance-hdr/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_assets/hdr_viewer.css
+share/luminance-hdr/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_assets/hdr_viewer.js
+share/luminance-hdr/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_assets/information-red.png
+share/luminance-hdr/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_assets/information.png
+share/luminance-hdr/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_assets/loading-spinner.gif
+share/luminance-hdr/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_assets/mootools-1.2.4.js
+share/luminance-hdr/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_assets/mouse2touch.js
+share/luminance-hdr/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_assets/slider-black.png
+share/luminance-hdr/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_assets/slider-red.png
+share/luminance-hdr/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_assets/slider-white.png
+share/luminance-hdr/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_image_templ.html
+share/luminance-hdr/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_image_templ_slider-above.html
+share/luminance-hdr/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_page_templ.html
+share/luminance-hdr/hdrhtml/hdrhtml_hdrlabs_templ/hdrhtml_page_templ_short.html
+share/luminance-hdr/hdrhtml/hdrhtml_t_b2.csv
+share/luminance-hdr/hdrhtml/hdrhtml_t_b3.csv
+share/luminance-hdr/hdrhtml/hdrhtml_t_b4.csv
+share/luminance-hdr/hdrhtml/hdrhtml_t_b5.csv
 share/luminance-hdr/help/en/README
 share/luminance-hdr/help/en/additional.html
 share/luminance-hdr/help/en/basics.html
@@ -28,26 +53,36 @@ share/luminance-hdr/help/en/external.png
 share/luminance-hdr/help/en/faq.html
 share/luminance-hdr/help/en/features.html
 share/luminance-hdr/help/en/hints.html
-share/luminance-hdr/help/en/images/EditingTools-0.jpeg
-share/luminance-hdr/help/en/images/EditingTools-1.jpeg
-share/luminance-hdr/help/en/images/EditingTools-2.jpeg
-share/luminance-hdr/help/en/images/Ghost-0.jpeg
-share/luminance-hdr/help/en/images/NoGhost-0.jpeg
 share/luminance-hdr/help/en/images/batch-hdr.png
 share/luminance-hdr/help/en/images/batch-tmo.png
 share/luminance-hdr/help/en/images/color_management.png
 share/luminance-hdr/help/en/images/copy-exif.png
 share/luminance-hdr/help/en/images/cropping_frame.png
+share/luminance-hdr/help/en/images/edit_menu.png
+share/luminance-hdr/help/en/images/editingtools-1.png
+share/luminance-hdr/help/en/images/editingtools-2.png
+share/luminance-hdr/help/en/images/editingtools-3.png
+share/luminance-hdr/help/en/images/editingtools-4.png
+share/luminance-hdr/help/en/images/editingtools-5.png
+share/luminance-hdr/help/en/images/editingtools-6.png
+share/luminance-hdr/help/en/images/hdrwizard.png
 share/luminance-hdr/help/en/images/mainwin.png
 share/luminance-hdr/help/en/images/not-translated-menu-item.png
+share/luminance-hdr/help/en/images/preferences-menu.png
 share/luminance-hdr/help/en/images/preferences.png
 share/luminance-hdr/help/en/images/prefs-cms.png
 share/luminance-hdr/help/en/images/prefs-ext.png
+share/luminance-hdr/help/en/images/prefs-fast-export.png
 share/luminance-hdr/help/en/images/prefs-hdr.png
+share/luminance-hdr/help/en/images/prefs-raw-color.png
+share/luminance-hdr/help/en/images/prefs-raw-corrections.png
+share/luminance-hdr/help/en/images/prefs-raw-general.png
 share/luminance-hdr/help/en/images/prefs-raw.png
 share/luminance-hdr/help/en/images/prefs-tm.png
+share/luminance-hdr/help/en/images/prefs-ui.png
 share/luminance-hdr/help/en/images/projectiveTransformationDialog.png
 share/luminance-hdr/help/en/images/resize.png
+share/luminance-hdr/help/en/images/tonemappingpanel.png
 share/luminance-hdr/help/en/images/translated-menu-item.png
 share/luminance-hdr/help/en/index.html
 share/luminance-hdr/help/en/manual.html
@@ -55,6 +90,7 @@ share/luminance-hdr/help/en/menu.xml
 share/luminance-hdr/help/en/news.html
 share/luminance-hdr/help/en/prefs.html
 share/luminance-hdr/help/en/prefs_cms.html
+share/luminance-hdr/help/en/prefs_fast_export.html
 share/luminance-hdr/help/en/prefs_hdr.html
 share/luminance-hdr/help/en/prefs_rawconversion.html
 share/luminance-hdr/help/en/prefs_tonemapping.html
@@ -63,9 +99,17 @@ share/luminance-hdr/help/en/prefs_ui.html
 share/luminance-hdr/help/en/projective_transformation.html
 share/luminance-hdr/help/en/style.css
 share/luminance-hdr/help/en/tmap_ref.html
+share/luminance-hdr/help/en/tmap_ref_ashikhmin.html
 share/luminance-hdr/help/en/tmap_ref_drago.html
 share/luminance-hdr/help/en/tmap_ref_durand.html
+share/luminance-hdr/help/en/tmap_ref_fattal.html
+share/luminance-hdr/help/en/tmap_ref_ferradans.html
+share/luminance-hdr/help/en/tmap_ref_mai.html
 share/luminance-hdr/help/en/tmap_ref_mantiuk06.html
+share/luminance-hdr/help/en/tmap_ref_mantiuk08.html
+share/luminance-hdr/help/en/tmap_ref_pattanaik.html
+share/luminance-hdr/help/en/tmap_ref_reinhard02.html
+share/luminance-hdr/help/en/tmap_ref_reinhard05.html
 share/luminance-hdr/help/en/tonemapping.html
 share/luminance-hdr/help/en/tonemapping_batch.html
 share/luminance-hdr/help/en/tonemapping_cli.html
@@ -80,14 +124,10 @@ share/luminance-hdr/i18n/lang_fr.qm
 share/luminance-hdr/i18n/lang_hu.qm
 share/luminance-hdr/i18n/lang_id.qm
 share/luminance-hdr/i18n/lang_it.qm
+share/luminance-hdr/i18n/lang_nl.qm
 share/luminance-hdr/i18n/lang_pl.qm
 share/luminance-hdr/i18n/lang_pt_BR.qm
 share/luminance-hdr/i18n/lang_ro.qm
 share/luminance-hdr/i18n/lang_ru.qm
 share/luminance-hdr/i18n/lang_tr.qm
 share/luminance-hdr/i18n/lang_zh.qm
-share/luminance-hdr/i18n/qt_fi.qm
-share/luminance-hdr/i18n/qt_it.qm
-share/luminance-hdr/i18n/qt_ro.qm
-share/luminance-hdr/i18n/qt_tr.qm
-share/luminance-hdr/i18n/qt_zh.qm
diff --git a/graphics/luminance-hdr/distinfo b/graphics/luminance-hdr/distinfo
index d29e323bed5..c915278d8bb 100644
--- a/graphics/luminance-hdr/distinfo
+++ b/graphics/luminance-hdr/distinfo
@@ -1,11 +1,6 @@
-$NetBSD: distinfo,v 1.4 2019/12/22 22:26:31 joerg Exp $
+$NetBSD: distinfo,v 1.5 2021/01/03 18:52:31 adam Exp $
 
-SHA1 (luminance-hdr-2.4.0.tar.bz2) = 58e711531bd20be80b4761137c9c684b4b67000f
-RMD160 (luminance-hdr-2.4.0.tar.bz2) = 41fbd29ececa8f8de89dccabd6b48a66cc870307
-SHA512 (luminance-hdr-2.4.0.tar.bz2) = aa14a13d12ba382f5f8dcb79a57aa68864678db62f036ac2d8b8959da76f20b938481932a6fff3861eb6dbc5a1d4f06bc1f3e3ca9a6ce4f7a27a9db736aa8702
-Size (luminance-hdr-2.4.0.tar.bz2) = 10507522 bytes
-SHA1 (patch-CMakeLists.txt) = 786aa34e8ddbb8a313c915839d400231488a2ee6
-SHA1 (patch-src_Exif_ExifOperations.cpp) = ab616e59609b9e03ae7b2eee4e2257d8a72aab9e
-SHA1 (patch-src_HelpBrowser_CMakeLists.txt) = 57277fd03e6c201fb6fadc3df169276c358460fa
-SHA1 (patch-src_MainCli_commandline.cpp) = bbbe118f6712381e9324629d921d934d73e48da8
-SHA1 (patch-src_TransplantExif_TransplantExifDialog.cpp) = 8eab50ef39ca5328cd3f1f333b3992e8e5250867
+SHA1 (luminance-hdr-2.6.0.tar.bz2) = 18333410173cbc3680d3b7313a6b0a2cf68e043d
+RMD160 (luminance-hdr-2.6.0.tar.bz2) = b1ad15d37434524c5793685e035692c5fff579d6
+SHA512 (luminance-hdr-2.6.0.tar.bz2) = 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1
+Size (luminance-hdr-2.6.0.tar.bz2) = 11556372 bytes
diff --git a/graphics/luminance-hdr/patches/patch-CMakeLists.txt b/graphics/luminance-hdr/patches/patch-CMakeLists.txt
deleted file mode 100644
index ec151eab757..00000000000
--- a/graphics/luminance-hdr/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2017/12/19 09:47:55 markd Exp $
-
-Fix build error with Qt >= 5.3.2
-tests require gtest, so make optional
-
---- CMakeLists.txt.orig	2015-09-10 04:26:44.095679440 +0000
-+++ CMakeLists.txt
-@@ -29,6 +29,7 @@ find_package(Qt5Xml)
- find_package(Qt5Sql)
- find_package(Qt5Network)
- find_package(Qt5LinguistTools)
-+find_package(Qt5PrintSupport)
- IF(WIN32)
- 	find_package(Qt5WinExtras)
- ENDIF()
-@@ -165,10 +166,12 @@ SET(LUMINANCE_HDR_H ${LUMINANCE_HDR_H}
- SET(LUMINANCE_HDR_RCCS icons.qrc)
- QT5_ADD_RESOURCES(LUMINANCE_HDR_RCCS_SRCS ${LUMINANCE_HDR_RCCS})
- 
--ENABLE_TESTING()
--
- ADD_SUBDIRECTORY(src)
--ADD_SUBDIRECTORY(test)
-+
-+IF(ENABLE_UNIT_TEST)
-+    ENABLE_TESTING()
-+    ADD_SUBDIRECTORY(test)
-+ENDIF(ENABLE_UNIT_TEST)
- 
- # translations
- FILE(GLOB LUMINANCE_TS i18n/lang_*.ts)
diff --git a/graphics/luminance-hdr/patches/patch-src_Exif_ExifOperations.cpp b/graphics/luminance-hdr/patches/patch-src_Exif_ExifOperations.cpp
deleted file mode 100644
index 829b5a7bd79..00000000000
--- a/graphics/luminance-hdr/patches/patch-src_Exif_ExifOperations.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_Exif_ExifOperations.cpp,v 1.1 2019/12/22 22:26:32 joerg Exp $
-
---- src/Exif/ExifOperations.cpp.orig	2019-12-22 21:18:32.752281082 +0000
-+++ src/Exif/ExifOperations.cpp
-@@ -35,6 +35,7 @@
- #include <boost/assign/list_of.hpp>
- 
- #include <exif.hpp>
-+#include <exiv2/error.hpp>
- #include <image.hpp>
- 
- #include "ExifOperations.h"
diff --git a/graphics/luminance-hdr/patches/patch-src_HelpBrowser_CMakeLists.txt b/graphics/luminance-hdr/patches/patch-src_HelpBrowser_CMakeLists.txt
deleted file mode 100644
index 35b73ce907a..00000000000
--- a/graphics/luminance-hdr/patches/patch-src_HelpBrowser_CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_HelpBrowser_CMakeLists.txt,v 1.1 2016/02/07 22:10:47 markd Exp $
-
-Fix build error with Qt >= 5.3.2
-
---- src/HelpBrowser/CMakeLists.txt.orig	2014-01-27 20:20:46.000000000 +0000
-+++ src/HelpBrowser/CMakeLists.txt
-@@ -29,7 +29,7 @@ QT5_WRAP_UI(FILES_UI_H ${FILES_UI})
- 
- 
- ADD_LIBRARY(helpbrowser ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H} ${FILES_HXX})
--qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets)
-+qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets PrintSupport)
- 
- SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE)
- SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} helpbrowser PARENT_SCOPE)
diff --git a/graphics/luminance-hdr/patches/patch-src_MainCli_commandline.cpp b/graphics/luminance-hdr/patches/patch-src_MainCli_commandline.cpp
deleted file mode 100644
index 1d4fa813efa..00000000000
--- a/graphics/luminance-hdr/patches/patch-src_MainCli_commandline.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_MainCli_commandline.cpp,v 1.1 2016/04/03 12:47:45 joerg Exp $
-
---- src/MainCli/commandline.cpp.orig	2016-04-02 18:17:21.047535103 +0000
-+++ src/MainCli/commandline.cpp
-@@ -47,6 +47,10 @@
- #include <io.h>
- #endif
- 
-+#ifdef __NetBSD__
-+#define getopt_long_only getopt_long
-+#endif
-+
- namespace
- {
- void printErrorAndExit(const QString& error_str)
diff --git a/graphics/luminance-hdr/patches/patch-src_TransplantExif_TransplantExifDialog.cpp b/graphics/luminance-hdr/patches/patch-src_TransplantExif_TransplantExifDialog.cpp
deleted file mode 100644
index 0d1d5285a5a..00000000000
--- a/graphics/luminance-hdr/patches/patch-src_TransplantExif_TransplantExifDialog.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_TransplantExif_TransplantExifDialog.cpp,v 1.1 2019/12/22 22:26:32 joerg Exp $
-
---- src/TransplantExif/TransplantExifDialog.cpp.orig	2019-12-22 21:29:09.145132687 +0000
-+++ src/TransplantExif/TransplantExifDialog.cpp
-@@ -26,6 +26,8 @@
- #include <QFileInfo>
- #include <image.hpp>
- #include <exif.hpp>
-+#include <exiv2/error.hpp>
-+#include <exiv2/version.hpp>
- 
- #include "Common/global.h"
- #include "Common/config.h"