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

update to hugin-2014.0.0

Browse Source 
add missing build dependency (from sthen@)
ok sthen@, maintainer
This commit is contained in:
kirby 2015-10-10 08:44:39 +00:00
parent 46acef9019
commit 2f3001454e
6 changed files with 55 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
graphics/hugin/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.44 2015/07/01 08:42:52 jasper Exp $
# $OpenBSD: Makefile,v 1.45 2015/10/10 08:44:39 kirby Exp $
BROKEN-hppa = run dep on enblend-enfuse which will not build on hppa
@ -6,24 +6,23 @@ SHARED_ONLY = Yes
COMMENT = panorama image stitcher
DISTNAME = hugin-2013.0.0
REVISION = 2
DISTNAME = hugin-2014.0.0
EXTRACT_SUFX = .tar.bz2
# not needed for releases, but makes RCs/betas easier to work with
PKGNAME = ${DISTNAME:S/_//:L}
WRKDIST = ${WRKDIR}/${DISTNAME:C/_.*//}
SHARED_LIBS += celeste 1.0
SHARED_LIBS += flann_cpp 1.0
SHARED_LIBS += huginbase 2.0
SHARED_LIBS += huginbasewx 1.0
SHARED_LIBS += huginlines 1.0
SHARED_LIBS += huginvigraimpex 1.0
SHARED_LIBS += icpfindlib 1.0
SHARED_LIBS += localfeatures 1.0
SHARED_LIBS += makefilelib 1.0
SHARED_LIBS += hugin_python_interface 0.0
SHARED_LIBS += celeste 2.0
SHARED_LIBS += flann_cpp 2.0
SHARED_LIBS += huginbase 3.0
SHARED_LIBS += huginbasewx 2.0
SHARED_LIBS += huginlines 2.0
SHARED_LIBS += huginvigraimpex 2.0
SHARED_LIBS += icpfindlib 2.0
SHARED_LIBS += localfeatures 2.0
SHARED_LIBS += makefilelib 2.0
SHARED_LIBS += hugin_python_interface 1.0
CATEGORIES = graphics x11
@ -35,11 +34,11 @@ MAINTAINER = Stuart Henderson <sthen@openbsd.org>
PERMIT_PACKAGE_CDROM = Yes
# lensfun is dlopened, so don't remove it from WANTLIB and LIB_DEPENDS
WANTLIB += GL GLEW GLU Half Iex Imath IlmImf IlmThread ICE SM X11
WANTLIB += Xext Xi Xmu boost_date_time-mt boost_filesystem-mt
WANTLIB += GL GLEW GLU Half Iex Imath IlmImf IlmThread Xi Xmu
WANTLIB += 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 exiv2 glut>=4.1
WANTLIB += jpeg lensfun m pano13>=2.0 png pthread stdc++ tiff
WANTLIB += jpeg lensfun m pano13>=3.0 png pthread stdc++ tiff
WANTLIB += wx_base>=3 wx_base_net>=3 wx_base_xml>=3
WANTLIB += wx_gtk2_adv>=3 wx_gtk2_aui>=3 wx_gtk2_core>=3
WANTLIB += wx_gtk2_gl>=3 wx_gtk2_html>=3 wx_gtk2_xrc>=3 z
@ -47,7 +46,8 @@ WANTLIB += ${MODPY_WANTLIB}
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=hugin/}
BUILD_DEPENDS = devel/swig>=2
BUILD_DEPENDS = devel/swig>=2 \
graphics/p5-Image-ExifTool
RUN_DEPENDS = devel/desktop-file-utils \
graphics/enblend-enfuse \
graphics/p5-Image-ExifTool \
@ -62,7 +62,7 @@ LIB_DEPENDS = devel/boost>=1.58 \
graphics/freeglut \
graphics/ilmbase \
graphics/jpeg \
graphics/libpano13>=2.9.18beta1 \
graphics/libpano13>=2.9.19 \
graphics/lensfun \
graphics/openexr \
graphics/png \
@ -85,12 +85,14 @@ MODPY_ADJ_FILES = src/hugin_script_interface/hpi.py \
pre-patch:
rm ${WRKSRC}/CMakeModules/FindPNG.cmake
rm ${WRKSRC}/CMakeModules/FindGLEW.cmake
rm ${WRKSRC}/CMakeModules/FindZLIB.cmake
find ${WRKSRC} -name '*.orig' | xargs rm
cd ${WRKSRC}/CMakeModules; perl -i -pe 's/\r$$//' `find . -type f` \
../src/CMakeLists.txt
post-install:
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
${PREFIX}/lib/python${MODPY_VERSION}/site-packages
${PREFIX}/lib/python${MODPY_VERSION}/site-packages \
${PREFIX}/share/hugin/data/plugins/
.include <bsd.port.mk>

4
graphics/hugin/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (hugin-2013.0.0.tar.bz2) = SE4e1Y+m/kuuH0I5ZxAVSTRbzKJlO5kq+8DtnsDb69U=
SIZE (hugin-2013.0.0.tar.bz2) = 11247583
SHA256 (hugin-2014.0.0.tar.bz2) = 8JiqDt5EAQ07srs4aTF3Uz/XdsRQY6M4xMSD1+Rx7Ck=
SIZE (hugin-2014.0.0.tar.bz2) = 10974274

6
graphics/hugin/patches/patch-src_foreign_CMakeLists_txt
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_foreign_CMakeLists_txt,v 1.1 2014/01/14 04:20:20 kirby Exp $
--- src/foreign/CMakeLists.txt.orig Sun Jan 12 19:11:51 2014
+++ src/foreign/CMakeLists.txt Sun Jan 12 19:12:24 2014
$OpenBSD: patch-src_foreign_CMakeLists_txt,v 1.2 2015/10/10 08:44:39 kirby Exp $
--- src/foreign/CMakeLists.txt.orig Wed Oct 8 22:21:49 2014
+++ src/foreign/CMakeLists.txt Sun Aug 30 13:53:02 2015
@@ -2,6 +2,9 @@
add_subdirectory(vigra)
add_subdirectory(levmar)

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

@ -1,13 +1,13 @@
$OpenBSD: patch-src_hugin_base_CMakeLists_txt,v 1.2 2014/01/14 04:20:20 kirby Exp $
$OpenBSD: patch-src_hugin_base_CMakeLists_txt,v 1.3 2015/10/10 08:44:39 kirby Exp $
/usr/local/include/boost/config/requires_threads.hpp:47:5: error:
#error "Compiler threading support is not turned on. Please set the
correct command line options for threading: -pthread (Linux),
-pthreads (Solaris) or -mthreads (Mingw32)"
--- src/hugin_base/CMakeLists.txt.orig Sun Oct 27 15:17:05 2013
+++ src/hugin_base/CMakeLists.txt Wed Jan 8 00:19:07 2014
@@ -127,6 +127,8 @@ vigra_ext/MultiThreadOperations.h
--- src/hugin_base/CMakeLists.txt.orig Wed Oct 8 22:21:49 2014
+++ src/hugin_base/CMakeLists.txt Sun Aug 30 13:53:02 2015
@@ -129,6 +129,8 @@ vigra_ext/MultiThreadOperations.h
vigra_ext/ImageTransformsGPU.h
)

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

@ -1,16 +1,14 @@
$OpenBSD: patch-src_tools_CMakeLists_txt,v 1.1 2012/11/18 16:55:27 dcoppa Exp $
$OpenBSD: patch-src_tools_CMakeLists_txt,v 1.2 2015/10/10 08:44:39 kirby Exp $
/usr/local/include/boost/config/requires_threads.hpp:47:5: error:
#error "Compiler threading support is not turned on. Please set the
correct command line options for threading: -pthread (Linux),
-pthreads (Solaris) or -mthreads (Mingw32)"
--- src/tools/CMakeLists.txt.orig Wed Nov 14 10:59:12 2012
+++ src/tools/CMakeLists.txt Wed Nov 14 10:59:49 2012
@@ -1,4 +1,6 @@
--- src/tools/CMakeLists.txt.orig Wed Oct 8 22:21:49 2014
+++ src/tools/CMakeLists.txt Sun Aug 30 13:53:02 2015
@@ -1,3 +1,4 @@
+set(CMAKE_CXX_FLAGS "-pthread ${CMAKE_CXX_FLAGS}")
+
add_executable(fulla fulla.cpp)
target_link_libraries(fulla ${common_libs} huginlensdb ${image_libs})

38
graphics/hugin/pkg/PLIST
View File

@ -1,9 +1,7 @@
@comment $OpenBSD: PLIST,v 1.13 2014/07/11 21:25:23 kirby Exp $
@bin bin/PTBatcher
@comment $OpenBSD: PLIST,v 1.14 2015/10/10 08:44:39 kirby Exp $
@bin bin/PTBatcherGUI
@bin bin/align_image_stack
@bin bin/autooptimiser
bin/autopano-noop.sh
@bin bin/calibrate_lens_gui
@bin bin/celeste_standalone
@bin bin/checkpto
@ -17,15 +15,16 @@ bin/autopano-noop.sh
@bin bin/hugin_stitch_project
@bin bin/icpfind
@bin bin/linefind
@bin bin/matchpoint
@bin bin/nona
@bin bin/nona_gui
@bin bin/pano_modify
@bin bin/pano_trafo
@bin bin/pto2mk
@bin bin/pto_gen
@bin bin/pto_lensstack
@bin bin/pto_mask
@bin bin/pto_merge
@bin bin/pto_move
@bin bin/pto_template
@bin bin/pto_var
@bin bin/tca_correct
@bin bin/vig_optimize
@ -45,11 +44,9 @@ lib/python${MODPY_VERSION}/site-packages/hpi.py
lib/python${MODPY_VERSION}/site-packages/hpi.pyc
lib/python${MODPY_VERSION}/site-packages/hsi.py
lib/python${MODPY_VERSION}/site-packages/hsi.pyc
@man man/man1/PTBatcher.1
@man man/man1/PTBatcherGUI.1
@man man/man1/align_image_stack.1
@man man/man1/autooptimiser.1
@man man/man1/autopano-noop.sh.1
@man man/man1/calibrate_lens_gui.1
@man man/man1/celeste_standalone.1
@man man/man1/checkpto.1
@ -63,18 +60,23 @@ lib/python${MODPY_VERSION}/site-packages/hsi.pyc
@man man/man1/hugin_stitch_project.1
@man man/man1/icpfind.1
@man man/man1/linefind.1
@man man/man1/matchpoint.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_gen.1
@man man/man1/pto_lensstack.1
@man man/man1/pto_mask.1
@man man/man1/pto_merge.1
@man man/man1/pto_move.1
@man man/man1/pto_template.1
@man man/man1/pto_var.1
@man man/man1/tca_correct.1
@man man/man1/vig_optimize.1
share/appdata/
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
@ -84,15 +86,20 @@ share/hugin/Makefile.equirect.mk
share/hugin/data/
share/hugin/data/celeste.model
share/hugin/data/default.setting
share/hugin/data/hugin_exiftool_copy.arg
share/hugin/data/plugins/
share/hugin/data/plugins-templates/
share/hugin/data/plugins-templates/dual_use.py
share/hugin/data/plugins-templates/plugin_skeleton.py
share/hugin/data/plugins/README_woa.txt
share/hugin/data/plugins/crop_cp.py
share/hugin/data/plugins/crop_cp.pyc
share/hugin/data/plugins/shooting_pattern.py
share/hugin/data/plugins/shooting_pattern.pyc
share/hugin/data/plugins/top_five.py
share/hugin/data/plugins/top_five.pyc
share/hugin/data/plugins/woa.py
share/hugin/data/plugins/woa.pyc
share/hugin/xrc/
share/hugin/xrc/about.xrc
share/hugin/xrc/batch_frame.xrc
@ -330,6 +337,7 @@ 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_Optimiser_tab.html
share/hugin/xrc/data/help_en_EN/Hugin_Panorama_Editor_window.html
share/hugin/xrc/data/help_en_EN/Hugin_Panorama_Workflow.html
share/hugin/xrc/data/help_en_EN/Hugin_Parameters_for_Control_Point_Detectors_dialog.html
share/hugin/xrc/data/help_en_EN/Hugin_Photos_tab.html
share/hugin/xrc/data/help_en_EN/Hugin_Preferences.html
@ -377,7 +385,6 @@ 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
share/hugin/xrc/data/help_en_EN/Linefind.html
share/hugin/xrc/data/help_en_EN/MatchPoint.html
share/hugin/xrc/data/help_en_EN/Medinet_habu_horizontal_fisheye.jpg
share/hugin/xrc/data/help_en_EN/Medinet_habu_horizontal_stereographic.jpg
share/hugin/xrc/data/help_en_EN/NPP.html
@ -385,7 +392,6 @@ share/hugin/xrc/data/help_en_EN/Nadir.html
share/hugin/xrc/data/help_en_EN/No-parallax_point.html
share/hugin/xrc/data/help_en_EN/Nodal_Point.html
share/hugin/xrc/data/help_en_EN/Nona.html
share/hugin/xrc/data/help_en_EN/Nona_gui.html
share/hugin/xrc/data/help_en_EN/OpenEXR.html
share/hugin/xrc/data/help_en_EN/Optimization.html
share/hugin/xrc/data/help_en_EN/PNG.html
@ -421,7 +427,10 @@ 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_gen.html
share/hugin/xrc/data/help_en_EN/Pto_lensstack.html
share/hugin/xrc/data/help_en_EN/Pto_mask.html
share/hugin/xrc/data/help_en_EN/Pto_merge.html
share/hugin/xrc/data/help_en_EN/Pto_move.html
share/hugin/xrc/data/help_en_EN/Pto_template.html
share/hugin/xrc/data/help_en_EN/Pto_var.html
share/hugin/xrc/data/help_en_EN/QTVR.html
share/hugin/xrc/data/help_en_EN/Qtvr2img.html
@ -659,10 +668,6 @@ 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/locale/bg/LC_MESSAGES/hugin.mo
share/locale/ca_ES/
share/locale/ca_ES/LC_MESSAGES/
share/locale/ca_ES/LC_MESSAGES/hugin.mo
share/locale/cs_CZ/
share/locale/cs_CZ/LC_MESSAGES/
share/locale/cs_CZ/LC_MESSAGES/hugin.mo
@ -676,16 +681,13 @@ share/locale/fr/LC_MESSAGES/hugin.mo
share/locale/hu/LC_MESSAGES/hugin.mo
share/locale/it/LC_MESSAGES/hugin.mo
share/locale/ja/LC_MESSAGES/hugin.mo
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
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/packages/hugin.xml