From nobody Sat Dec 24 08:23:09 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NfH9n6T99z1HQbK; Sat, 24 Dec 2022 08:23:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NfH9n62NXz3Lhw; Sat, 24 Dec 2022 08:23:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671870189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F+aUKiRuTEfnmCF6aXO957R3Y3Qkted3dBK9eZ4zWkU=; b=fvHwyBofSywH/GYGaM0y+QgChmp1JpLuxAX6QoHvql6Np8yoEGgEwghUGlzzj85OAZew0+ I7nUsPXvedIKOF3ZBZzY+dXrESax45ZC5wBdrSuDUCsyHH+ITWyUK9S7ac5WzEhcO5HI0K jOF/p1S2eaSOQiCttEM9YRc21PueNAzFNaP0o2NBWitMrRlb89SLWQ+qMlyPAJu0BxwxhQ rl56o/Rv9/C5ulvDgzk4fSDutmxpdf0DOqlxHCK1Je9EPlAsSJMp0Z8NJv2OXHuCTT2fJG PgsHU12pP5IAAp+CUH1k7bU//szJ6VP8xyJYIJvdZhttPYQwM5yWW7jltEn1sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671870189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F+aUKiRuTEfnmCF6aXO957R3Y3Qkted3dBK9eZ4zWkU=; b=QmEeYlfmjo12zbE6r3+YJCB0p2P+Dk2ndQYPiLgIv7peyvRAzMKUP85SqeKLB8VKWAMcOW qusaawmhalcIwX3r2Z2yWaJSri9zItw3jDOtQ+YvRkhN+8KhA8TySffAI4BNYSL+ELTJYU 0U8AQ8AMp53ITlBsk7GJrCvtC3JBXEsJr1MLZLhU1HeilSype8NTk2FJhV4SjmgyV4oHnu g+J24xDOIEcMaxrlEV55BLPoxJYyAZBRzCMdSrJkzLlb2vyz3ePPeBwm8pemRgq13R8jLj h0HtuvFylmH89FOzCQr0FUsIyJGaWppgv4l0a+Rj8WHU0zb+iYjWcMHA4GbPtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671870189; a=rsa-sha256; cv=none; b=ghZ5/rVPE6dr1KOU86y7HXCgkwIikIsPmJFI/BC9t2mpZE0bBrt4M4/sPExiJI9sQfoKnd 3CR1zdgWUK5QyR6DrjmWzTgqiCF/VHz8ZroMq+HPrOLurEH/OWkIr/RBipf0qhEGN8U9Gj H9j5TtXtJabqRlrQKud2h3B/ALuy6vIz1+Y0bEz8Ritz0Vm/TFecSamsnePL8CLZxMIFor 14Yg/W7Ae6s5z5+u+0zN0wkyuio39CVrcYV6lB0LkYSZni+bpiwYTmYGs5gIQusj043M1d OJH57paeMBZAN4DzB5M9wm9Clqoo7LOBd24GsE2yQTnPaYC3v4WQ+er3Yjm5Kg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NfH9n54rNz15vd; Sat, 24 Dec 2022 08:23:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BO8N9g2068127; Sat, 24 Dec 2022 08:23:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BO8N9HX068126; Sat, 24 Dec 2022 08:23:09 GMT (envelope-from git) Date: Sat, 24 Dec 2022 08:23:09 GMT Message-Id: <202212240823.2BO8N9HX068126@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nuno Teixeira Subject: git: f6660b5fd0ba - main - graphics/hugin: Update to 2022.0.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f6660b5fd0baac06de7b1fde481da8d4334ad84f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=f6660b5fd0baac06de7b1fde481da8d4334ad84f commit f6660b5fd0baac06de7b1fde481da8d4334ad84f Author: Robert Clausecker AuthorDate: 2022-12-24 08:17:30 +0000 Commit: Nuno Teixeira CommitDate: 2022-12-24 08:22:38 +0000 graphics/hugin: Update to 2022.0.0 This introduces a new dependency on math/flann. ChangeLog: https://hugin.sourceforge.io/releases/2022.0.0/en.shtml PR: 268465 --- graphics/hugin/Makefile | 7 ++-- graphics/hugin/distinfo | 6 +-- .../files/patch-CMakeModules_FindOpenEXR.cmake | 47 ---------------------- graphics/hugin/pkg-plist | 35 ++++++++-------- 4 files changed, 26 insertions(+), 69 deletions(-) diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index 24027e2fffdd..338301f4be22 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -1,6 +1,5 @@ PORTNAME= hugin -DISTVERSION= 2021.0.0 -PORTREVISION= 2 +DISTVERSION= 2022.0.0 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} @@ -19,7 +18,9 @@ LIB_DEPENDS= libOpenEXR.so:graphics/openexr \ libpano13.so:graphics/libpano13 \ libvigraimpex.so:graphics/vigra \ libpng.so:graphics/png \ - libtiff.so:graphics/tiff + libtiff.so:graphics/tiff \ + libflann.so:math/flann \ + liblz4.so:archivers/liblz4 # gmake is really needed at _runtime_. Do not remove it from this list. RUN_DEPENDS= enblend>=4.1.4:graphics/enblend \ exiftool:graphics/p5-Image-ExifTool \ diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo index fc18a602f3fb..5564c669f460 100644 --- a/graphics/hugin/distinfo +++ b/graphics/hugin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1640875897 -SHA256 (hugin-2021.0.0.tar.bz2) = 047aea8a7fa47844b34ef27c19d3b697e84939dcb1fdbbeb2c204621b66eead9 -SIZE (hugin-2021.0.0.tar.bz2) = 10333565 +TIMESTAMP = 1671372561 +SHA256 (hugin-2022.0.0.tar.bz2) = 97c8562a0ba9a743e0b955a43dfde048b1c60cd9e5f2ee2b69de1a81646e05a7 +SIZE (hugin-2022.0.0.tar.bz2) = 10374360 diff --git a/graphics/hugin/files/patch-CMakeModules_FindOpenEXR.cmake b/graphics/hugin/files/patch-CMakeModules_FindOpenEXR.cmake deleted file mode 100644 index 8cd4c992c97f..000000000000 --- a/graphics/hugin/files/patch-CMakeModules_FindOpenEXR.cmake +++ /dev/null @@ -1,47 +0,0 @@ ---- 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_5 Half-2_4 Half-2_3 Half -+ NAMES Imath - PATHS - ${_OPENEXRLinkDir} - ${SYSTEM_LIB_DIRS} -@@ -45,7 +45,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} -@@ -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_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 4747b9807505..d9845e401222 100644 --- a/graphics/hugin/pkg-plist +++ b/graphics/hugin/pkg-plist @@ -75,33 +75,33 @@ share/applications/PTBatcherGUI.desktop share/applications/calibrate_lens_gui.desktop share/applications/hugin.desktop share/applications/pto_gen.desktop -%%DATADIR%%/data/blended_stacks.executor +%%DATADIR%%/data/assistant/duallens.assistant +%%DATADIR%%/data/assistant/multirow.assistant +%%DATADIR%%/data/assistant/normal.assistant +%%DATADIR%%/data/assistant/scanned.assistant +%%DATADIR%%/data/assistant/scanned2.assistant +%%DATADIR%%/data/assistant/stacked.assistant %%DATADIR%%/data/celeste.model %%DATADIR%%/data/default.setting -%%DATADIR%%/data/duallens.assistant %%DATADIR%%/data/expressions.ini -%%DATADIR%%/data/focus_stack.executor -%%DATADIR%%/data/fused_layers.executor -%%DATADIR%%/data/hdr_pano.executor %%DATADIR%%/data/hugin_exiftool_copy.arg %%DATADIR%%/data/hugin_exiftool_final_example.arg %%DATADIR%%/data/hugin_rt.pp3 -%%DATADIR%%/data/median_stack.executor -%%DATADIR%%/data/multirow.assistant -%%DATADIR%%/data/normal.assistant -%%DATADIR%%/data/normal_enblend.executor -%%DATADIR%%/data/normal_enblend_cubic.executor -%%DATADIR%%/data/normal_layered_tiff.executor -%%DATADIR%%/data/normal_smartblend.executor +%%DATADIR%%/data/output/blended_stacks.executor +%%DATADIR%%/data/output/focus_stack.executor +%%DATADIR%%/data/output/fused_layers.executor +%%DATADIR%%/data/output/hdr_pano.executor +%%DATADIR%%/data/output/median_stack.executor +%%DATADIR%%/data/output/normal_enblend.executor +%%DATADIR%%/data/output/normal_enblend_cubic.executor +%%DATADIR%%/data/output/normal_layered_tiff.executor +%%DATADIR%%/data/output/normal_smartblend.executor +%%DATADIR%%/data/output/zeronoise.executor %%DATADIR%%/data/plugins-templates/dual_use.py %%DATADIR%%/data/plugins-templates/plugin_skeleton.py %%DATADIR%%/data/plugins/README_woa.txt %%DATADIR%%/data/plugins/top_five.py %%DATADIR%%/data/plugins/woa.py -%%DATADIR%%/data/scanned.assistant -%%DATADIR%%/data/scanned2.assistant -%%DATADIR%%/data/stacked.assistant -%%DATADIR%%/data/zeronoise.executor %%DATADIR%%/xrc/about.xrc %%DATADIR%%/xrc/batch_frame.xrc %%DATADIR%%/xrc/batch_menu.xrc @@ -507,6 +507,9 @@ share/applications/pto_gen.desktop %%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/output_blended_fused.png %%DATADIR%%/xrc/data/output_fused_blended.png