@@ -, +, @@ --- graphics/hugin/Makefile | 20 +++++++------- graphics/hugin/distinfo | 6 ++--- .../patch-CMakeModules_FindOpenEXR.cmake | 26 ++++++++++++++++--- graphics/hugin/pkg-plist | 9 ++++--- 4 files changed, 39 insertions(+), 22 deletions(-) --- b/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -1,14 +1,15 @@ # Created by: Carlos Eduardo G. Carvalho PORTNAME= hugin -PORTVERSION= 2019.2.0 -PORTREVISION= 14 +PORTVERSION= 2020.0.0 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= fuz@fuz.su COMMENT= GUI for Panorama Tools, to stitch panoramic images +LICENSE= GPLv2 + LIB_DEPENDS= libOpenEXR.so:graphics/openexr \ libImath.so:math/Imath \ libboost_thread.so:devel/boost-libs \ @@ -24,25 +25,22 @@ RUN_DEPENDS= enblend>=4.1.4:graphics/enblend \ exiftool:graphics/p5-Image-ExifTool \ gmake:devel/gmake -LICENSE= GPLv2 - -CFLAGS+= -I${LOCALBASE}/include/Imath - -BROKEN_i386= Fails to build: ld: error: src/hugin_base/libhuginbase.so.0.0: undefined reference to __atomic_load USES= cmake compiler:c++11-lib desktop-file-utils gettext gl gnome \ jpeg pkgconfig shared-mime-info shebangfix sqlite tar:bzip2 xorg -CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} USE_GL= gl glew glu glut +INSTALLS_ICONS= yes USE_WX= 3.0+ USE_XORG= x11 -INSTALLS_ICONS= yes SHEBANG_FILES= src/hugin_script_interface/hpi.py \ src/hugin_script_interface/plugins/*.py \ src/hugin_script_interface/plugins-dev/*.py +CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} +CFLAGS+= -I${LOCALBASE}/include/Imath + OPTIONS_DEFINE= PANOMATIC AUTOPANOSIFTC PYTHON OPTIONS_DEFAULT= PANOMATIC PYTHON OPTIONS_SUB= yes @@ -54,8 +52,8 @@ AUTOPANOSIFTC_DESC= Install graphics/autopano-sift-c AUTOPANOSIFTC_RUN_DEPENDS= autopano:graphics/autopano-sift-c PYTHON_DESC= Python Scripting Interface -PYTHON_USES= python PYTHON_BUILD_DEPENDS= swig:devel/swig +PYTHON_USES= python PYTHON_CMAKE_ON= -DBUILD_HSI=ON PYTHON_CMAKE_OFF= -DBUILD_HSI=OFF --- b/graphics/hugin/distinfo +++ b/graphics/hugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1578804282 -SHA256 (hugin-2019.2.0.tar.bz2) = 8ba6bdfea246313f142f17f42e066c6888f51b72e4f8814b5e1c84ff56a95a3e -SIZE (hugin-2019.2.0.tar.bz2) = 10335030 +TIMESTAMP = 1631023500 +SHA256 (hugin-2020.0.0.tar.bz2) = 283e7601259a7914cb075333424410928a439dc5f84216f33e2fe55501fbcacb +SIZE (hugin-2020.0.0.tar.bz2) = 10371301 --- b/graphics/hugin/files/patch-CMakeModules_FindOpenEXR.cmake +++ b/graphics/hugin/files/patch-CMakeModules_FindOpenEXR.cmake @@ -1,10 +1,10 @@ ---- CMakeModules/FindOpenEXR.cmake.orig 2019-12-07 08:35:27 UTC +--- CMakeModules/FindOpenEXR.cmake.orig 2021-09-07 14:16:50 UTC +++ CMakeModules/FindOpenEXR.cmake @@ -35,7 +35,7 @@ ENDIF (NOT WIN32 OR MINGW) include(FindLibraryWithDebug) find_library_with_debug(OPENEXR_HALF_LIBRARY WIN32_DEBUG_POSTFIX d -- NAMES Half-2_3 Half +- NAMES Half-2_5 Half-2_4 Half-2_3 Half + NAMES Imath PATHS ${_OPENEXRLinkDir} @@ -13,16 +13,34 @@ find_library_with_debug(OPENEXR_IEX_LIBRARY WIN32_DEBUG_POSTFIX d -- NAMES Iex-2_3 Iex-2_2 Iex +- NAMES Iex-2_5 Iex-2_4 Iex-2_3 Iex-2_2 Iex + NAMES Iex PATHS ${_OPENEXRLinkDir} ${SYSTEM_LIB_DIRS} +@@ -55,7 +55,7 @@ ENDIF (NOT WIN32 OR MINGW) + + find_library_with_debug(OPENEXR_ILMTHREAD_LIBRARY + WIN32_DEBUG_POSTFIX d +- NAMES IlmThread-2_5 IlmThread-2_4 IlmThread-2_3 IlmThread-2_2 IlmThread ++ NAMES IlmThread + PATHS + ${_OPENEXRLinkDir} + ${SYSTEM_LIB_DIRS} +@@ -65,7 +65,7 @@ ENDIF (NOT WIN32 OR MINGW) + + find_library_with_debug(OPENEXR_IMATH_LIBRARY + WIN32_DEBUG_POSTFIX d +- NAMES Imath-2_5 Imath-2_4 Imath-2_3 Imath-2_2 Imath ++ NAMES Imath + PATHS + ${_OPENEXRLinkDir} + ${SYSTEM_LIB_DIRS} @@ -76,7 +76,7 @@ ENDIF (NOT WIN32 OR MINGW) find_library_with_debug(OPENEXR_ILMIMF_LIBRARY WIN32_DEBUG_POSTFIX d -- NAMES IlmImf-2_3 IlmImf-2_2 IlmImf +- NAMES IlmImf-2_5 IlmImf-2_4 IlmImf-2_3 IlmImf-2_2 IlmImf + NAMES OpenEXR PATHS ${_OPENEXRLinkDir} --- b/graphics/hugin/pkg-plist +++ b/graphics/hugin/pkg-plist @@ -54,6 +54,7 @@ man/man1/hugin.1.gz man/man1/hugin_executor.1.gz man/man1/hugin_hdrmerge.1.gz man/man1/hugin_lensdb.1.gz +man/man1/hugin_stacker.1.gz man/man1/hugin_stitch_project.1.gz man/man1/icpfind.1.gz man/man1/linefind.1.gz @@ -70,9 +71,6 @@ man/man1/pto_var.1.gz man/man1/tca_correct.1.gz man/man1/verdandi.1.gz man/man1/vig_optimize.1.gz -share/appdata/PTBatcherGUI.appdata.xml -share/appdata/calibrate_lens_gui.appdata.xml -share/appdata/hugin.appdata.xml share/applications/PTBatcherGUI.desktop share/applications/calibrate_lens_gui.desktop share/applications/hugin.desktop @@ -564,7 +562,7 @@ share/applications/pto_gen.desktop %%DATADIR%%/xrc/pref_dialog.xrc %%DATADIR%%/xrc/preview_frame.xrc %%DATADIR%%/xrc/reset_dialog.xrc -share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-ptoptimizer-script.png +share/icons/gnome/48x48/mimetypes/application-x-ptoptimizer-script.png share/icons/hicolor/128x128/apps/hugin.png share/icons/hicolor/128x128/apps/ptbatcher.png share/icons/hicolor/16x16/apps/hugin.png @@ -599,4 +597,7 @@ share/locale/sk/LC_MESSAGES/hugin.mo share/locale/sv/LC_MESSAGES/hugin.mo share/locale/zh_CN/LC_MESSAGES/hugin.mo share/locale/zh_TW/LC_MESSAGES/hugin.mo +share/metainfo/PTBatcherGUI.appdata.xml +share/metainfo/calibrate_lens_gui.appdata.xml +share/metainfo/hugin.appdata.xml share/mime/packages/hugin.xml --