From 596533933613d9142f1aa73a2014fe05cf2ff359 Mon Sep 17 00:00:00 2001 From: kirby Date: Sun, 8 Jan 2023 13:02:19 +0000 Subject: [PATCH] update to hugin-2022.0.0 --- graphics/hugin/Makefile | 11 +++--- graphics/hugin/distinfo | 4 +- .../patch-CMakeModules_FindOpenEXR_cmake | 32 ---------------- graphics/hugin/pkg/PLIST | 37 +++++++++++-------- 4 files changed, 28 insertions(+), 56 deletions(-) delete mode 100644 graphics/hugin/patches/patch-CMakeModules_FindOpenEXR_cmake diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index c63b4ee9e2d..4af6e7da361 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -2,25 +2,24 @@ BROKEN-hppa = run dep on enblend-enfuse which will not build on hppa COMMENT = panorama image stitcher -DISTNAME = hugin-2021.0.0 +DISTNAME = hugin-2022.0.0 EXTRACT_SUFX = .tar.bz2 # not needed for releases, but makes RCs/betas easier to work with PKGNAME = ${DISTNAME:S/_//:L} WRKDIST = ${WRKDIR}/${DISTNAME:C/_.*//} -REVISION = 0 SHARED_LIBS += celeste 4.0 SHARED_LIBS += flann_cpp 4.0 -SHARED_LIBS += huginbase 6.0 -SHARED_LIBS += huginbasewx 5.1 -SHARED_LIBS += icpfindlib 4.0 +SHARED_LIBS += huginbase 7.0 +SHARED_LIBS += huginbasewx 6.0 +SHARED_LIBS += icpfindlib 5.0 SHARED_LIBS += localfeatures 4.0 SHARED_LIBS += hugin_python_interface 4.0 CATEGORIES = graphics x11 -HOMEPAGE = http://hugin.sourceforge.net/ +HOMEPAGE = https://hugin.sourceforge.net/ MAINTAINER = Kirill Bychkov diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo index b3c34f35898..4669f91087f 100644 --- a/graphics/hugin/distinfo +++ b/graphics/hugin/distinfo @@ -1,2 +1,2 @@ -SHA256 (hugin-2021.0.0.tar.bz2) = BHrqin+keESzTvJ8GdO2l+hJOdyx/bvrLCBGIbZu6tk= -SIZE (hugin-2021.0.0.tar.bz2) = 10333565 +SHA256 (hugin-2022.0.0.tar.bz2) = l8hWKgupp0PguVWkPf3gSLHGDNnl8u4rad4agWRuBac= +SIZE (hugin-2022.0.0.tar.bz2) = 10374360 diff --git a/graphics/hugin/patches/patch-CMakeModules_FindOpenEXR_cmake b/graphics/hugin/patches/patch-CMakeModules_FindOpenEXR_cmake deleted file mode 100644 index 95c87c75ac6..00000000000 --- a/graphics/hugin/patches/patch-CMakeModules_FindOpenEXR_cmake +++ /dev/null @@ -1,32 +0,0 @@ -Fix build with OpeEXR>=3 - -Index: CMakeModules/FindOpenEXR.cmake ---- CMakeModules/FindOpenEXR.cmake.orig -+++ CMakeModules/FindOpenEXR.cmake -@@ -56,7 +56,7 @@ ENDIF (NOT WIN32 OR MINGW) - - find_library_with_debug(OPENEXR_HALF_LIBRARY - WIN32_DEBUG_POSTFIX d -- NAMES Half-2_5 Half-2_4 Half-2_3 Half -+ NAMES Imath - PATHS - ${_OPENEXRLinkDir} - ${SYSTEM_LIB_DIRS} -@@ -66,7 +66,7 @@ ENDIF (NOT WIN32 OR MINGW) - - find_library_with_debug(OPENEXR_IEX_LIBRARY - WIN32_DEBUG_POSTFIX d -- NAMES Iex-2_5 Iex-2_4 Iex-2_3 Iex-2_2 Iex -+ NAMES Iex - PATHS - ${_OPENEXRLinkDir} - ${SYSTEM_LIB_DIRS} -@@ -97,7 +97,7 @@ ENDIF (NOT WIN32 OR MINGW) - - find_library_with_debug(OPENEXR_ILMIMF_LIBRARY - WIN32_DEBUG_POSTFIX d -- NAMES IlmImf-2_5 IlmImf-2_4 IlmImf-2_3 IlmImf-2_2 IlmImf -+ NAMES OpenEXR - PATHS - ${_OPENEXRLinkDir} - ${SYSTEM_LIB_DIRS} diff --git a/graphics/hugin/pkg/PLIST b/graphics/hugin/pkg/PLIST index 132940b0f1d..6e6a4456c26 100644 --- a/graphics/hugin/pkg/PLIST +++ b/graphics/hugin/pkg/PLIST @@ -82,24 +82,30 @@ share/applications/hugin.desktop share/applications/pto_gen.desktop share/hugin/ share/hugin/data/ -share/hugin/data/blended_stacks.executor +share/hugin/data/assistant/ +share/hugin/data/assistant/duallens.assistant +share/hugin/data/assistant/multirow.assistant +share/hugin/data/assistant/normal.assistant +share/hugin/data/assistant/scanned.assistant +share/hugin/data/assistant/scanned2.assistant +share/hugin/data/assistant/stacked.assistant share/hugin/data/celeste.model share/hugin/data/default.setting -share/hugin/data/duallens.assistant share/hugin/data/expressions.ini -share/hugin/data/focus_stack.executor -share/hugin/data/fused_layers.executor -share/hugin/data/hdr_pano.executor share/hugin/data/hugin_exiftool_copy.arg share/hugin/data/hugin_exiftool_final_example.arg share/hugin/data/hugin_rt.pp3 -share/hugin/data/median_stack.executor -share/hugin/data/multirow.assistant -share/hugin/data/normal.assistant -share/hugin/data/normal_enblend.executor -share/hugin/data/normal_enblend_cubic.executor -share/hugin/data/normal_layered_tiff.executor -share/hugin/data/normal_smartblend.executor +share/hugin/data/output/ +share/hugin/data/output/blended_stacks.executor +share/hugin/data/output/focus_stack.executor +share/hugin/data/output/fused_layers.executor +share/hugin/data/output/hdr_pano.executor +share/hugin/data/output/median_stack.executor +share/hugin/data/output/normal_enblend.executor +share/hugin/data/output/normal_enblend_cubic.executor +share/hugin/data/output/normal_layered_tiff.executor +share/hugin/data/output/normal_smartblend.executor +share/hugin/data/output/zeronoise.executor share/hugin/data/plugins/ share/hugin/data/plugins-templates/ share/hugin/data/plugins-templates/dual_use.py @@ -110,10 +116,6 @@ share/hugin/data/plugins/${MODPY_PYCACHE}top_five.${MODPY_PYC_MAGIC_TAG}pyc share/hugin/data/plugins/${MODPY_PYCACHE}woa.${MODPY_PYC_MAGIC_TAG}pyc share/hugin/data/plugins/top_five.py share/hugin/data/plugins/woa.py -share/hugin/data/scanned.assistant -share/hugin/data/scanned2.assistant -share/hugin/data/stacked.assistant -share/hugin/data/zeronoise.executor share/hugin/xrc/ share/hugin/xrc/about.xrc share/hugin/xrc/batch_frame.xrc @@ -522,6 +524,9 @@ share/hugin/xrc/data/intro.htm share/hugin/xrc/data/keyboard_pl.html share/hugin/xrc/data/list.png share/hugin/xrc/data/logo.png +share/hugin/xrc/data/number1.png +share/hugin/xrc/data/number2.png +share/hugin/xrc/data/number3.png share/hugin/xrc/data/optimize.png share/hugin/xrc/data/output_blended_fused.png share/hugin/xrc/data/output_fused_blended.png