From 52da13ff00f19f1164d3563c90b12bbf014141d6 Mon Sep 17 00:00:00 2001 From: sthen Date: Wed, 2 Mar 2011 08:30:27 +0000 Subject: [PATCH] update Hugin to 2010.4.0, tested by Kirill Bychkov, thanks! This version introduces cpfind, a patent-free control point generator (i.e. tool to automatically find matching points between two images for stitching together). --- graphics/hugin/Makefile | 15 ++++--- graphics/hugin/distinfo | 10 ++--- ...atch-src_hugin1_base_wx_RunStitchPanel_cpp | 18 ++++---- .../patch-src_hugin_base_test_CMakeLists_txt | 9 ---- graphics/hugin/pkg/DESCR | 26 +++--------- graphics/hugin/pkg/MESSAGE | 6 --- graphics/hugin/pkg/PFRAG.shared | 15 ++++--- graphics/hugin/pkg/PLIST | 42 +++++++++++++------ 8 files changed, 69 insertions(+), 72 deletions(-) delete mode 100644 graphics/hugin/patches/patch-src_hugin_base_test_CMakeLists_txt delete mode 100644 graphics/hugin/pkg/MESSAGE diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index 755ff82b67d..429d5557877 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -1,13 +1,14 @@ -# $OpenBSD: Makefile,v 1.23 2010/11/17 08:05:14 espie Exp $ +# $OpenBSD: Makefile,v 1.24 2011/03/02 08:30:27 sthen Exp $ VMEM_WARNING = Yes COMMENT = panorama image stitcher -DISTNAME = hugin-2010.2.0 +DISTNAME = hugin-2010.4.0 +EXTRACT_SUFX = .tar.bz2 +# not needed for releases, but makes RCs/betas easier to work with PKGNAME = ${DISTNAME:S/_//:L} -REVISION = 0 WRKDIST = ${WRKDIR}/${DISTNAME:C/_.*//} SHARED_LIBS += huginbasewx 0.0 @@ -15,6 +16,9 @@ SHARED_LIBS += celeste 0.0 SHARED_LIBS += huginANN 0.0 SHARED_LIBS += huginbase 1.0 SHARED_LIBS += huginvigraimpex 0.0 +SHARED_LIBS += icpfindlib 0.0 +SHARED_LIBS += localfeatures 0.0 +SHARED_LIBS += makefilelib 0.0 CATEGORIES = graphics x11 @@ -29,7 +33,9 @@ PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes WANTLIB += GL GLEW GLU Half Iex Imath IlmImf IlmThread ICE SM X11 -WANTLIB += Xext Xi Xmu boost_date_time-mt boost_thread-mt c +WANTLIB += Xext Xi Xmu boost_date_time-mt boost_filesystem-mt +WANTLIB += boost_iostreams-mt boost_regex-mt boost_signals-mt +WANTLIB += boost_system-mt boost_thread-mt c WANTLIB += exiv2 glut>=4.1 jpeg m pano13>=2.0 png pthread WANTLIB += stdc++ tiff wx_base wx_base_net wx_base_xml wx_gtk2_adv WANTLIB += wx_gtk2_core wx_gtk2_gl wx_gtk2_html wx_gtk2_xrc z @@ -37,7 +43,6 @@ WANTLIB += wx_gtk2_core wx_gtk2_gl wx_gtk2_html wx_gtk2_xrc z MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=hugin/} RUN_DEPENDS = devel/desktop-file-utils \ - graphics/autopano-sift-c \ graphics/enblend-enfuse \ graphics/p5-Image-ExifTool \ devel/gmake # yes, really a RUN_DEPENDS diff --git a/graphics/hugin/distinfo b/graphics/hugin/distinfo index 218d40a50de..4e2c3b0d1bc 100644 --- a/graphics/hugin/distinfo +++ b/graphics/hugin/distinfo @@ -1,5 +1,5 @@ -MD5 (hugin-2010.2.0.tar.gz) = vpTARUkk/1t9vqRzY5X3sQ== -RMD160 (hugin-2010.2.0.tar.gz) = w50nm/lc31aG5ZlAMLtOthuihao= -SHA1 (hugin-2010.2.0.tar.gz) = 8GdvKM0/vrz0CG9Vr3zwlWZ3KJk= -SHA256 (hugin-2010.2.0.tar.gz) = cP0dX/oBez6xTgdgzXAYWqtkGqND0Sn5WQgmsB1d8uI= -SIZE (hugin-2010.2.0.tar.gz) = 12412050 +MD5 (hugin-2010.4.0.tar.bz2) = v9cWZVRhmHMSsvLwDJDcxQ== +RMD160 (hugin-2010.4.0.tar.bz2) = +XuNN0cEQ+uBw+kV5fXvqRInsTU= +SHA1 (hugin-2010.4.0.tar.bz2) = R/JcCouXwnEI5We80iIDyH8mjQc= +SHA256 (hugin-2010.4.0.tar.bz2) = 1FzGXfa0JO9b8cXSzZmjYOz9pGaIeCx1823VNBy5w44= +SIZE (hugin-2010.4.0.tar.bz2) = 11009978 diff --git a/graphics/hugin/patches/patch-src_hugin1_base_wx_RunStitchPanel_cpp b/graphics/hugin/patches/patch-src_hugin1_base_wx_RunStitchPanel_cpp index 84adf149754..3e05994ded5 100644 --- a/graphics/hugin/patches/patch-src_hugin1_base_wx_RunStitchPanel_cpp +++ b/graphics/hugin/patches/patch-src_hugin1_base_wx_RunStitchPanel_cpp @@ -1,12 +1,12 @@ -$OpenBSD: patch-src_hugin1_base_wx_RunStitchPanel_cpp,v 1.2 2010/10/20 15:32:40 sthen Exp $ ---- src/hugin1/base_wx/RunStitchPanel.cpp.orig Mon Aug 30 23:32:08 2010 -+++ src/hugin1/base_wx/RunStitchPanel.cpp Sat Sep 4 21:51:35 2010 -@@ -252,7 +252,7 @@ bool RunStitchPanel::StitchProject(wxString scriptFile - cmd = wxT("make"); - } - cmd += wxT(" ") + args; +$OpenBSD: patch-src_hugin1_base_wx_RunStitchPanel_cpp,v 1.3 2011/03/02 08:30:27 sthen Exp $ +--- src/hugin1/base_wx/RunStitchPanel.cpp.orig Tue Dec 28 12:57:50 2010 ++++ src/hugin1/base_wx/RunStitchPanel.cpp Tue Feb 8 11:03:12 2011 +@@ -112,7 +112,7 @@ wxString getGNUMakeCmd(const wxString &args) + cmd = wxT("make"); + } + cmd += wxT(" ") + args; -#elif defined __FreeBSD__ +#elif defined __FreeBSD__ || defined __OpenBSD__ - wxString cmd = wxT("gmake ") + args; + wxString cmd = wxT("gmake ") + args; #elif defined __WXMSW__ - wxString cmdExe; + wxString cmdExe; diff --git a/graphics/hugin/patches/patch-src_hugin_base_test_CMakeLists_txt b/graphics/hugin/patches/patch-src_hugin_base_test_CMakeLists_txt deleted file mode 100644 index a3c8b998e74..00000000000 --- a/graphics/hugin/patches/patch-src_hugin_base_test_CMakeLists_txt +++ /dev/null @@ -1,9 +0,0 @@ -$OpenBSD: patch-src_hugin_base_test_CMakeLists_txt,v 1.1 2010/05/29 01:23:55 sthen Exp $ ---- src/hugin_base/test/CMakeLists.txt.orig Sun Sep 6 23:25:34 2009 -+++ src/hugin_base/test/CMakeLists.txt Sun Sep 6 23:29:43 2009 -@@ -1,4 +1,4 @@ - - add_executable(open_file open_file.cpp) --target_link_libraries(open_file ${common_libs} ${image_libs}) -+target_link_libraries(open_file ${wxWidgets_LIBRARIES} ${Boost_LIBRARIES} ${common_libs} ${image_libs}) - diff --git a/graphics/hugin/pkg/DESCR b/graphics/hugin/pkg/DESCR index 2b400dbefd5..18d9268cc4a 100644 --- a/graphics/hugin/pkg/DESCR +++ b/graphics/hugin/pkg/DESCR @@ -1,22 +1,8 @@ -Goal: an easy to use cross-platform panoramic imaging toolchain -based on the Panorama Tools library. - -With hugin you can assemble a mosaic of photographs into a -complete immersive panorama, stitch any series of overlapping -pictures and much more. - -This package contains the following programs: - - - hugin, The main program, a GUI for the panorama tools suite - and some programs included here. - - - nona, a simple replacement for PTStitcher (doesn't support most - features of PTStitcher, but is faster, opensource and - will be extended in the future). - - - nona_gui, nona with a graphical progress bar. - - - autooptimiser, optimise a panorama pairwise, starting from an - anchor image. cmd line version of the pairwise mode in hugin. +Hugin is a panoramic imaging toolchain and easy-to-use GUI frontend, +based on the Panorama Tools library. It allows you to assemble a mosaic +of photographs into a complete immersive panorama, stitch any series +of overlapping pictures, correct for various lens characteristics, +work with high dynamic range images, automatically identify control +points for image matching, and much more. Tutorials: http://hugin.sourceforge.net/tutorials/ diff --git a/graphics/hugin/pkg/MESSAGE b/graphics/hugin/pkg/MESSAGE deleted file mode 100644 index d2fecb6ab8c..00000000000 --- a/graphics/hugin/pkg/MESSAGE +++ /dev/null @@ -1,6 +0,0 @@ -You may optionally install autopano-sift-C to automatically detect -similar image features and generate control points. As autopano-sift-C -uses the SIFT algorithm, which is patented in the USA, this is not -automatically installed as a dependency. - -Either "pkg_add autopano-sift-c" or select your control points manually. diff --git a/graphics/hugin/pkg/PFRAG.shared b/graphics/hugin/pkg/PFRAG.shared index 154f986a2e9..c131189cc13 100644 --- a/graphics/hugin/pkg/PFRAG.shared +++ b/graphics/hugin/pkg/PFRAG.shared @@ -1,6 +1,9 @@ -@comment $OpenBSD: PFRAG.shared,v 1.5 2010/10/20 15:32:40 sthen Exp $ -@lib lib/libceleste.so.${LIBceleste_VERSION} -@lib lib/libhuginANN.so.${LIBhuginANN_VERSION} -@lib lib/libhuginbase.so.${LIBhuginbase_VERSION} -@lib lib/libhuginbasewx.so.${LIBhuginbasewx_VERSION} -@lib lib/libhuginvigraimpex.so.${LIBhuginvigraimpex_VERSION} +@comment $OpenBSD: PFRAG.shared,v 1.6 2011/03/02 08:30:27 sthen Exp $ +@lib lib/hugin/libceleste.so.${LIBceleste_VERSION} +@lib lib/hugin/libhuginANN.so.${LIBhuginANN_VERSION} +@lib lib/hugin/libhuginbase.so.${LIBhuginbase_VERSION} +@lib lib/hugin/libhuginbasewx.so.${LIBhuginbasewx_VERSION} +@lib lib/hugin/libhuginvigraimpex.so.${LIBhuginvigraimpex_VERSION} +@lib lib/hugin/libicpfindlib.so.${LIBicpfindlib_VERSION} +@lib lib/hugin/liblocalfeatures.so.${LIBlocalfeatures_VERSION} +@lib lib/hugin/libmakefilelib.so.${LIBmakefilelib_VERSION} diff --git a/graphics/hugin/pkg/PLIST b/graphics/hugin/pkg/PLIST index 07bddbec053..8a7c28b42e8 100644 --- a/graphics/hugin/pkg/PLIST +++ b/graphics/hugin/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.6 2010/10/20 15:32:40 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.7 2011/03/02 08:30:27 sthen Exp $ %%SHARED%% @bin bin/PTBatcher @bin bin/PTBatcherGUI @@ -7,12 +7,15 @@ bin/autopano-noop.sh @bin bin/calibrate_lens @bin bin/celeste_standalone +@bin bin/checkpto @bin bin/cpclean +@bin bin/cpfind @bin bin/deghosting_mask @bin bin/fulla @bin bin/hugin @bin bin/hugin_hdrmerge @bin bin/hugin_stitch_project +@bin bin/icpfind @bin bin/matchpoint @bin bin/nona @bin bin/nona_gui @@ -22,17 +25,21 @@ bin/autopano-noop.sh @bin bin/pto_merge @bin bin/tca_correct @bin bin/vig_optimize +lib/hugin/ @man man/man1/PTBatcherGUI.1 @man man/man1/align_image_stack.1 @man man/man1/autooptimiser.1 @man man/man1/calibrate_lens.1 @man man/man1/celeste_standalone.1 +@man man/man1/checkpto.1 @man man/man1/cpclean.1 +@man man/man1/cpfind.1 @man man/man1/deghosting_mask.1 @man man/man1/fulla.1 @man man/man1/hugin.1 @man man/man1/hugin_hdrmerge.1 @man man/man1/hugin_stitch_project.1 +@man man/man1/icpfind.1 @man man/man1/nona.1 @man man/man1/nona_gui.1 @man man/man1/pano_modify.1 @@ -47,6 +54,7 @@ share/hugin/ share/hugin/Makefile.equirect.mk share/hugin/data/ share/hugin/data/celeste.model +share/hugin/data/default.setting share/hugin/xrc/ share/hugin/xrc/about.xrc share/hugin/xrc/assistant_panel.xrc @@ -65,7 +73,10 @@ share/hugin/xrc/data/add_project.png share/hugin/xrc/data/add_projects.png share/hugin/xrc/data/autocrop_tool.png share/hugin/xrc/data/center_pano.png +share/hugin/xrc/data/crop_tool.png share/hugin/xrc/data/crop_tool_small.png +share/hugin/xrc/data/dedication.htm +share/hugin/xrc/data/drag_tool.png share/hugin/xrc/data/drag_tool_small.png share/hugin/xrc/data/druid.control.128.png share/hugin/xrc/data/druid.images.128.png @@ -237,9 +248,11 @@ share/hugin/xrc/data/help_en_EN/Chromatic_aberration.html share/hugin/xrc/data/help_en_EN/Color_correct_tiff.html share/hugin/xrc/data/help_en_EN/Colour_profile.html share/hugin/xrc/data/help_en_EN/Contrast.html +share/hugin/xrc/data/help_en_EN/Control_Point_Detector_Parameters.html share/hugin/xrc/data/help_en_EN/Control_point_generators.html share/hugin/xrc/data/help_en_EN/Control_points.html share/hugin/xrc/data/help_en_EN/Cpclean.html +share/hugin/xrc/data/help_en_EN/Cpfind.html share/hugin/xrc/data/help_en_EN/Crop_factor.html share/hugin/xrc/data/help_en_EN/Cropped_TIFF.html share/hugin/xrc/data/help_en_EN/Cubic.html @@ -322,9 +335,11 @@ share/hugin/xrc/data/help_en_EN/Hugin_remove_project.png share/hugin/xrc/data/help_en_EN/Hugin_save_batch.png share/hugin/xrc/data/help_en_EN/Hugin_skip_batch.png share/hugin/xrc/data/help_en_EN/Hugin_start_batch.png +share/hugin/xrc/data/help_en_EN/Hugin_stitch_project.html share/hugin/xrc/data/help_en_EN/Hugin_straighten_pano.png share/hugin/xrc/data/help_en_EN/Hugin_translation_guide.html share/hugin/xrc/data/help_en_EN/Hugin_undo.png +share/hugin/xrc/data/help_en_EN/Icpfind.html share/hugin/xrc/data/help_en_EN/Interpolate_none.jpg share/hugin/xrc/data/help_en_EN/Interpolate_poly3.jpg share/hugin/xrc/data/help_en_EN/Interpolate_sinc256.jpg @@ -428,10 +443,14 @@ share/hugin/xrc/data/help_en_EN/f103730f19548bcf3e7bc170fb1f7860.png share/hugin/xrc/data/help_en_EN/f44fbe128fd280b77a856b2275d7a655.png share/hugin/xrc/data/help_en_EN/fa5313ae442c1ac7f832c141880e3e74.png share/hugin/xrc/data/help_en_EN/fd9eb36b9149cc4e2efebd10bdc4fdf2.png +share/hugin/xrc/data/help_en_EN/help_index_en.hhk +share/hugin/xrc/data/help_en_EN/help_toc_en.hhc share/hugin/xrc/data/help_en_EN/hugin.hhc share/hugin/xrc/data/help_en_EN/hugin.hhk share/hugin/xrc/data/help_en_EN/hugin.hhp +share/hugin/xrc/data/help_en_EN/hugin_help_en_EN.hhp share/hugin/xrc/data/help_en_EN/license.html +share/hugin/xrc/data/help_en_EN/panotoolsng.png share/hugin/xrc/data/help_it_IT/ share/hugin/xrc/data/help_it_IT/16bit_workflow_with_hugin.html share/hugin/xrc/data/help_it_IT/Aliasing.html @@ -550,37 +569,35 @@ share/hugin/xrc/data/help_it_IT/Wavy_distortion.html share/hugin/xrc/data/help_it_IT/Yaw.html share/hugin/xrc/data/help_it_IT/Zenith.html share/hugin/xrc/data/help_it_IT/license.html +share/hugin/xrc/data/hugin.ico share/hugin/xrc/data/hugin.png -share/hugin/xrc/data/icon.ico -share/hugin/xrc/data/icon.png -share/hugin/xrc/data/icon_128x128.ico -share/hugin/xrc/data/icon_128x128.png -share/hugin/xrc/data/icon_16x16.ico -share/hugin/xrc/data/icon_32x32.ico -share/hugin/xrc/data/icon_48x48.ico -share/hugin/xrc/data/icon_48x48.png -share/hugin/xrc/data/icon_64x64.ico -share/hugin/xrc/data/icon_72x72.ico -share/hugin/xrc/data/icon_96x96.ico share/hugin/xrc/data/identify_tool.png share/hugin/xrc/data/identify_tool_small.png share/hugin/xrc/data/info.png share/hugin/xrc/data/keyboard_pl.html share/hugin/xrc/data/list.png share/hugin/xrc/data/logo.png +share/hugin/xrc/data/milko.png share/hugin/xrc/data/nona_enblend.mk share/hugin/xrc/data/nona_multilayer.mk share/hugin/xrc/data/nona_smartblend.mk share/hugin/xrc/data/optimize.png share/hugin/xrc/data/pause.png +share/hugin/xrc/data/photometric.png share/hugin/xrc/data/preview.png share/hugin/xrc/data/preview_auto_update.png +share/hugin/xrc/data/preview_control_point_tool.png +share/hugin/xrc/data/preview_layout.png share/hugin/xrc/data/preview_layout_small.png share/hugin/xrc/data/preview_num_transform.png share/hugin/xrc/data/preview_show_all.png share/hugin/xrc/data/preview_show_none.png +share/hugin/xrc/data/ptbatcher.ico +share/hugin/xrc/data/ptbatcher.png share/hugin/xrc/data/ptmender_enblend.mk share/hugin/xrc/data/ptmender_smartblend.mk +share/hugin/xrc/data/pto_icon.ico +share/hugin/xrc/data/pto_icon.png share/hugin/xrc/data/redo.png share/hugin/xrc/data/reload.png share/hugin/xrc/data/remove_project.png @@ -645,5 +662,6 @@ share/mime/packages/ share/mime/packages/hugin.xml share/pixmaps/ share/pixmaps/hugin.png +share/pixmaps/ptbatcher.png @exec %D/bin/update-desktop-database @unexec-delete %D/bin/update-desktop-database