update Hugin to 2011.0.0 final. RC was tested by Kirill Bychkov, thanks!

This commit is contained in:
sthen 2011-05-30 09:06:28 +00:00
parent 338aba239b
commit e70f5cde48
7 changed files with 81 additions and 37 deletions

View File

@ -1,10 +1,11 @@
# $OpenBSD: Makefile,v 1.24 2011/03/02 08:30:27 sthen Exp $
# $OpenBSD: Makefile,v 1.25 2011/05/30 09:06:28 sthen Exp $
VMEM_WARNING = Yes
SHARED_ONLY = Yes
COMMENT = panorama image stitcher
DISTNAME = hugin-2010.4.0
DISTNAME = hugin-2011.0.0
EXTRACT_SUFX = .tar.bz2
# not needed for releases, but makes RCs/betas easier to work with
@ -35,9 +36,9 @@ 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_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 += boost_system-mt boost_thread-mt c exiv2 glut>=4.1
WANTLIB += jpeg m pano13>=2.0 png pthread stdc++ tiff wx_base
WANTLIB += wx_base_net wx_base_xml wx_gtk2_adv wx_gtk2_aui
WANTLIB += wx_gtk2_core wx_gtk2_gl wx_gtk2_html wx_gtk2_xrc z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=hugin/}
@ -52,11 +53,11 @@ LIB_DEPENDS = devel/boost \
graphics/freeglut \
graphics/ilmbase \
graphics/jpeg \
graphics/libpano13>=2.9.17rc1 \
graphics/libpano13>=2.9.18beta1 \
graphics/openexr \
graphics/png \
graphics/tiff \
x11/wxWidgets
x11/wxWidgets>=2.7
USE_GROFF = Yes
MODULES += devel/cmake

View File

@ -1,5 +1,5 @@
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
MD5 (hugin-2011.0.0.tar.bz2) = rIoSm0wwISM99tk2jIFkzw==
RMD160 (hugin-2011.0.0.tar.bz2) = E4iYBYDsunCg1HWX3fBt+bhasrU=
SHA1 (hugin-2011.0.0.tar.bz2) = IuGtOEYpGpu+WFcGg+ITkhpvARY=
SHA256 (hugin-2011.0.0.tar.bz2) = hmJz9iGNMApSwBSJYGgfqixOBTg9l/hooutHtFe19Pw=
SIZE (hugin-2011.0.0.tar.bz2) = 11439430

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-CMakeLists_txt,v 1.6 2010/10/20 15:32:40 sthen Exp $
--- CMakeLists.txt.orig Mon Aug 30 23:32:07 2010
+++ CMakeLists.txt Sat Sep 4 21:51:34 2010
@@ -152,6 +152,7 @@ ENDIF(WIN32)
$OpenBSD: patch-CMakeLists_txt,v 1.7 2011/05/30 09:06:28 sthen Exp $
--- CMakeLists.txt.orig Sun Feb 27 23:42:41 2011
+++ CMakeLists.txt Mon Feb 28 08:23:05 2011
@@ -151,6 +151,7 @@ ENDIF(WIN32)
# This must come before FINDs for tiff, jpeg, png, zlib to enable
# finding the wxWidgets distributions of those packages (Win32 only).
SET(wxWidgets_USE_LIBS base core xrc html xml adv gl net)
SET(wxWidgets_USE_LIBS base core aui xrc html xml adv gl net)
+SET(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1)
FIND_PACKAGE(wxWidgets REQUIRED)

View File

@ -0,0 +1,40 @@
$OpenBSD: patch-doc_CMakeLists_txt,v 1.4 2011/05/30 09:06:28 sthen Exp $
--- doc/CMakeLists.txt.orig Mon Feb 28 13:30:22 2011
+++ doc/CMakeLists.txt Mon Feb 28 13:35:53 2011
@@ -10,7 +10,6 @@ ELSE (WIN32)
# For all other systems, generate and install the man pages
FIND_PROGRAM(POD2MAN pod2man)
-FIND_PROGRAM(GZIP gzip)
MACRO(install_man manfile section)
INSTALL(FILES ${manfile} DESTINATION ${MANDIR}/man${section})
@@ -18,22 +17,21 @@ ENDMACRO(install_man)
MACRO(do_pod podfile manfile section)
IF(EXISTS "${CMAKE_SOURCE_DIR}/doc/${podfile}")
- IF(POD2MAN AND GZIP)
+ IF(POD2MAN)
# Try to install compressed manual
SET(outfile "${manfile}.${section}")
# TODO: fix the unaesthetic double quotes in which the HUGIN_PACKAGE_VERSION
# is displayed on the resulting man page
ADD_CUSTOM_COMMAND(
- OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${outfile}.gz"
+ OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${outfile}"
COMMAND ${POD2MAN} --section="${section}" --release="Version: ${HUGIN_PACKAGE_VERSION}" --center=HUGIN "${CMAKE_SOURCE_DIR}/doc/${podfile}" "${CMAKE_CURRENT_BINARY_DIR}/${outfile}"
- COMMAND ${GZIP} "-f" "${CMAKE_CURRENT_BINARY_DIR}/${outfile}"
DEPENDS "${CMAKE_SOURCE_DIR}/doc/${podfile}"
VERBATIM
)
- SET_SOURCE_FILES_PROPERTIES("${CMAKE_CURRENT_BINARY_DIR}/${outfile}.gz" GENERATED)
- install_man("${CMAKE_CURRENT_BINARY_DIR}/${outfile}.gz" ${section})
- LIST(APPEND ManDeps "${CMAKE_CURRENT_BINARY_DIR}/${outfile}.gz")
- ENDIF(POD2MAN AND GZIP)
+ SET_SOURCE_FILES_PROPERTIES("${CMAKE_CURRENT_BINARY_DIR}/${outfile}" GENERATED)
+ install_man("${CMAKE_CURRENT_BINARY_DIR}/${outfile}" ${section})
+ LIST(APPEND ManDeps "${CMAKE_CURRENT_BINARY_DIR}/${outfile}")
+ ENDIF(POD2MAN)
ENDIF()
ENDMACRO(do_pod)

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_hugin1_base_wx_RunStitchPanel_cpp,v 1.3 2011/03/02 08:30:27 sthen Exp $
$OpenBSD: patch-src_hugin1_base_wx_RunStitchPanel_cpp,v 1.4 2011/05/30 09:06:28 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)

View File

@ -1,9 +0,0 @@
@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}

View File

@ -1,5 +1,4 @@
@comment $OpenBSD: PLIST,v 1.7 2011/03/02 08:30:27 sthen Exp $
%%SHARED%%
@comment $OpenBSD: PLIST,v 1.8 2011/05/30 09:06:28 sthen Exp $
@bin bin/PTBatcher
@bin bin/PTBatcherGUI
@bin bin/align_image_stack
@ -26,6 +25,15 @@ bin/autopano-noop.sh
@bin bin/tca_correct
@bin bin/vig_optimize
lib/hugin/
@lib lib/hugin/libceleste.so.${LIBceleste_VERSION}
lib/hugin/libflann_cpp.so
@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}
@man man/man1/PTBatcherGUI.1
@man man/man1/align_image_stack.1
@man man/man1/autooptimiser.1
@ -68,7 +76,6 @@ share/hugin/xrc/crop_panel.xrc
share/hugin/xrc/data/
share/hugin/xrc/data/COPYING
share/hugin/xrc/data/about.htm
share/hugin/xrc/data/about.txt
share/hugin/xrc/data/add_project.png
share/hugin/xrc/data/add_projects.png
share/hugin/xrc/data/autocrop_tool.png
@ -76,6 +83,7 @@ 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/dedication.png
share/hugin/xrc/data/drag_tool.png
share/hugin/xrc/data/drag_tool_small.png
share/hugin/xrc/data/druid.control.128.png
@ -136,6 +144,7 @@ share/hugin/xrc/data/help_en_EN/200px-Big_ben_cylindrical.jpg
share/hugin/xrc/data/help_en_EN/200px-Big_ben_equirectangular.jpg
share/hugin/xrc/data/help_en_EN/200px-Big_ben_mercator.jpg
share/hugin/xrc/data/help_en_EN/200px-Bin_ben_sinusoidal.jpg
share/hugin/xrc/data/help_en_EN/200px-Hugin-2011.0_fpw_overview.png
share/hugin/xrc/data/help_en_EN/200px-Panoglview.png
share/hugin/xrc/data/help_en_EN/21cb21c7c1de5b4c61da90794c62bc1a.png
share/hugin/xrc/data/help_en_EN/220px-Ben_Equirectangular_panini.jpg
@ -177,6 +186,7 @@ share/hugin/xrc/data/help_en_EN/565px-Gaussian.png
share/hugin/xrc/data/help_en_EN/57b296711670bf47db3e71c9f866abad.png
share/hugin/xrc/data/help_en_EN/581px-Entropy.png
share/hugin/xrc/data/help_en_EN/586px-Laplacian-of-gaussian.png
share/hugin/xrc/data/help_en_EN/5a12c95d04637539015c2d09b5002204.png
share/hugin/xrc/data/help_en_EN/5a34bb082daf037b3c4b14c13af6855b.png
share/hugin/xrc/data/help_en_EN/5f558fa7e9b1567daca23dc3433f5cec.png
share/hugin/xrc/data/help_en_EN/600px-Tuebingen_Neckarfront_small15_2006-06-11.jpg
@ -262,6 +272,7 @@ share/hugin/xrc/data/help_en_EN/Cylindrical_Projection.html
share/hugin/xrc/data/help_en_EN/Cylindrical_panorama.html
share/hugin/xrc/data/help_en_EN/DSLR_spherical_resolution.html
share/hugin/xrc/data/help_en_EN/Depth_of_Field.html
share/hugin/xrc/data/help_en_EN/Diffraction.html
share/hugin/xrc/data/help_en_EN/Dust_Removal_with_Flatfield.html
share/hugin/xrc/data/help_en_EN/Dynamic_range.html
share/hugin/xrc/data/help_en_EN/EXIF.html
@ -273,6 +284,7 @@ share/hugin/xrc/data/help_en_EN/Entrance_pupil.html
share/hugin/xrc/data/help_en_EN/Entropy-cutoff.png
share/hugin/xrc/data/help_en_EN/Entropy.png
share/hugin/xrc/data/help_en_EN/Equirectangular.html
share/hugin/xrc/data/help_en_EN/Equirectangular_Panini.html
share/hugin/xrc/data/help_en_EN/Equirectangular_Projection.html
share/hugin/xrc/data/help_en_EN/Field_of_View.html
share/hugin/xrc/data/help_en_EN/Fisheye_Projection.html
@ -372,6 +384,7 @@ share/hugin/xrc/data/help_en_EN/PTStitcher.html
share/hugin/xrc/data/help_en_EN/PTblender.html
share/hugin/xrc/data/help_en_EN/PTmender.html
share/hugin/xrc/data/help_en_EN/PTtiff2psd.html
share/hugin/xrc/data/help_en_EN/Panini.html
share/hugin/xrc/data/help_en_EN/Pano12.html
share/hugin/xrc/data/help_en_EN/Pano_modify.html
share/hugin/xrc/data/help_en_EN/Panoglview.html
@ -450,6 +463,7 @@ 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/manual.css
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
@ -574,10 +588,10 @@ share/hugin/xrc/data/hugin.png
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/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/milko.png
share/hugin/xrc/data/nona_enblend.mk
share/hugin/xrc/data/nona_multilayer.mk
share/hugin/xrc/data/nona_smartblend.mk
@ -592,6 +606,8 @@ 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/preview_white_balance.png
share/hugin/xrc/data/preview_white_balance_small.png
share/hugin/xrc/data/ptbatcher.ico
share/hugin/xrc/data/ptbatcher.png
share/hugin/xrc/data/ptmender_enblend.mk
@ -624,7 +640,6 @@ 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/
share/icons/gnome/
share/icons/gnome/48x48/
share/icons/gnome/48x48/mimetypes/
@ -637,8 +652,6 @@ share/locale/cs_CZ/
share/locale/cs_CZ/LC_MESSAGES/
share/locale/cs_CZ/LC_MESSAGES/hugin.mo
share/locale/de/LC_MESSAGES/hugin.mo
share/locale/en_GB/
share/locale/en_GB/LC_MESSAGES/
share/locale/en_GB/LC_MESSAGES/hugin.mo
share/locale/es/LC_MESSAGES/hugin.mo
share/locale/fi/LC_MESSAGES/hugin.mo
@ -650,6 +663,7 @@ share/locale/ko/LC_MESSAGES/hugin.mo
share/locale/nl/LC_MESSAGES/hugin.mo
share/locale/pl/LC_MESSAGES/hugin.mo
share/locale/pt_BR/LC_MESSAGES/hugin.mo
share/locale/ro/LC_MESSAGES/hugin.mo
share/locale/ru/LC_MESSAGES/hugin.mo
share/locale/sk/LC_MESSAGES/hugin.mo
share/locale/sl/LC_MESSAGES/hugin.mo
@ -657,8 +671,6 @@ share/locale/sv/LC_MESSAGES/hugin.mo
share/locale/uk/LC_MESSAGES/hugin.mo
share/locale/zh_CN/LC_MESSAGES/hugin.mo
share/locale/zh_TW/LC_MESSAGES/hugin.mo
share/mime/
share/mime/packages/
share/mime/packages/hugin.xml
share/pixmaps/
share/pixmaps/hugin.png