Index: head/graphics/hugin/Makefile =================================================================== --- head/graphics/hugin/Makefile (revision 402103) +++ head/graphics/hugin/Makefile (revision 402104) @@ -1,79 +1,79 @@ # Created by: Carlos Eduardo G. Carvalho # $FreeBSD$ PORTNAME= hugin PORTVERSION= 2015.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} MAINTAINER= grog@FreeBSD.org COMMENT= GUI for Panorama Tools, to stitch panoramic images LIB_DEPENDS= libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \ libImath.so:${PORTSDIR}/graphics/ilmbase \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ libexiv2.so:${PORTSDIR}/graphics/exiv2 \ liblensfun.so:${PORTSDIR}/graphics/lensfun \ libpano13.so:${PORTSDIR}/graphics/libpano13 \ libpng.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff BUILD_DEPENDS= swig2.0:${PORTSDIR}/devel/swig20 \ tclap>=1.2.1:${PORTSDIR}/devel/tclap # gmake is really needed at _runtime_. Do not remove it from this list. RUN_DEPENDS= enblend>=3.1.r20080615:${PORTSDIR}/graphics/enblend \ exiftool:${PORTSDIR}/graphics/p5-Image-ExifTool \ gmake:${PORTSDIR}/devel/gmake OPTIONS_DEFINE= PANOMATIC AUTOPANOSIFTC OPTIONS_DEFAULT= PANOMATIC AUTOPANOSIFTC PANOMATIC_DESC= Install graphics/panomatic AUTOPANOSIFTC_DESC= Install graphics/autopano-sift-c USES= cmake gettext jpeg pkgconfig tar:bzip2 desktop-file-utils python \ shared-mime-info compiler:features CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE=${WX_CONFIG} USE_WX= 2.8+ WX_UNICODE= yes USE_GL= glew glut INSTALLS_ICONS= yes .include # If default compiler is GCC, upgrade it because # g++ 4.2 is too old. Basically, use the same compiler as graphics/OpenEXR # see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197898 .if ${COMPILER_TYPE} == gcc USE_GCC= yes .endif # work around a bug in cmake (?). Without this we get an error like: # cd /usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/hugin1/base_wx && /usr/bin/c++ -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -D_THREAD_SAFE -O2 -fno-strict-aliasing -pipe -pthread;-D_THREAD_SAFE -O3 -DNDEBUG -I/usr/ports/graphics/hugin/work/hugin-0.7.r3135/src -I/usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/hugin_base -I/usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/foreign -I/usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/foreign/vigra -I/usr/local/include -I/usr/local/include/OpenEXR -isystem /usr/local/lib/wx/include/gtk2-ansi-release-2.8 -isystem /usr/local/include/wx-2.8 -I/usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/hugin1 -o CMakeFiles/huginbasewx.dir/ImageCache.o -c /usr/ports/graphics/hugin/work/hugin-0.7.r3135/src/hugin1/base_wx/ImageCache.cpp # c++: No input files specified # with cmake 2.6.0. It works with cmake 2.4.8. post-configure: ${REINPLACE_CMD} \ 's/-pthread;-D_THREAD_SAFE/-pthread -D_THREAD_SAFE/g' \ ${WRKSRC}/src/hugin1/base_wx/CMakeFiles/huginbasewx.dir/flags.make \ ${WRKSRC}/src/hugin1/hugin/CMakeFiles/hugin.dir/flags.make \ ${WRKSRC}/src/hugin1/hugin/CMakeFiles/hugin.dir/link.txt \ ${WRKSRC}/src/hugin1/ptbatcher/CMakeFiles/PTBatcherGUI.dir/flags.make \ ${WRKSRC}/src/hugin1/ptbatcher/CMakeFiles/PTBatcherGUI.dir/link.txt \ ${WRKSRC}/src/hugin1/stitch_project/CMakeFiles/hugin_stitch_project.dir/flags.make \ ${WRKSRC}/src/hugin1/stitch_project/CMakeFiles/hugin_stitch_project.dir/link.txt .include .if ${PORT_OPTIONS:MPANOMATIC} RUN_DEPENDS+= panomatic:${PORTSDIR}/graphics/panomatic .endif .if ${PORT_OPTIONS:MAUTOPANOSIFTC} RUN_DEPENDS+= autopano:${PORTSDIR}/graphics/autopano-sift-c .endif .include Index: head/graphics/hugin/files/patch-src_hugin__base_lensdb_LensDB.cpp =================================================================== --- head/graphics/hugin/files/patch-src_hugin__base_lensdb_LensDB.cpp (revision 402103) +++ head/graphics/hugin/files/patch-src_hugin__base_lensdb_LensDB.cpp (nonexistent) @@ -1,12 +0,0 @@ ---- src/hugin_base/lensdb/LensDB.cpp.orig 2015-03-30 06:14:16 UTC -+++ src/hugin_base/lensdb/LensDB.cpp -@@ -627,7 +627,9 @@ bool LensDB::GetDistortion(double focal, - break; - case LF_DIST_MODEL_NONE: - case LF_DIST_MODEL_POLY5: -+#if LF_VERSION_MAJOR == 0 && LF_VERSION_MINOR < 3 - case LF_DIST_MODEL_FOV1: -+#endif - default: - return false; - break; Property changes on: head/graphics/hugin/files/patch-src_hugin__base_lensdb_LensDB.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/hugin/files/patch-src__foreign__vigra__vigra__cachedfileimage.hxx =================================================================== --- head/graphics/hugin/files/patch-src__foreign__vigra__vigra__cachedfileimage.hxx (revision 402103) +++ head/graphics/hugin/files/patch-src__foreign__vigra__vigra__cachedfileimage.hxx (nonexistent) @@ -1,11 +0,0 @@ ---- src/foreign/vigra/vigra/cachedfileimage.hxx.orig 2012-11-12 13:33:18.000000000 +0200 -+++ src/foreign/vigra/vigra/cachedfileimage.hxx 2012-11-12 13:34:44.000000000 +0200 -@@ -555,7 +555,7 @@ - class NotifyingDirectionSelector - { - #ifdef __GNUC__ --friend class Notify::self_type; -+friend class Notify::CachedFileImageIteratorBase; - #else - friend typename Notify::self_type; - #endif Property changes on: head/graphics/hugin/files/patch-src__foreign__vigra__vigra__cachedfileimage.hxx ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h =================================================================== --- head/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h (revision 402103) +++ head/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/foreign/zthread/include/zthread/Guard.h.orig 2011-12-02 18:02:37.253022000 +0100 -+++ src/foreign/zthread/include/zthread/Guard.h 2013-01-18 19:08:14.000000000 +0100 -@@ -108,7 +108,7 @@ - } - - template -- static void createScope(LockHolder& l, unsigned long ms) { -+ static bool createScope(LockHolder& l, unsigned long ms) { - - if(Scope1::createScope(l, ms)) - if(!Scope2::createScope(l, ms)) { Property changes on: head/graphics/hugin/files/patch-src__foreign__zthread__include__zthread__Guard.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property