cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update Hugin to 2010.2.0

Browse Source
This commit is contained in:
sthen 2010-10-20 15:32:40 +00:00
parent ca9c6bdd67
commit aa1ee2b3a8
11 changed files with 75 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
graphics/hugin/Makefile
View File

@ -1,19 +1,19 @@
# $OpenBSD: Makefile,v 1.19 2010/10/18 18:13:14 espie Exp $
# $OpenBSD: Makefile,v 1.20 2010/10/20 15:32:40 sthen Exp $
VMEM_WARNING = Yes
COMMENT = panorama image stitcher
DISTNAME = hugin-2010.0.0
DISTNAME = hugin-2010.2.0
PKGNAME = ${DISTNAME:S/_//:L}p1
PKGNAME = ${DISTNAME:S/_//:L}
WRKDIST = ${WRKDIR}/${DISTNAME:C/_.*//}
SHARED_LIBS = celeste 0.0 \
huginANN 0.0 \
huginbase 1.0 \
huginjhead 0.0 \
huginvigraimpex 0.0
SHARED_LIBS += huginbasewx 0.0
SHARED_LIBS += celeste 0.0
SHARED_LIBS += huginANN 0.0
SHARED_LIBS += huginbase 1.0
SHARED_LIBS += huginvigraimpex 0.0
CATEGORIES = graphics x11
@ -27,7 +27,11 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM =Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = GL GLU ICE SM X11 Xext Xi Xmu c m pthread stdc++ z
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 += 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
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=hugin/}
@ -36,20 +40,20 @@ RUN_DEPENDS = :desktop-file-utils-*:devel/desktop-file-utils \
::graphics/enblend-enfuse \
::graphics/p5-Image-ExifTool \
::devel/gmake # yes, really a RUN_DEPENDS
LIB_DEPENDS = boost_thread-mt::devel/boost \
exiv2.>=0.1:exiv2->=0.12:graphics/exiv2 \
GLEW::graphics/glew \
glut.>=4.1::graphics/freeglut \
Half,Iex,Imath,IlmThread::graphics/ilmbase \
jpeg::graphics/jpeg \
pano13::graphics/libpano13 \
IlmImf::graphics/openexr \
png::graphics/png \
tiff::graphics/tiff \
wx_base,wx_base_net,wx_base_xml,wx_gtk2_adv,wx_gtk2_core,wx_gtk2_gl,wx_gtk2_html,wx_gtk2_xrc::x11/wxWidgets
LIB_DEPENDS = ::devel/boost \
:exiv2->=0.12:graphics/exiv2 \
::graphics/glew \
::graphics/freeglut \
::graphics/ilmbase \
::graphics/jpeg \
:libpano13->=2.9.17rc1:graphics/libpano13 \
::graphics/openexr \
::graphics/png \
::graphics/tiff \
::x11/wxWidgets
USE_X11= Yes
USE_GROFF = Yes
USE_GROFF = Yes
USE_X11 = Yes
MODULES += devel/cmake
SEPARATE_BUILD = simple
CONFIGURE_STYLE = cmake

10
graphics/hugin/distinfo
View File

@ -1,5 +1,5 @@
MD5 (hugin-2010.0.0.tar.gz) = DNC3jg2GYCPjtmReUBCHbw==
RMD160 (hugin-2010.0.0.tar.gz) = 4rA/4ApKAkKh88T9ZBz4o+MS1RY=
SHA1 (hugin-2010.0.0.tar.gz) = QetyU6qxK5E6XJttmXXYZSOQ3LU=
SHA256 (hugin-2010.0.0.tar.gz) = 7TDFAhcJuJcKQ/HkwilbXImbwPuH/7YxNaPA7N47tSM=
SIZE (hugin-2010.0.0.tar.gz) = 12085453
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

8
graphics/hugin/patches/patch-CMakeLists_txt
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-CMakeLists_txt,v 1.5 2010/05/29 01:23:55 sthen Exp $
--- CMakeLists.txt.orig Tue Mar 2 23:17:21 2010
+++ CMakeLists.txt Sat May 8 10:00:46 2010
@@ -125,6 +125,7 @@ ENDIF(WIN32)
$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)
# finding the wxWidgets distributions of those packages (Win32 only).
SET(wxWidgets_USE_LIBS base core xrc html xml adv gl net)

10
graphics/hugin/patches/patch-CMakeModules_FindGLEW_cmake
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-CMakeModules_FindGLEW_cmake,v 1.1 2010/05/29 01:23:55 sthen Exp $
--- CMakeModules/FindGLEW.cmake.orig Sun Sep 6 12:20:05 2009
+++ CMakeModules/FindGLEW.cmake Sun Sep 6 21:47:04 2009
@@ -8,8 +8,8 @@ IF(WIN32)
# for dynamic build, it's glew32.lib and the dll must be copied into hugin's bin folder
$OpenBSD: patch-CMakeModules_FindGLEW_cmake,v 1.2 2010/10/20 15:32:40 sthen Exp $
--- CMakeModules/FindGLEW.cmake.orig Sat Sep 4 21:51:34 2010
+++ CMakeModules/FindGLEW.cmake Sat Sep 4 21:51:34 2010
@@ -12,8 +12,8 @@ IF(WIN32)
SET(GLEW_LIBRARIES ${SOURCE_BASE_DIR}/glew/lib/glew32s.lib)
ENDIF(${HUGIN_SHARED})
ELSE(WIN32)
- FIND_PATH(GLEW_INCLUDE_DIR GL/glew.h PATHS /usr/include /usr/local/include)
- FIND_LIBRARY(GLEW_LIBRARIES GLEW PATHS /usr/lib /usr/local/lib)

8
graphics/hugin/patches/patch-CMakeModules_FindPNG_cmake
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-CMakeModules_FindPNG_cmake,v 1.2 2010/05/29 01:23:55 sthen Exp $
--- CMakeModules/FindPNG.cmake.orig Fri Sep 4 21:45:27 2009
+++ CMakeModules/FindPNG.cmake Fri Sep 4 21:45:27 2009
$OpenBSD: patch-CMakeModules_FindPNG_cmake,v 1.3 2010/10/20 15:32:40 sthen Exp $
--- CMakeModules/FindPNG.cmake.orig Sat Sep 4 21:51:34 2010
+++ CMakeModules/FindPNG.cmake Sat Sep 4 21:51:35 2010
@@ -22,6 +22,7 @@ SET(PNG_FOUND "NO")
IF (ZLIB_FOUND)
@ -8,4 +8,4 @@ $OpenBSD: patch-CMakeModules_FindPNG_cmake,v 1.2 2010/05/29 01:23:55 sthen Exp $
+ ${LOCALBASE}/include/libpng
/usr/local/include
/usr/include
${wxWidgets_ROOT_DIR}/src/png
${SOURCE_BASE_DIR}/lpng142

8
graphics/hugin/patches/patch-src_celeste_Utilities_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_celeste_Utilities_cpp,v 1.2 2009/06/03 13:45:14 sthen Exp $
--- src/celeste/Utilities.cpp.orig Mon Jun 1 21:56:10 2009
+++ src/celeste/Utilities.cpp Wed Jun 3 02:22:10 2009
$OpenBSD: patch-src_celeste_Utilities_cpp,v 1.3 2010/10/20 15:32:40 sthen Exp $
--- src/celeste/Utilities.cpp.orig Mon Aug 30 23:32:08 2010
+++ src/celeste/Utilities.cpp Sat Sep 4 21:51:35 2010
@@ -26,6 +26,7 @@ Copyright (c) 2002-3 Adriaan Tijsseling
*/
@ -8,4 +8,4 @@ $OpenBSD: patch-src_celeste_Utilities_cpp,v 1.2 2009/06/03 13:45:14 sthen Exp $
+#include <unistd.h>
#include <stdlib.h>
#include "Utilities.h"
#include <Config.h>

10
graphics/hugin/patches/patch-src_hugin1_base_wx_RunStitchPanel_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_hugin1_base_wx_RunStitchPanel_cpp,v 1.1 2010/05/29 01:23:55 sthen Exp $
--- src/hugin1/base_wx/RunStitchPanel.cpp.orig Sat May 29 01:08:31 2010
+++ src/hugin1/base_wx/RunStitchPanel.cpp Sat May 29 01:08:39 2010
$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");
}
@ -8,5 +8,5 @@ $OpenBSD: patch-src_hugin1_base_wx_RunStitchPanel_cpp,v 1.1 2010/05/29 01:23:55
-#elif defined __FreeBSD__
+#elif defined __FreeBSD__ || defined __OpenBSD__
wxString cmd = wxT("gmake ") + args;
#else
wxString cmd = wxT("make ") + args;
#elif defined __WXMSW__
wxString cmdExe;

12
graphics/hugin/patches/patch-src_hugin1_hugin_config_defaults_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_hugin1_hugin_config_defaults_h,v 1.2 2010/05/29 01:23:55 sthen Exp $
--- src/hugin1/hugin/config_defaults.h.orig Tue Mar 2 23:17:13 2010
+++ src/hugin1/hugin/config_defaults.h Sat May 8 10:00:46 2010
@@ -133,7 +133,7 @@
#endif
-#elif defined unix
+#elif ((defined unix) || (defined __unix__))
#define HUGIN_PT_SCRIPTFILE "PT_script.txt"

2
graphics/hugin/pkg/MESSAGE
View File

@ -3,4 +3,4 @@ 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 these manually.
Either "pkg_add autopano-sift-c" or select your control points manually.

3
graphics/hugin/pkg/PFRAG.shared
View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PFRAG.shared,v 1.4 2010/04/15 20:47:17 dcoppa Exp $
@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}

21
graphics/hugin/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.5 2010/05/29 01:23:55 sthen Exp $
@comment $OpenBSD: PLIST,v 1.6 2010/10/20 15:32:40 sthen Exp $
%%SHARED%%
@bin bin/PTBatcher
@bin bin/PTBatcherGUI
@ -16,7 +16,10 @@ bin/autopano-noop.sh
@bin bin/matchpoint
@bin bin/nona
@bin bin/nona_gui
@bin bin/pano_modify
@bin bin/pano_trafo
@bin bin/pto2mk
@bin bin/pto_merge
@bin bin/tca_correct
@bin bin/vig_optimize
@man man/man1/PTBatcherGUI.1
@ -32,7 +35,10 @@ bin/autopano-noop.sh
@man man/man1/hugin_stitch_project.1
@man man/man1/nona.1
@man man/man1/nona_gui.1
@man man/man1/pano_modify.1
@man man/man1/pano_trafo.1
@man man/man1/pto2mk.1
@man man/man1/pto_merge.1
@man man/man1/tca_correct.1
@man man/man1/vig_optimize.1
share/applications/PTBatcherGUI.desktop
@ -107,6 +113,7 @@ share/hugin/xrc/data/help_en_EN/180px-Fast_preview_guide_start.png
share/hugin/xrc/data/help_en_EN/180px-Focal_length.gif
share/hugin/xrc/data/help_en_EN/180px-LagardePont-fish.jpg
share/hugin/xrc/data/help_en_EN/180px-Lamp_enfuse.jpg
share/hugin/xrc/data/help_en_EN/197px-Field-of-view.svg.png
share/hugin/xrc/data/help_en_EN/1f09c25c5247c1eaf121df644ca42f8c.png
share/hugin/xrc/data/help_en_EN/200px-Ben_Architectural.jpg
share/hugin/xrc/data/help_en_EN/200px-Ben_Equirectangular_panini.jpg
@ -126,6 +133,7 @@ share/hugin/xrc/data/help_en_EN/22px-Fast_preview_icon_crop.svg.png
share/hugin/xrc/data/help_en_EN/22px-Fast_preview_icon_drag.svg.png
share/hugin/xrc/data/help_en_EN/22px-Fast_preview_icon_identify.svg.png
share/hugin/xrc/data/help_en_EN/22px-Fast_preview_icon_photometric.svg.png
share/hugin/xrc/data/help_en_EN/22px-Preview_layout.svg.png
share/hugin/xrc/data/help_en_EN/22px-Show_Control_Points_Button.svg.png
share/hugin/xrc/data/help_en_EN/24597ccab188a3598a0828c69e380228.png
share/hugin/xrc/data/help_en_EN/250px-Cubic.jpg
@ -141,6 +149,7 @@ share/hugin/xrc/data/help_en_EN/250px-TKS-Mmm-obliquev120-recti.png
share/hugin/xrc/data/help_en_EN/29e2300eb2f198d830f04682f14872e2.png
share/hugin/xrc/data/help_en_EN/3016f25d3d1249eab1305b78b0b82d3d.png
share/hugin/xrc/data/help_en_EN/312418a7fcf9d47adc8e5683e89c58cd.png
share/hugin/xrc/data/help_en_EN/360px-Pantheon-150x100-rect-panini.jpg
share/hugin/xrc/data/help_en_EN/38d368a092f7d5a4d2b42bdf4d0dd89c.png
share/hugin/xrc/data/help_en_EN/3d6de401d007ea0cffc99610ad623239.png
share/hugin/xrc/data/help_en_EN/400px-220x120deg-panini-grid.png
@ -278,10 +287,14 @@ share/hugin/xrc/data/help_en_EN/Hugin_Fast_Preview_window.html
share/hugin/xrc/data/help_en_EN/Hugin_Images_tab.html
share/hugin/xrc/data/help_en_EN/Hugin_Keyboard_shortcuts.html
share/hugin/xrc/data/help_en_EN/Hugin_Main_window.html
share/hugin/xrc/data/help_en_EN/Hugin_Mask_tab.html
share/hugin/xrc/data/help_en_EN/Hugin_Optimizer_tab.html
share/hugin/xrc/data/help_en_EN/Hugin_Parameters_for_Control_Point_Detectors_dialog.html
share/hugin/xrc/data/help_en_EN/Hugin_Preferences.html
share/hugin/xrc/data/help_en_EN/Hugin_Preview_window.html
share/hugin/xrc/data/help_en_EN/Hugin_Reset_Values_window.html
share/hugin/xrc/data/help_en_EN/Hugin_Stitcher_tab.html
share/hugin/xrc/data/help_en_EN/Hugin_Trackers.html
share/hugin/xrc/data/help_en_EN/Hugin_add_project.png
share/hugin/xrc/data/help_en_EN/Hugin_cancel_batch.png
share/hugin/xrc/data/help_en_EN/Hugin_center_pano.png
@ -320,6 +333,7 @@ share/hugin/xrc/data/help_en_EN/JPEG.html
share/hugin/xrc/data/help_en_EN/LICENCE.manual
share/hugin/xrc/data/help_en_EN/Landscape.html
share/hugin/xrc/data/help_en_EN/Laplacian-of-gaussian.png
share/hugin/xrc/data/help_en_EN/Layout-small.png
share/hugin/xrc/data/help_en_EN/Lens_correction_model.html
share/hugin/xrc/data/help_en_EN/Lens_distortion.html
share/hugin/xrc/data/help_en_EN/Lightprobe.html
@ -344,6 +358,7 @@ 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/Pano12.html
share/hugin/xrc/data/help_en_EN/Pano_modify.html
share/hugin/xrc/data/help_en_EN/Panoglview.html
share/hugin/xrc/data/help_en_EN/Panoinfo.html
share/hugin/xrc/data/help_en_EN/Panomatic.html
@ -363,6 +378,7 @@ share/hugin/xrc/data/help_en_EN/Pitch.html
share/hugin/xrc/data/help_en_EN/Portrait.html
share/hugin/xrc/data/help_en_EN/Projections.html
share/hugin/xrc/data/help_en_EN/Pto2mk.html
share/hugin/xrc/data/help_en_EN/Pto_merge.html
share/hugin/xrc/data/help_en_EN/QTVR.html
share/hugin/xrc/data/help_en_EN/Qtvr2img.html
share/hugin/xrc/data/help_en_EN/RAW.html
@ -559,6 +575,7 @@ share/hugin/xrc/data/optimize.png
share/hugin/xrc/data/pause.png
share/hugin/xrc/data/preview.png
share/hugin/xrc/data/preview_auto_update.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
@ -583,13 +600,13 @@ share/hugin/xrc/lens_panel.xrc
share/hugin/xrc/main_frame.xrc
share/hugin/xrc/main_menu.xrc
share/hugin/xrc/main_tool.xrc
share/hugin/xrc/mask_editor_panel.xrc
share/hugin/xrc/optimize_panel.xrc
share/hugin/xrc/optimize_photo_panel.xrc
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/hugin/xrc/vig_corr_dlg.xrc
share/icons/
share/icons/gnome/
share/icons/gnome/48x48/