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

Update to hugin-2016.2.0.

Browse Source 
- drop gettext module while here
 - take maintainer (suggested by sthen@, former maintainer)
OK sthen@
This commit is contained in:
kirby 2016-11-24 08:20:38 +00:00
parent c1298eedad
commit f3a808ef13
9 changed files with 77 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
graphics/hugin/Makefile
View File

@ -1,74 +1,66 @@
# $OpenBSD: Makefile,v 1.47 2016/07/06 21:25:23 sthen Exp $
# $OpenBSD: Makefile,v 1.48 2016/11/24 08:20:38 kirby Exp $
BROKEN-hppa = run dep on enblend-enfuse which will not build on hppa
COMMENT = panorama image stitcher
DISTNAME = hugin-2014.0.0
REVISION = 0
DISTNAME = hugin-2016.2.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 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
SHARED_LIBS += celeste 3.0
SHARED_LIBS += flann_cpp 3.0
SHARED_LIBS += huginbase 4.0
SHARED_LIBS += huginbasewx 3.0
SHARED_LIBS += huginlines 3.0
SHARED_LIBS += icpfindlib 3.0
SHARED_LIBS += localfeatures 3.0
SHARED_LIBS += hugin_python_interface 2.0
CATEGORIES = graphics x11
HOMEPAGE = http://hugin.sourceforge.net/
MAINTAINER = Stuart Henderson <sthen@openbsd.org>
MAINTAINER = Kirill Bychkov <kirby@openbsd.org>
# GPLv2+
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 Xi Xmu
WANTLIB += boost_date_time-mt boost_filesystem-mt boost_chrono-mt
WANTLIB += boost_iostreams-mt boost_regex-mt boost_atomic-mt
WANTLIB += boost_system-mt boost_thread-mt c exiv2 glut>=4.1
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
WANTLIB += ${MODPY_WANTLIB}
WANTLIB += GL GLEW GLU Half Iex Imath IlmImf IlmThread X11
WANTLIB += boost_filesystem-mt boost_system-mt c exiv2 fftw3
WANTLIB += iconv intl jpeg lcms2 lensfun m pano13>=3.0
WANTLIB += png pthread sqlite3 tiff vigraimpex wx_base>=3
WANTLIB += wx_base_net>=3 wx_base_xml>=3 wx_gtk2_adv>=3
WANTLIB += wx_gtk2_aui>=3 wx_gtk2_core>=3 wx_gtk2_gl>=3
WANTLIB += wx_gtk2_qa wx_gtk2_html>=3 wx_gtk2_xrc>=3 z ${MODPY_WANTLIB}
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=hugin/}
BUILD_DEPENDS = devel/swig>=2 \
BUILD_DEPENDS = devel/gettext-tools \
devel/swig>=2 \
graphics/p5-Image-ExifTool
RUN_DEPENDS = devel/desktop-file-utils \
graphics/enblend-enfuse \
graphics/p5-Image-ExifTool \
misc/shared-mime-info \
x11/gtk+3,-guic \
devel/gmake # yes, really a RUN_DEPENDS
x11/gtk+3,-guic
RUN_DEPENDS += x11/py-wxPython # required for launching python scripts
LIB_DEPENDS = devel/boost>=1.58 \
graphics/exiv2>=0.12 \
graphics/glew \
graphics/freeglut \
graphics/ilmbase \
graphics/jpeg \
graphics/libpano13>=2.9.19 \
graphics/lensfun \
graphics/openexr \
graphics/png \
graphics/tiff \
graphics/vigra \
x11/wxWidgets>=2.8.12p7
MODULES = devel/cmake devel/gettext lang/python
MODULES = devel/cmake lang/python gcc4
MODGCC4_ARCHS = *
MODGCC4_LANGS += c++
CONFIGURE_ENV = MANDIR=man
CONFIGURE_ARGS += -DBUILD_HSI=ON
NO_TEST = Yes

4
graphics/hugin/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (hugin-2014.0.0.tar.bz2) = 8JiqDt5EAQ07srs4aTF3Uz/XdsRQY6M4xMSD1+Rx7Ck=
SIZE (hugin-2014.0.0.tar.bz2) = 10974274
SHA256 (hugin-2016.2.0.tar.bz2) = VKsbyN2U2DwCv9QILERUs7M/D6VrwXtFzz6JvodpHxU=
SIZE (hugin-2016.2.0.tar.bz2) = 10386216

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

@ -1,7 +1,7 @@
$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)
$OpenBSD: patch-doc_CMakeLists_txt,v 1.5 2016/11/24 08:20:38 kirby Exp $
--- doc/CMakeLists.txt.orig Sat Jan 23 12:46:46 2016
+++ doc/CMakeLists.txt Fri May 20 09:51:20 2016
@@ -9,7 +9,6 @@ ELSE (WIN32)
# For all other systems, generate and install the man pages
FIND_PROGRAM(POD2MAN pod2man)
@ -9,7 +9,7 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.4 2011/05/30 09:06:28 sthen Exp $
MACRO(install_man manfile section)
INSTALL(FILES ${manfile} DESTINATION ${MANDIR}/man${section})
@@ -18,22 +17,21 @@ ENDMACRO(install_man)
@@ -17,22 +16,21 @@ ENDMACRO(install_man)
MACRO(do_pod podfile manfile section)
IF(EXISTS "${CMAKE_SOURCE_DIR}/doc/${podfile}")

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

@ -1,13 +1,12 @@
$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)
$OpenBSD: patch-src_foreign_CMakeLists_txt,v 1.3 2016/11/24 08:20:38 kirby Exp $
--- src/foreign/CMakeLists.txt.orig Fri Jul 17 19:43:58 2015
+++ src/foreign/CMakeLists.txt Sat Oct 10 13:48:35 2015
@@ -1,5 +1,8 @@
add_subdirectory(levmar)
add_subdirectory(lensdb)
+IF(NOT FLANN_FOUND)
+add_subdirectory(flann)
+ENDIF(NOT FLANN_FOUND)
IF(NOT ZTHREAD_FOUND)
add_subdirectory(zthread/src)
IF (WIN32 AND NOT MINGW)
add_subdirectory(getopt)

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

@ -1,12 +0,0 @@
$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)
cmd = wxT("make");
}
cmd += wxT(" ") + args;
-#elif defined __FreeBSD__
+#elif defined __FreeBSD__ || defined __OpenBSD__
wxString cmd = wxT("gmake ") + args;
#elif defined __WXMSW__
wxString cmdExe;

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

@ -1,18 +1,18 @@
$OpenBSD: patch-src_hugin_base_CMakeLists_txt,v 1.3 2015/10/10 08:44:39 kirby Exp $
$OpenBSD: patch-src_hugin_base_CMakeLists_txt,v 1.4 2016/11/24 08:20:38 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 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
--- src/hugin_base/CMakeLists.txt.orig Fri May 20 21:46:17 2016
+++ src/hugin_base/CMakeLists.txt Thu Nov 10 12:46:37 2016
@@ -126,6 +126,8 @@ vigra_ext/StitchWatershed.h
vigra_ext/BlendPoisson.h
)
+set(CMAKE_CXX_FLAGS "-pthread ${CMAKE_CXX_FLAGS}")
+
IF (${HUGIN_SHARED_LIBS})
add_library(huginbase SHARED ${HUGIN_BASE_SRC} ${HUGIN_BASE_HEADER})
target_link_libraries(huginbase ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(huginbase ${Boost_LIBRARIES} Threads::Threads ${X11_X11_LIB})

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

@ -1,14 +1,14 @@
$OpenBSD: patch-src_tools_CMakeLists_txt,v 1.2 2015/10/10 08:44:39 kirby Exp $
$OpenBSD: patch-src_tools_CMakeLists_txt,v 1.3 2016/11/24 08:20:38 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 Oct 8 22:21:49 2014
+++ src/tools/CMakeLists.txt Sun Aug 30 13:53:02 2015
--- src/tools/CMakeLists.txt.orig Fri Jul 17 19:44:01 2015
+++ src/tools/CMakeLists.txt Sat Oct 10 13:41:32 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})
target_link_libraries(fulla ${common_libs} ${image_libs})

95
graphics/hugin/patches/patch-src_tools_ParseExp_cpp
View File

@ -1,95 +0,0 @@
$OpenBSD: patch-src_tools_ParseExp_cpp,v 1.1 2015/07/01 08:42:52 jasper Exp $
Use Boost::Phoenix V3 in Boost Spirit for expression parsing
http://sourceforge.net/p/hugin/hugin/ci/e237d6d1d87354f974d37a95ba52dbd9666dd310/
--- src/tools/ParseExp.cpp.orig Sun Jun 28 21:36:47 2015
+++ src/tools/ParseExp.cpp Sun Jun 28 21:38:59 2015
@@ -33,7 +33,8 @@
#include <limits>
#include <iterator>
-
+
+#define BOOST_SPIRIT_USE_PHOENIX_V3 1
#include <boost/spirit/version.hpp>
#if !defined(SPIRIT_VERSION) || SPIRIT_VERSION < 0x2010
#error "At least Spirit version 2.1 required"
@@ -50,11 +51,9 @@ namespace Parser
//power function
struct lazy_pow_
{
- template <typename X, typename Y>
- struct result { typedef X type; };
-
- template <typename X, typename Y>
- X operator()(X x, Y y) const
+ typedef double result_type;
+
+ double operator()(double x, double y) const
{
return std::pow(x, y);
}
@@ -63,11 +62,9 @@ struct lazy_pow_
// modulus for double values
struct lazy_mod_
{
- template <typename X, typename Y>
- struct result { typedef X type; };
-
- template <typename X, typename Y>
- X operator()(X x, Y y) const
+ typedef double result_type;
+
+ double operator()(double x, double y) const
{
return std::fmod(x,y);
}
@@ -76,37 +73,33 @@ struct lazy_mod_
// if statement
struct lazy_if_
{
- template <typename X, typename Y, typename Z>
- struct result { typedef Y type; };
-
- template <typename X, typename Y, typename Z>
- X operator()(X x, Y y, Z z) const
- {
- return x ? y : z;
+ typedef double result_type;
+
+ double operator()(double x, double y, double z) const
+ {
+ return (std::fabs(x)>1e-5) ? y : z;
}
};
// wrapper for unary function
struct lazy_ufunc_
{
- template <typename F, typename A1>
- struct result { typedef A1 type; };
-
- template <typename F, typename A1>
- A1 operator()(F f, A1 a1) const
+ typedef double result_type;
+
+ double operator()(double (*f)(double), double a1) const
{
return f(a1);
}
};
// convert rad into deg
-double deg(const double d)
+const double deg(const double d)
{
return d*180.0/boost::math::constants::pi<double>();
};
// convert deg into rad
-double rad(const double d)
+const double rad(const double d)
{
return d*boost::math::constants::pi<double>()/180;
};

41
graphics/hugin/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.14 2015/10/10 08:44:39 kirby Exp $
@comment $OpenBSD: PLIST,v 1.15 2016/11/24 08:20:38 kirby Exp $
@bin bin/PTBatcherGUI
@bin bin/align_image_stack
@bin bin/autooptimiser
@ -11,14 +11,15 @@
@bin bin/fulla
@bin bin/geocpset
@bin bin/hugin
@bin bin/hugin_executor
@bin bin/hugin_hdrmerge
@bin bin/hugin_lensdb
@bin bin/hugin_stitch_project
@bin bin/icpfind
@bin bin/linefind
@bin bin/nona
@bin bin/pano_modify
@bin bin/pano_trafo
@bin bin/pto2mk
@bin bin/pto_gen
@bin bin/pto_lensstack
@bin bin/pto_mask
@ -27,6 +28,7 @@
@bin bin/pto_template
@bin bin/pto_var
@bin bin/tca_correct
@bin bin/verdandi
@bin bin/vig_optimize
lib/hugin/
@lib lib/hugin/libceleste.so.${LIBceleste_VERSION}
@ -35,10 +37,8 @@ lib/hugin/
@lib lib/hugin/libhuginbase.so.${LIBhuginbase_VERSION}
@lib lib/hugin/libhuginbasewx.so.${LIBhuginbasewx_VERSION}
@lib lib/hugin/libhuginlines.so.${LIBhuginlines_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}
lib/python${MODPY_VERSION}/site-packages/_hsi.so
lib/python${MODPY_VERSION}/site-packages/hpi.py
lib/python${MODPY_VERSION}/site-packages/hpi.pyc
@ -56,14 +56,15 @@ lib/python${MODPY_VERSION}/site-packages/hsi.pyc
@man man/man1/fulla.1
@man man/man1/geocpset.1
@man man/man1/hugin.1
@man man/man1/hugin_executor.1
@man man/man1/hugin_hdrmerge.1
@man man/man1/hugin_lensdb.1
@man man/man1/hugin_stitch_project.1
@man man/man1/icpfind.1
@man man/man1/linefind.1
@man man/man1/nona.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
@ -72,6 +73,7 @@ lib/python${MODPY_VERSION}/site-packages/hsi.pyc
@man man/man1/pto_template.1
@man man/man1/pto_var.1
@man man/man1/tca_correct.1
@man man/man1/verdandi.1
@man man/man1/vig_optimize.1
share/appdata/
share/appdata/PTBatcherGUI.appdata.xml
@ -82,11 +84,15 @@ share/applications/calibrate_lens_gui.desktop
share/applications/hugin.desktop
share/applications/pto_gen.desktop
share/hugin/
share/hugin/Makefile.equirect.mk
share/hugin/data/
share/hugin/data/blended_stacks.executor
share/hugin/data/celeste.model
share/hugin/data/default.setting
share/hugin/data/fused_layers.executor
share/hugin/data/hdr_pano.executor
share/hugin/data/hugin_exiftool_copy.arg
share/hugin/data/normal_enblend.executor
share/hugin/data/normal_smartblend.executor
share/hugin/data/plugins/
share/hugin/data/plugins-templates/
share/hugin/data/plugins-templates/dual_use.py
@ -100,6 +106,7 @@ 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/data/zeronoise.executor
share/hugin/xrc/
share/hugin/xrc/about.xrc
share/hugin/xrc/batch_frame.xrc
@ -109,7 +116,7 @@ share/hugin/xrc/cp_editor_panel.xrc
share/hugin/xrc/cp_list_frame.xrc
share/hugin/xrc/cpdetector_dialog.xrc
share/hugin/xrc/data/
share/hugin/xrc/data/COPYING
share/hugin/xrc/data/COPYING.txt
share/hugin/xrc/data/about.htm
share/hugin/xrc/data/add_project.png
share/hugin/xrc/data/add_projects.png
@ -350,12 +357,14 @@ 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_center_pano.png
share/hugin/xrc/data/help_en_EN/Hugin_edit_add.png
share/hugin/xrc/data/help_en_EN/Hugin_executor.html
share/hugin/xrc/data/help_en_EN/Hugin_filenew.png
share/hugin/xrc/data/help_en_EN/Hugin_fileopen.png
share/hugin/xrc/data/help_en_EN/Hugin_filesave.png
share/hugin/xrc/data/help_en_EN/Hugin_filesaveas.png
share/hugin/xrc/data/help_en_EN/Hugin_fit_pano.png
share/hugin/xrc/data/help_en_EN/Hugin_info.png
share/hugin/xrc/data/help_en_EN/Hugin_lensdb.html
share/hugin/xrc/data/help_en_EN/Hugin_list.png
share/hugin/xrc/data/help_en_EN/Hugin_move_drag_tab.html
share/hugin/xrc/data/help_en_EN/Hugin_optimize.png
@ -424,7 +433,6 @@ share/hugin/xrc/data/help_en_EN/Pincushion_distortion.html
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_gen.html
share/hugin/xrc/data/help_en_EN/Pto_lensstack.html
share/hugin/xrc/data/help_en_EN/Pto_mask.html
@ -453,6 +461,7 @@ share/hugin/xrc/data/help_en_EN/Tca_correct.html
share/hugin/xrc/data/help_en_EN/The_General_Panini_Projection.html
share/hugin/xrc/data/help_en_EN/Tone_mapping.html
share/hugin/xrc/data/help_en_EN/Using_Celeste_with_hugin.html
share/hugin/xrc/data/help_en_EN/Verdandi.html
share/hugin/xrc/data/help_en_EN/Vertical-fisheye.jpg
share/hugin/xrc/data/help_en_EN/Vertical-stereographic.jpg
share/hugin/xrc/data/help_en_EN/Vertical_control_points.html
@ -612,9 +621,6 @@ 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/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/output_blended_fused.png
share/hugin/xrc/data/output_fused_blended.png
@ -625,6 +631,7 @@ 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_control_point_tool_small.png
share/hugin/xrc/data/preview_layout.png
share/hugin/xrc/data/preview_layout_small.png
share/hugin/xrc/data/preview_num_transform.png
@ -634,8 +641,10 @@ 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
share/hugin/xrc/data/ptmender_smartblend.mk
share/hugin/xrc/data/ptbatcher_pause.ico
share/hugin/xrc/data/ptbatcher_pause.png
share/hugin/xrc/data/ptbatcher_running.ico
share/hugin/xrc/data/ptbatcher_running.png
share/hugin/xrc/data/pto_icon.ico
share/hugin/xrc/data/pto_icon.png
share/hugin/xrc/data/redo.png
@ -668,6 +677,12 @@ 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/ca_ES/
share/locale/ca_ES/LC_MESSAGES/
share/locale/ca_ES/LC_MESSAGES/hugin.mo
share/locale/ca_ES@valencia/
share/locale/ca_ES@valencia/LC_MESSAGES/
share/locale/ca_ES@valencia/LC_MESSAGES/hugin.mo
share/locale/cs_CZ/
share/locale/cs_CZ/LC_MESSAGES/
share/locale/cs_CZ/LC_MESSAGES/hugin.mo