Date: Sat, 22 Nov 2025 16:01:54 +0000 From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a7f8b1cda355 - main - graphics/hugin: update to 2025.0.0 Message-ID: <6921de72.37f43.55093996@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=a7f8b1cda3550e1ccf3f3c5d5a4e1d6adf8d6c26 commit a7f8b1cda3550e1ccf3f3c5d5a4e1d6adf8d6c26 Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2025-10-05 00:34:07 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2025-11-22 16:01:28 +0000 graphics/hugin: update to 2025.0.0 - add a LAPACK option to use a LAPACK-based solver in levmar over the built in one; this improves numerical stability - new binary hugin_toolbox - dependencies graphics/libpano13 and graphics/vigra must be updated to their most recent versions for the build to succeed Changelog: https://groups.google.com/g/hugin-ptx/c/kHBjmb_3k_g/m/LdNmvDxWAQAJ --- graphics/hugin/Makefile | 27 +++++---- graphics/hugin/distinfo | 6 +- graphics/hugin/files/patch-CMakeLists.txt | 11 ---- graphics/hugin/pkg-plist | 98 ++++++++++++++----------------- 4 files changed, 61 insertions(+), 81 deletions(-) diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index c44c24280485..f72c76ab3d16 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -1,6 +1,5 @@ PORTNAME= hugin -DISTVERSION= 2024.0.1 -PORTREVISION= 7 +DISTVERSION= 2025.0.0 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} @@ -12,13 +11,11 @@ LICENSE= GPLv2 LIB_DEPENDS= libOpenEXR.so:graphics/openexr \ libImath.so:math/Imath \ - libboost_thread.so:devel/boost-libs \ liblcms2.so:graphics/lcms2 \ libexiv2.so:graphics/exiv2 \ libfftw3.so:math/fftw3 \ libpano13.so:graphics/libpano13 \ libvigraimpex.so:graphics/vigra \ - libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libflann.so:math/flann \ liblz4.so:archivers/liblz4 @@ -27,8 +24,9 @@ RUN_DEPENDS= enblend>=4.1.4:graphics/enblend \ exiftool:graphics/p5-Image-ExifTool \ gmake:devel/gmake -USES= cmake compiler:c++11-lib desktop-file-utils gettext gl gnome \ - jpeg pkgconfig shared-mime-info shebangfix sqlite tar:bzip2 xorg +# compiler:c++17-lang +USES= cmake desktop-file-utils gettext gl gnome \ + pkgconfig shared-mime-info shebangfix sqlite tar:bzip2 xorg USE_GL= gl glew glu glut USE_WX= 3.2+ USE_XORG= x11 @@ -40,20 +38,23 @@ SHEBANG_FILES= src/hugin_script_interface/hpi.py \ CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} CFLAGS+= -I${LOCALBASE}/include/Imath -OPTIONS_DEFINE= PANOMATIC AUTOPANOSIFTC PYTHON -OPTIONS_DEFAULT= PANOMATIC PYTHON +OPTIONS_DEFINE= AUTOPANOSIFTC LAPACK PANOMATIC PYTHON +OPTIONS_DEFAULT= LAPACK PANOMATIC PYTHON OPTIONS_SUB= yes -PANOMATIC_DESC= Install graphics/panomatic -PANOMATIC_RUN_DEPENDS= panomatic:graphics/panomatic - AUTOPANOSIFTC_DESC= Install graphics/autopano-sift-c AUTOPANOSIFTC_RUN_DEPENDS= autopano:graphics/autopano-sift-c +LAPACK_DESC= Use LAPACK based solver in levmar +LAPACK_CMAKE_BOOL= ENABLE_LAPACK +LAPACK_USES= blaslapack + +PANOMATIC_DESC= Install graphics/panomatic +PANOMATIC_RUN_DEPENDS= panomatic:graphics/panomatic + PYTHON_DESC= Python Scripting Interface PYTHON_BUILD_DEPENDS= swig:devel/swig PYTHON_USES= python -PYTHON_CMAKE_ON= -DBUILD_HSI=ON -PYTHON_CMAKE_OFF= -DBUILD_HSI=OFF +PYTHON_CMAKE_BOOL= BUILD_HSI .include <bsd.port.mk> diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo index 7511924aeb96..48b81b1c74fb 100644 --- a/graphics/hugin/distinfo +++ b/graphics/hugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1732106851 -SHA256 (hugin-2024.0.1.tar.bz2) = 13ec0cdeeb4eb63149c833768d3e374e7cf5a6a8d8d02d50885ce496f05ba7e4 -SIZE (hugin-2024.0.1.tar.bz2) = 10352250 +TIMESTAMP = 1763222621 +SHA256 (hugin-2025.0.0.tar.bz2) = 0de27a5d5432e36d4e5d38ac25d7bcafc7b7dd542aab031640a61ed66767076c +SIZE (hugin-2025.0.0.tar.bz2) = 10226271 diff --git a/graphics/hugin/files/patch-CMakeLists.txt b/graphics/hugin/files/patch-CMakeLists.txt deleted file mode 100644 index e5ace58ebec4..000000000000 --- a/graphics/hugin/files/patch-CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- CMakeLists.txt.orig 2024-11-18 19:37:59 UTC -+++ CMakeLists.txt -@@ -557,7 +557,7 @@ IF (NOT MANDIR AND NOT $ENV{MANDIR} STREQUAL "") - - IF (NOT MANDIR AND NOT $ENV{MANDIR} STREQUAL "") - SET (MANDIR "$ENV{MANDIR}") --ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD") -+ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "NetBSD") - SET (MANDIR "man") - ELSE(NOT MANDIR AND NOT $ENV{MANDIR} STREQUAL "") - SET (MANDIR "share/man") diff --git a/graphics/hugin/pkg-plist b/graphics/hugin/pkg-plist index 7a740de5af75..60fe0c528f55 100644 --- a/graphics/hugin/pkg-plist +++ b/graphics/hugin/pkg-plist @@ -15,6 +15,7 @@ bin/hugin_hdrmerge bin/hugin_lensdb bin/hugin_stacker bin/hugin_stitch_project +bin/hugin_toolbox bin/icpfind bin/linefind bin/nona @@ -42,6 +43,7 @@ lib/hugin/liblocalfeatures.so.0.0 share/applications/PTBatcherGUI.desktop share/applications/calibrate_lens_gui.desktop share/applications/hugin.desktop +share/applications/hugin_toolbox_gui.desktop share/applications/pto_gen.desktop %%DATADIR%%/data/assistant/duallens.assistant %%DATADIR%%/data/assistant/multirow.assistant @@ -79,28 +81,20 @@ share/applications/pto_gen.desktop %%DATADIR%%/xrc/cpdetector_dialog.xrc %%DATADIR%%/xrc/data/COPYING.txt %%DATADIR%%/xrc/data/about.htm -%%DATADIR%%/xrc/data/add_project.png -%%DATADIR%%/xrc/data/add_projects.png -%%DATADIR%%/xrc/data/autocrop_tool.png -%%DATADIR%%/xrc/data/center_pano.png -%%DATADIR%%/xrc/data/crop_tool.png -%%DATADIR%%/xrc/data/crop_tool_small.png +%%DATADIR%%/xrc/data/add_project.svg +%%DATADIR%%/xrc/data/add_projects.svg +%%DATADIR%%/xrc/data/autocrop_tool.svg +%%DATADIR%%/xrc/data/center_pano.svg +%%DATADIR%%/xrc/data/crop_tool.svg %%DATADIR%%/xrc/data/dedication.htm -%%DATADIR%%/xrc/data/drag_tool.png -%%DATADIR%%/xrc/data/drag_tool_small.png -%%DATADIR%%/xrc/data/druid.control.128.png -%%DATADIR%%/xrc/data/druid.images.128.png -%%DATADIR%%/xrc/data/druid.lenses.128.png -%%DATADIR%%/xrc/data/druid.optimize.128.png -%%DATADIR%%/xrc/data/druid.stitch.128.png -%%DATADIR%%/xrc/data/edit_add.png -%%DATADIR%%/xrc/data/filenew.png -%%DATADIR%%/xrc/data/fileopen.png -%%DATADIR%%/xrc/data/filesave.png -%%DATADIR%%/xrc/data/filesaveas.png -%%DATADIR%%/xrc/data/fit_pano.png -%%DATADIR%%/xrc/data/gl_preview.png -%%DATADIR%%/xrc/data/gl_preview_small.png +%%DATADIR%%/xrc/data/drag_tool.svg +%%DATADIR%%/xrc/data/edit_add.svg +%%DATADIR%%/xrc/data/filenew.svg +%%DATADIR%%/xrc/data/fileopen.svg +%%DATADIR%%/xrc/data/filesave.svg +%%DATADIR%%/xrc/data/filesaveas.svg +%%DATADIR%%/xrc/data/fit_pano.svg +%%DATADIR%%/xrc/data/gl_preview.svg %%DATADIR%%/xrc/data/help_en_EN/0014985448cc97c209313a079e4eda593c810582.png %%DATADIR%%/xrc/data/help_en_EN/0881f567a2579a682ece721d6d93816eecbcff0d.png %%DATADIR%%/xrc/data/help_en_EN/0d04667eb3325cfad4ec50e994bf00c22782f509.png @@ -342,6 +336,7 @@ share/applications/pto_gen.desktop %%DATADIR%%/xrc/data/help_en_EN/Hugin_stacker.html %%DATADIR%%/xrc/data/help_en_EN/Hugin_stitch_project.html %%DATADIR%%/xrc/data/help_en_EN/Hugin_straighten_pano.png +%%DATADIR%%/xrc/data/help_en_EN/Hugin_toolbox.html %%DATADIR%%/xrc/data/help_en_EN/Hugin_translation_guide.html %%DATADIR%%/xrc/data/help_en_EN/Hugin_undo.png %%DATADIR%%/xrc/data/help_en_EN/Icpfind.html @@ -463,35 +458,30 @@ share/applications/pto_gen.desktop %%DATADIR%%/xrc/data/help_en_EN/manual.css %%DATADIR%%/xrc/data/hugin.ico %%DATADIR%%/xrc/data/hugin.png -%%DATADIR%%/xrc/data/hugin_small.png -%%DATADIR%%/xrc/data/identify_tool.png -%%DATADIR%%/xrc/data/identify_tool_small.png -%%DATADIR%%/xrc/data/info.png +%%DATADIR%%/xrc/data/hugin.svg +%%DATADIR%%/xrc/data/identify_tool.svg +%%DATADIR%%/xrc/data/info.svg %%DATADIR%%/xrc/data/intro.htm %%DATADIR%%/xrc/data/keyboard_pl.html -%%DATADIR%%/xrc/data/list.png -%%DATADIR%%/xrc/data/logo.png -%%DATADIR%%/xrc/data/number1.png -%%DATADIR%%/xrc/data/number2.png -%%DATADIR%%/xrc/data/number3.png -%%DATADIR%%/xrc/data/optimize.png +%%DATADIR%%/xrc/data/list.svg +%%DATADIR%%/xrc/data/number1.svg +%%DATADIR%%/xrc/data/number2.svg +%%DATADIR%%/xrc/data/number3.svg +%%DATADIR%%/xrc/data/optimize.svg %%DATADIR%%/xrc/data/output_blended_fused.png %%DATADIR%%/xrc/data/output_fused_blended.png %%DATADIR%%/xrc/data/output_hdr.png %%DATADIR%%/xrc/data/output_normal.png -%%DATADIR%%/xrc/data/pause.png -%%DATADIR%%/xrc/data/photometric.png -%%DATADIR%%/xrc/data/preview.png -%%DATADIR%%/xrc/data/preview_auto_update.png -%%DATADIR%%/xrc/data/preview_control_point_tool.png -%%DATADIR%%/xrc/data/preview_control_point_tool_small.png -%%DATADIR%%/xrc/data/preview_layout.png -%%DATADIR%%/xrc/data/preview_layout_small.png -%%DATADIR%%/xrc/data/preview_num_transform.png -%%DATADIR%%/xrc/data/preview_show_all.png -%%DATADIR%%/xrc/data/preview_show_none.png -%%DATADIR%%/xrc/data/preview_white_balance.png -%%DATADIR%%/xrc/data/preview_white_balance_small.png +%%DATADIR%%/xrc/data/pause.svg +%%DATADIR%%/xrc/data/photometric.svg +%%DATADIR%%/xrc/data/preview.svg +%%DATADIR%%/xrc/data/preview_auto_update.svg +%%DATADIR%%/xrc/data/preview_control_point_tool.svg +%%DATADIR%%/xrc/data/preview_layout.svg +%%DATADIR%%/xrc/data/preview_num_transform.svg +%%DATADIR%%/xrc/data/preview_show_all.svg +%%DATADIR%%/xrc/data/preview_show_none.svg +%%DATADIR%%/xrc/data/preview_white_balance.svg %%DATADIR%%/xrc/data/ptbatcher.ico %%DATADIR%%/xrc/data/ptbatcher.png %%DATADIR%%/xrc/data/ptbatcher_pause.ico @@ -499,19 +489,17 @@ share/applications/pto_gen.desktop %%DATADIR%%/xrc/data/ptbatcher_running.ico %%DATADIR%%/xrc/data/ptbatcher_running.png %%DATADIR%%/xrc/data/pto_icon.ico -%%DATADIR%%/xrc/data/pto_icon.png -%%DATADIR%%/xrc/data/redo.png -%%DATADIR%%/xrc/data/reload.png -%%DATADIR%%/xrc/data/remove_project.png -%%DATADIR%%/xrc/data/skip.png +%%DATADIR%%/xrc/data/redo.svg +%%DATADIR%%/xrc/data/reload.svg +%%DATADIR%%/xrc/data/remove_project.svg +%%DATADIR%%/xrc/data/skip.svg %%DATADIR%%/xrc/data/splash.png %%DATADIR%%/xrc/data/sponsors.htm -%%DATADIR%%/xrc/data/start.png -%%DATADIR%%/xrc/data/stop.png -%%DATADIR%%/xrc/data/straighten_pano.png +%%DATADIR%%/xrc/data/start.svg +%%DATADIR%%/xrc/data/stop.svg +%%DATADIR%%/xrc/data/straighten_pano.svg %%DATADIR%%/xrc/data/tips.txt -%%DATADIR%%/xrc/data/transparent.png -%%DATADIR%%/xrc/data/undo.png +%%DATADIR%%/xrc/data/undo.svg %%DATADIR%%/xrc/data/upstream.txt %%DATADIR%%/xrc/dlg_warning.xrc %%DATADIR%%/xrc/edit_script_dialog.xrc @@ -530,6 +518,7 @@ share/applications/pto_gen.desktop %%DATADIR%%/xrc/pref_dialog.xrc %%DATADIR%%/xrc/preview_frame.xrc %%DATADIR%%/xrc/reset_dialog.xrc +%%DATADIR%%/xrc/toolbox_panel.xrc share/icons/hicolor/128x128/apps/hugin.png share/icons/hicolor/128x128/apps/ptbatcher.png share/icons/hicolor/16x16/apps/hugin.png @@ -600,4 +589,5 @@ share/man/man1/vig_optimize.1.gz share/metainfo/PTBatcherGUI.appdata.xml share/metainfo/calibrate_lens_gui.appdata.xml share/metainfo/hugin.appdata.xml +share/metainfo/hugin_toolbox.appdata.xml share/mime/packages/hugin.xmlhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6921de72.37f43.55093996>