Index: head/graphics/colmap/Makefile =================================================================== --- head/graphics/colmap/Makefile (revision 428787) +++ head/graphics/colmap/Makefile (revision 428788) @@ -1,105 +1,107 @@ # $FreeBSD$ PORTNAME= colmap DISTVERSION= 2.1-0 # synthetic tag DISTVERSIONSUFFIX= -g55fbe10 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Structure from motion and multi-view stereo LICENSE= BSD2CLAUSE BSD3CLAUSE CC-BY-3.0 GPLv3+ MIT SIFTGPU LICENSE_COMB= multi LICENSE_NAME_SIFTGPU= SiftGPU non-commercial license LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/src/ext/VLFeat/LICENSE LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/src/ext/FLANN/LICENSE LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/src/ui/media/LICENSE LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING.txt LICENSE_FILE_MIT= ${WRKSRC}/src/ext/PoissonRecon/LICENSE LICENSE_FILE_SIFTGPU= ${WRKSRC}/src/ext/SiftGPU/LICENSE LICENSE_PERMS_SIFTGPU= dist-mirror pkg-mirror auto-accept BUILD_DEPENDS= eigen>=3:math/eigen3 LIB_DEPENDS= libboost_filesystem.so:devel/boost-libs \ libglog.so:devel/glog \ libfreeimage.so:graphics/freeimage \ libceres.so:math/ceres-solver -USES= cmake compiler:c++11-lib fortran localbase sqlite +USES= cmake compiler:${OPENMP}c++11-lib fortran localbase sqlite USE_GITHUB= yes USE_GL= gl glew glut USE_QT5= qmake_build buildtools_build core gui opengl_build widgets EXCLUDE= SQLite EXTRACT_AFTER_ARGS= ${EXCLUDE:S,^,--exclude src/ext/,} CMAKE_ARGS= -DBOOST_STATIC=off -DCUDA_ENABLED=off CFLAGS+= -DVL_OS_LINUX=1 +CXXFLAGS+= -fpermissive # libc++ vs. g++49 CXXFLAGS+= -D_GLIBCXX_USE_C99 -D_GLIBCXX_USE_C99_MATH_TR1 \ -D_DECLARE_C99_LDBL_MATH # XXX ports/193528 LDFLAGS+= -Wl,--as-needed # gflags, glu, xi, xmu TEST_TARGET= test ARGS="-V" OPTIONS_DEFINE= DOCS OPENMP OPTIONS_DEFAULT= OPENMP ${MACHINE_CPU:tu} -.if !exists(/usr/bin/gcc) -# XXX ports/199603 + ports/210337 -# USES=compiler:gcc-c++11-lib fails to build -OPTIONS_EXCLUDE= OPENMP -.endif +# XXX ports/215138: exclude still broken +OPTIONS_EXCLUDE= ${OPTIONS_EXCLUDE_${OPSYS}_${OSREL}} # not OSREL:R +OPTIONS_EXCLUDE_FreeBSD_10.1= OPENMP OPTIONS_GROUP= SIMD OPTIONS_GROUP_SIMD= ${OPTIONS_GROUP_SIMD_${MACHINE_ARCH}} # Keep in sync with src/ext/VLFeat/CMakeLists.txt OPTIONS_GROUP_SIMD_amd64= ${OPTIONS_GROUP_SIMD_i386} OPTIONS_GROUP_SIMD_i386= SSE2 AVX DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx DOCS_USES= gmake DOCS_PORTDOCS= * OPENMP_USES= compiler:openmp OPENMP_CMAKE_BOOL= OPENMP_ENABLED +# XXX ports/199603 + ports/210337 +OPENMP_VARS= OPENMP=gcc- .for _simd in ${OPTIONS_GROUP_SIMD} ${_simd}_DESC= ${MMX_DESC:S/MMX/${_simd}/} ${_simd}_CMAKE_BOOL= HAS_${_simd}_EXTENSION ${_simd}_CFLAGS= -m${_simd:tl} .endfor post-patch: @${REINPLACE_CMD} -e 's/Qt5OpenGL/Qt5Widgets/' \ -e '/CheckSSEExtensions/d' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e '/install.*test/d' \ ${WRKSRC}/cmake/CMakeHelper.cmake # XXX Unbundle FLANN as it has more consumers @${REINPLACE_CMD} -e '/SQLite/d' \ ${WRKSRC}/src/ext/CMakeLists.txt @${REINPLACE_CMD} -e 's,ext/SQLite/,,' \ ${WRKSRC}/src/base/database.h \ ${WRKSRC}/src/util/sqlite3_utils.h .if !defined(DISPLAY) # QApplication @${REINPLACE_CMD} -e '/feature_matching_test/d' \ -e '/feature_extraction_test/d' \ ${WRKSRC}/src/base/CMakeLists.txt @${REINPLACE_CMD} -e '/opengl_utils_test/d' \ ${WRKSRC}/src/util/CMakeLists.txt .endif post-build-DOCS-on: @${DO_MAKE_BUILD} html -C${WRKSRC}/doc pre-install: do-test post-install-DOCS-on: (cd ${WRKSRC}/doc/_build/html && ${COPYTREE_SHARE} \ "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include # FreeBSD 11.0 i386 has: # 7 - base/database_test (Failed) # 26 - estimators/epnp_test (Failed) # 34 - mvs/depth_map_test (Failed) # 39 - optim/loransac_test (Failed) # 42 - optim/ransac_test (Failed) do-test: .IGNORE Index: head/graphics/colmap/files/patch-pba-nostd =================================================================== --- head/graphics/colmap/files/patch-pba-nostd (nonexistent) +++ head/graphics/colmap/files/patch-pba-nostd (revision 428788) @@ -0,0 +1,74 @@ +In file included from src/./ext/PBA/pba.h:50:0, + from src/./optim/bundle_adjustment.h:29, + from src/./util/option_manager.h:34, + from src/./ui/bundle_adjustment_widget.h:25, + from src/ui/bundle_adjustment_widget.cc:17: +src/./ext/PBA/ConfigBA.h:24:12: error: 'vector' is already declared in this scope + using std::vector; + ^~~~~~ + +--- src/ext/PBA/ConfigBA.h.orig 2016-12-07 13:47:54 UTC ++++ src/ext/PBA/ConfigBA.h +@@ -21,7 +21,6 @@ + #ifndef CONFIG_BA_H + #define CONFIG_BA_H + #include +-using std::vector; + + namespace pba { + +@@ -181,7 +180,7 @@ class ConfigBA { + bool __matlab_format_stat; + char* __stat_filename; + const char* __driver_output; +- vector __bundle_records; ++ std::vector __bundle_records; + double __timer_record[NUM_TIMER]; + int __num_cpu_thread_all; + int __num_cpu_thread[NUM_FUNC]; +--- src/ext/PBA/SparseBundleCPU.h.orig 2016-12-07 13:47:54 UTC ++++ src/ext/PBA/SparseBundleCPU.h +@@ -146,7 +146,7 @@ class SparseBundleCPU : public ParallelB + SparseBundleCPU(const int num_threads); + + typedef avec VectorF; +- typedef vector VectorI; ++ typedef std::vector VectorI; + typedef float float_t; + + protected: // cpu data +@@ -204,8 +204,8 @@ class SparseBundleCPU : public ParallelB + VectorF _cuCameraQListW; + + protected: +- bool ProcessIndexCameraQ(vector& qmap, vector& qlist); +- void ProcessWeightCameraQ(vector& cpnum, vector& qmap, Float* qmapw, ++ bool ProcessIndexCameraQ(std::vector& qmap, std::vector& qlist); ++ void ProcessWeightCameraQ(std::vector& cpnum, std::vector& qmap, Float* qmapw, + Float* qlistw); + + protected: // internal functions +--- src/ext/PBA/SparseBundleCU.h.orig 2016-12-07 13:47:54 UTC ++++ src/ext/PBA/SparseBundleCU.h +@@ -40,7 +40,7 @@ class SparseBundleCU : public ParallelBA + const int* _camera_idx; + const int* _point_idx; + const int* _focal_mask; +- vector _imgpt_datax; ++ std::vector _imgpt_datax; + //////////////////////// + float _projection_sse; // sumed square error + protected: // cuda data +@@ -84,9 +84,9 @@ class SparseBundleCU : public ParallelBA + CuTexImage _cuCameraQListW; + + protected: +- bool ProcessIndexCameraQ(vector& qmap, vector& qlist); +- void ProcessWeightCameraQ(vector& cpnum, vector& qmap, +- vector& qmapw, vector& qlistw); ++ bool ProcessIndexCameraQ(std::vector& qmap, std::vector& qlist); ++ void ProcessWeightCameraQ(std::vector& cpnum, std::vector& qmap, ++ std::vector& qmapw, std::vector& qlistw); + + protected: // internal functions + int GetParameterLength(); Property changes on: head/graphics/colmap/files/patch-pba-nostd ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property