hugin: 2020.0.0-2 -> 2021.0.0-1

5 files changed, 27 insertions, 46 deletions

diff --git a/manualPorts/hugin/.footprint b/manualPorts/hugin/.footprint
index ce2f6b6..45dd127 100644
--- a/manualPorts/hugin/.footprint
+++ b/manualPorts/hugin/.footprint
@@ -35,10 +35,16 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/hugin/
 -rwxr-xr-x	root/root	usr/lib/hugin/libceleste.so.0.0
+-rwxr-xr-x	root/root	usr/lib/hugin/libhugin_python_interface.so.0.0
 -rwxr-xr-x	root/root	usr/lib/hugin/libhuginbase.so.0.0
 -rwxr-xr-x	root/root	usr/lib/hugin/libhuginbasewx.so.0.0
 -rwxr-xr-x	root/root	usr/lib/hugin/libicpfindlib.so.0.0
 -rwxr-xr-x	root/root	usr/lib/hugin/liblocalfeatures.so.0.0
+drwxr-xr-x	root/root	usr/lib/python3.9/
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/
+-rwxr-xr-x	root/root	usr/lib/python3.9/site-packages/_hsi.so
+-rwxr-xr-x	root/root	usr/lib/python3.9/site-packages/hpi.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/hsi.py
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/PTBatcherGUI.desktop
@@ -52,6 +58,7 @@ drwxr-xr-x	root/root	usr/share/hugin/data/
 -rw-r--r--	root/root	usr/share/hugin/data/default.setting
 -rw-r--r--	root/root	usr/share/hugin/data/duallens.assistant
 -rw-r--r--	root/root	usr/share/hugin/data/expressions.ini
+-rw-r--r--	root/root	usr/share/hugin/data/focus_stack.executor
 -rw-r--r--	root/root	usr/share/hugin/data/fused_layers.executor
 -rw-r--r--	root/root	usr/share/hugin/data/hdr_pano.executor
 -rw-r--r--	root/root	usr/share/hugin/data/hugin_exiftool_copy.arg
@@ -64,6 +71,12 @@ drwxr-xr-x	root/root	usr/share/hugin/data/
 -rw-r--r--	root/root	usr/share/hugin/data/normal_enblend_cubic.executor
 -rw-r--r--	root/root	usr/share/hugin/data/normal_layered_tiff.executor
 -rw-r--r--	root/root	usr/share/hugin/data/normal_smartblend.executor
+drwxr-xr-x	root/root	usr/share/hugin/data/plugins-templates/
+-rwxr-xr-x	root/root	usr/share/hugin/data/plugins-templates/dual_use.py
+-rwxr-xr-x	root/root	usr/share/hugin/data/plugins-templates/plugin_skeleton.py
+drwxr-xr-x	root/root	usr/share/hugin/data/plugins/
+-rwxr-xr-x	root/root	usr/share/hugin/data/plugins/top_five.py
+-rwxr-xr-x	root/root	usr/share/hugin/data/plugins/woa.py
 -rw-r--r--	root/root	usr/share/hugin/data/scanned.assistant
 -rw-r--r--	root/root	usr/share/hugin/data/scanned2.assistant
 -rw-r--r--	root/root	usr/share/hugin/data/stacked.assistant
@@ -532,10 +545,6 @@ drwxr-xr-x	root/root	usr/share/hugin/xrc/data/help_en_EN/
 -rw-r--r--	root/root	usr/share/hugin/xrc/preview_frame.xrc
 -rw-r--r--	root/root	usr/share/hugin/xrc/reset_dialog.xrc
 drwxr-xr-x	root/root	usr/share/icons/
-drwxr-xr-x	root/root	usr/share/icons/gnome/
-drwxr-xr-x	root/root	usr/share/icons/gnome/48x48/
-drwxr-xr-x	root/root	usr/share/icons/gnome/48x48/mimetypes/
--rw-r--r--	root/root	usr/share/icons/gnome/48x48/mimetypes/application-x-ptoptimizer-script.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/apps/
@@ -557,6 +566,8 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/hugin.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/ptbatcher.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/mimetypes/
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/mimetypes/application-x-ptoptimizer-script.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/hugin.svg
diff --git a/manualPorts/hugin/.md5sum b/manualPorts/hugin/.md5sum
index bcd66da..1cc3c10 100644
--- a/manualPorts/hugin/.md5sum
+++ b/manualPorts/hugin/.md5sum
@@ -1,2 +1 @@
-59e152871b74fb071bc086fc23a4774a  hugin-2020.0.0.tar.bz2
-974f4bfeb0939e86ecf4f1e85669031a  hugin-openexr3.patch
+166a8e795548cec566a06db38f0ed664  hugin-2021.0.0.tar.bz2
diff --git a/manualPorts/hugin/.signature b/manualPorts/hugin/.signature
index 555755e..5e28bdc 100644
--- a/manualPorts/hugin/.signature
+++ b/manualPorts/hugin/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/deepthought.pub
-RWQxCptPusLGGsMmzooZA62wAaff02sjYIKDUQpKNTMXro2A7btbhJiuArLZu7WhzH2Iui6UuVIRzEga9OSoK/n7zdnPvbZtrwE=
-SHA256 (Pkgfile) = 85533aaa7c7abd0b07f878909fc58e3dfb375d06c4a6d5764c6839d1215c174b
-SHA256 (.footprint) = f62fed3d07111114512962acefb0388c15f6961656895844b1da34c195c36af5
-SHA256 (hugin-2020.0.0.tar.bz2) = 283e7601259a7914cb075333424410928a439dc5f84216f33e2fe55501fbcacb
-SHA256 (hugin-openexr3.patch) = 8ae66f1d2da9368e0089a91ac96a3efb702f703affdcb368830c6de49aca6ce1
+RWQxCptPusLGGstEbY4hFVP0Tz1LpMoL0nY53OvfWJRtMOqSk6xgOg3wPT+xDAIaVE1N7t9Nr9Jk4D5da3pc9ZcdDH60TVvnwQE=
+SHA256 (Pkgfile) = 0cc9f317a4acfce9f277af0b4ce7c1a6acdc9c8af81d771e21f1b4dd35ec74cb
+SHA256 (.footprint) = 2646b89ccdb9cc2ee94cd3c9445e1c349f68e1a2a80c2e8391154b84e5f09edb
+SHA256 (hugin-2021.0.0.tar.bz2) = 047aea8a7fa47844b34ef27c19d3b697e84939dcb1fdbbeb2c204621b66eead9
diff --git a/manualPorts/hugin/Pkgfile b/manualPorts/hugin/Pkgfile
index 675ba6f..c1749b5 100644
--- a/manualPorts/hugin/Pkgfile
+++ b/manualPorts/hugin/Pkgfile
@@ -4,21 +4,21 @@
 # Depends on: wxgtk enblend-enfuse exiv2 libpano13 python glew desktop-file-utils swig
 
 name=hugin
-version=2020.0.0
-release=2
-source=("https://downloads.sourceforge.net/project/${name}/${name}/${name}-${version%.*}/${name}-${version}.tar.bz2" hugin-openexr3.patch)
+version=2021.0.0
+release=1
+source=("https://downloads.sourceforge.net/project/${name}/${name}/${name}-${version%.*}/${name}-${version}.tar.bz2")
 
 build() {
 
 	cd "${SRC}/${name}-${version}"
-	patch -p1 -i ../hugin-openexr3.patch
-	rm CMakeModules/FindZLIB.cmake
 	install -d build
 	cd build
 	cmake .. \
-		-DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DENABLE_LAPACK=yes
+		-DENABLE_LAPACK=yes \
+		-DBUILD_HSI=ON \
+		-DUSE_GDKBACKEND_X11=ON \
+		-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
 
 	make
 	make DESTDIR="${PKG}" install
diff --git a/manualPorts/hugin/hugin-openexr3.patch b/manualPorts/hugin/hugin-openexr3.patch
deleted file mode 100644
index 0a5c015..0000000
--- a/manualPorts/hugin/hugin-openexr3.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru hugin-2020.0.0.orig/CMakeModules/FindOpenEXR.cmake hugin-2020.0.0/CMakeModules/FindOpenEXR.cmake
---- hugin-2020.0.0.orig/CMakeModules/FindOpenEXR.cmake	2021-04-24 13:32:14.405277312 +0200
-+++ hugin-2020.0.0/CMakeModules/FindOpenEXR.cmake	2021-04-24 19:14:40.144215012 +0200
-@@ -10,6 +10,12 @@
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- 
-+FIND_PACKAGE(OpenEXR CONFIG REQUIRED)
-+IF (TARGET OpenEXR::OpenEXR)
-+    SET(OPENEXR_FOUND TRUE)
-+    SET(OPENEXR_INCLUDE_DIR OpenEXR::OpenEXR)
-+    SET(OPENEXR_LIBRARIES OpenEXR::OpenEXR)
-+ENDIF()
- 
- if (OPENEXR_INCLUDE_DIR AND OPENEXR_LIBRARIES)
-   # in cache already
-diff -ru hugin-2020.0.0.orig/CMakeModules/FindVIGRA.cmake hugin-2020.0.0/CMakeModules/FindVIGRA.cmake
---- hugin-2020.0.0.orig/CMakeModules/FindVIGRA.cmake	2021-04-24 13:32:14.405277312 +0200
-+++ hugin-2020.0.0/CMakeModules/FindVIGRA.cmake	2021-04-24 18:54:50.461698528 +0200
-@@ -74,7 +74,7 @@
-         OUTPUT_STRIP_TRAILING_WHITESPACE
-       )
-       STRING(TOLOWER "${OUTPUT_LDD_VIGRA}" OUTPUT_LDD_VIGRA_LOWER)
--      IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libilmimf")
-+      IF(NOT "${OUTPUT_LDD_VIGRA_LOWER}" MATCHES "libopenexr")
-         MESSAGE(FATAL_ERROR "Libvigraimpex found. But vigraimpex seems to compiled without OpenEXR support. OpenEXR support is required for Hugin.")
-       ENDIF()
-     ELSE()