Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 552291A9217 for ; Sat, 9 Jan 2021 21:17:40 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 7E06584D71; Sat, 9 Jan 2021 21:17:39 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B2C5F84D59 for ; Sat, 9 Jan 2021 21:17:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id chBmBLTYtTZD for ; Sat, 9 Jan 2021 21:17:37 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D4C7084D1F for ; Sat, 9 Jan 2021 21:17:37 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id CE2D1FA9D; Sat, 9 Jan 2021 21:17:37 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1610227057276790" MIME-Version: 1.0 Date: Sat, 9 Jan 2021 21:17:37 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/graphics/hugin To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20210109211737.CE2D1FA9D@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1610227057276790 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Sat Jan 9 21:17:37 UTC 2021 Modified Files: pkgsrc/graphics/hugin: Makefile PLIST distinfo pkgsrc/graphics/hugin/patches: patch-CMakeLists.txt patch-src_hugin1_hugin_GLPreviewFrame.cpp Log Message: hugin: updated to 2020.0 Hugin 2020.0 * Fixes fast preview on HiDPI screens under GTK+3 and MacOS. * Make fast preview screen zoomable with mouse wheel. * Make hugin_hdrmerge aware of cropped intermediate images. * Several improvements for command line tools (pto_var, pto_move, pto_gen, autooptimiser). * More checks in GUI for strange user input. To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 pkgsrc/graphics/hugin/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/hugin/PLIST cvs rdiff -u -r1.23 -r1.24 pkgsrc/graphics/hugin/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/hugin/patches/patch-CMakeLists.txt cvs rdiff -u -r1.2 -r1.3 \ pkgsrc/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1610227057276790 Content-Disposition: inline Content-Length: 7471 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/hugin/Makefile diff -u pkgsrc/graphics/hugin/Makefile:1.109 pkgsrc/graphics/hugin/Makefile:1.110 --- pkgsrc/graphics/hugin/Makefile:1.109 Fri Jan 1 08:24:45 2021 +++ pkgsrc/graphics/hugin/Makefile Sat Jan 9 21:17:37 2021 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.109 2021/01/01 08:24:45 ryoon Exp $ +# $NetBSD: Makefile,v 1.110 2021/01/09 21:17:37 adam Exp $ -DISTNAME= hugin-2019.2.0 -PKGREVISION= 11 +DISTNAME= hugin-2020.0.0 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=hugin/} EXTRACT_SUFX= .tar.bz2 @@ -19,6 +18,8 @@ USE_CMAKE= yes USE_LANGUAGES= c c++ USE_TOOLS+= msgfmt pkg-config CONFIGURE_ENV+= MANDIR=${PKGMANDIR} +CONFIGURE_DIRS= ${WRKDIR}/build +CMAKE_ARG_PATH= ${WRKSRC} CMAKE_ARGS+= -DBUILD_HSI=ON @@ -37,6 +38,9 @@ SUBST_FILES.apple+= src/hugin1/ptbatcher SUBST_FILES.apple+= src/hugin1/stitch_project/CMakeLists.txt SUBST_SED.apple= -e 's,(APPLE),(ELPPA),g' +post-extract: + ${MKDIR} ${WRKDIR}/build + .include "../../mk/bsd.prefs.mk" .include "../../databases/sqlite3/buildlink3.mk" Index: pkgsrc/graphics/hugin/PLIST diff -u pkgsrc/graphics/hugin/PLIST:1.13 pkgsrc/graphics/hugin/PLIST:1.14 --- pkgsrc/graphics/hugin/PLIST:1.13 Fri Jan 3 18:15:21 2020 +++ pkgsrc/graphics/hugin/PLIST Sat Jan 9 21:17:37 2021 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2020/01/03 18:15:21 adam Exp $ +@comment $NetBSD: PLIST,v 1.14 2021/01/09 21:17:37 adam Exp $ bin/PTBatcherGUI bin/align_image_stack bin/autooptimiser @@ -55,6 +55,7 @@ man/man1/hugin.1 man/man1/hugin_executor.1 man/man1/hugin_hdrmerge.1 man/man1/hugin_lensdb.1 +man/man1/hugin_stacker.1 man/man1/hugin_stitch_project.1 man/man1/icpfind.1 man/man1/linefind.1 @@ -71,9 +72,6 @@ man/man1/pto_var.1 man/man1/tca_correct.1 man/man1/verdandi.1 man/man1/vig_optimize.1 -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 @@ -565,7 +563,7 @@ share/hugin/xrc/pano_panel.xrc share/hugin/xrc/pref_dialog.xrc share/hugin/xrc/preview_frame.xrc share/hugin/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 @@ -600,4 +598,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 Index: pkgsrc/graphics/hugin/distinfo diff -u pkgsrc/graphics/hugin/distinfo:1.23 pkgsrc/graphics/hugin/distinfo:1.24 --- pkgsrc/graphics/hugin/distinfo:1.23 Fri Jan 3 18:15:21 2020 +++ pkgsrc/graphics/hugin/distinfo Sat Jan 9 21:17:37 2021 @@ -1,16 +1,16 @@ -$NetBSD: distinfo,v 1.23 2020/01/03 18:15:21 adam Exp $ +$NetBSD: distinfo,v 1.24 2021/01/09 21:17:37 adam Exp $ -SHA1 (hugin-2019.2.0.tar.bz2) = e91bfbb286d0d5f40cd93ecb961eb55a37f3f5bb -RMD160 (hugin-2019.2.0.tar.bz2) = d16c364779a48451b3b222a0dd0efa46535e6ddc -SHA512 (hugin-2019.2.0.tar.bz2) = 2ddfe7468a474c385ef66a88c3a5a2491183765ae431e5044f504d2e95ec3cb99c0b97b98dda282ba7950f6f2001f46b2f2ea39b9025718c2a329dea967685c1 -Size (hugin-2019.2.0.tar.bz2) = 10335030 bytes -SHA1 (patch-CMakeLists.txt) = b5c72651a150e4c3c095f670eaaeabcb4b4c5749 +SHA1 (hugin-2020.0.0.tar.bz2) = 20e39ab82e1d8208a7eee2f216ab1271c95f583f +RMD160 (hugin-2020.0.0.tar.bz2) = 499c24bf2dd0eb0b1e223183004dd00f9ced61c2 +SHA512 (hugin-2020.0.0.tar.bz2) = 4c55767c630ea03faf359bda606e5e9e7709a47ab41e821772da8c6da0cf658b1d31d7d8e96ea1c41ec61bdeb2da8c86c92b5d6964a9301732a13137178ec04e +Size (hugin-2020.0.0.tar.bz2) = 10371301 bytes +SHA1 (patch-CMakeLists.txt) = 94e087f3eeab899a6dad701cc4d8a95414a980df SHA1 (patch-CMakeModules_FindPNG.cmake) = 811fd3cf6f819b31129e1560cd8acd1f7ee6defc SHA1 (patch-doc_deghosting_mask.pod) = fe5462b10966420b0cf3fab004854d9dab3bfb4f SHA1 (patch-src_hugin1_base__wx_wxPanoCommand.cpp) = d5bf8f747ae86338e728c472d3dc04bf4c84f182 SHA1 (patch-src_hugin1_calibrate__lens_LensCalFrame.cpp) = 9b815a681317cb19880e7bb6ef170bc14d01b28b SHA1 (patch-src_hugin1_hugin_CPEditorPanel.cpp) = d373c00d4783b3edc1bad5a67339163a0c23d8c5 -SHA1 (patch-src_hugin1_hugin_GLPreviewFrame.cpp) = fda8db4abf3ab10332d4309c90f0ef4f845c76a6 +SHA1 (patch-src_hugin1_hugin_GLPreviewFrame.cpp) = 0b1396f4a45a5ab6529c0b8c64ff291a021226c4 SHA1 (patch-src_hugin1_ptbatcher_BatchFrame.cpp) = 51ce24f1eb99cc5c0151758299eb1ecc34128171 SHA1 (patch-src_hugin__script__interface_hsi.i) = b11a52579fd12fdf7c51fef63049d285cb2b52e1 SHA1 (patch-src_tools_align_image_stack.cpp) = fc2759f0722365d4c5339c5c8bc1eda1a6bf7a71 Index: pkgsrc/graphics/hugin/patches/patch-CMakeLists.txt diff -u pkgsrc/graphics/hugin/patches/patch-CMakeLists.txt:1.6 pkgsrc/graphics/hugin/patches/patch-CMakeLists.txt:1.7 --- pkgsrc/graphics/hugin/patches/patch-CMakeLists.txt:1.6 Fri Jan 3 18:15:21 2020 +++ pkgsrc/graphics/hugin/patches/patch-CMakeLists.txt Sat Jan 9 21:17:37 2021 @@ -1,21 +1,10 @@ -$NetBSD: patch-CMakeLists.txt,v 1.6 2020/01/03 18:15:21 adam Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.7 2021/01/09 21:17:37 adam Exp $ Do not make an application bundle on OS X. ---- CMakeLists.txt.orig 2019-12-15 15:44:00.000000000 +0000 +--- CMakeLists.txt.orig 2020-12-12 11:09:15.000000000 +0000 +++ CMakeLists.txt -@@ -2,10 +2,6 @@ - # require at least cmake 3.8 - cmake_minimum_required(VERSION 3.8 FATAL_ERROR ) - --# prevent in-tree building --if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") -- message(FATAL_ERROR "In-source builds are not allowed.") --endif() - - if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -@@ -557,16 +553,6 @@ IF (APPLE) +@@ -558,16 +558,6 @@ IF (APPLE) ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE) ENDIF (APPLE) Index: pkgsrc/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp diff -u pkgsrc/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp:1.2 pkgsrc/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp:1.3 --- pkgsrc/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp:1.2 Sun Nov 6 16:08:00 2016 +++ pkgsrc/graphics/hugin/patches/patch-src_hugin1_hugin_GLPreviewFrame.cpp Sat Jan 9 21:17:37 2021 @@ -1,19 +1,19 @@ -$NetBSD: patch-src_hugin1_hugin_GLPreviewFrame.cpp,v 1.2 2016/11/06 16:08:00 adam Exp $ +$NetBSD: patch-src_hugin1_hugin_GLPreviewFrame.cpp,v 1.3 2021/01/09 21:17:37 adam Exp $ Re-order includes to fix building. ---- src/hugin1/hugin/GLPreviewFrame.cpp.orig 2016-02-28 08:18:00.000000000 +0000 +--- src/hugin1/hugin/GLPreviewFrame.cpp.orig 2020-10-27 17:24:30.000000000 +0000 +++ src/hugin1/hugin/GLPreviewFrame.cpp -@@ -41,6 +41,8 @@ - #include "panoinc_WX.h" +@@ -35,6 +35,8 @@ #include "panoinc.h" + #include +#include "vigra_ext/InterestPoints.h" +#include "vigra_ext/Correlation.h" #include "base_wx/platform.h" #include "base_wx/wxPlatform.h" #include "base_wx/LensTools.h" -@@ -65,8 +67,6 @@ +@@ -59,8 +61,6 @@ #include "hugin/PanoOperation.h" #include "hugin/PanoOutputDialog.h" #include "base_wx/PTWXDlg.h" --_----------=_1610227057276790--