Index: branches/2017Q2/graphics/colmap/Makefile =================================================================== --- branches/2017Q2/graphics/colmap/Makefile (revision 446184) +++ branches/2017Q2/graphics/colmap/Makefile (revision 446185) @@ -1,91 +1,91 @@ # $FreeBSD$ PORTNAME= colmap DISTVERSION= 2.1 -PORTREVISION= 5 +PORTREVISION= 6 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:${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+= -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 SIMD OPTIONS_DEFAULT= OPENMP SIMD 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- SIMD_CMAKE_BOOL= SIMD_ENABLED post-patch: @${REINPLACE_CMD} -e 's/Qt5OpenGL/Qt5Widgets/' \ ${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: branches/2017Q2/graphics/colmap/files/patch-no-sse =================================================================== --- branches/2017Q2/graphics/colmap/files/patch-no-sse (nonexistent) +++ branches/2017Q2/graphics/colmap/files/patch-no-sse (revision 446185) @@ -0,0 +1,50 @@ +build: don't force SSE on i386 + +--- src/ext/PBA/CMakeLists.txt.orig 2017-06-15 14:32:01 UTC ++++ src/ext/PBA/CMakeLists.txt +@@ -1,7 +1,3 @@ +-if(NOT IS_MSVC) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O3 -pthread -march=core2 -mfpmath=sse -Wno-c++11-narrowing") +-endif() +- + if(CUDA_ENABLED) + # Fix for Ubuntu 16.04. + add_definitions("-D_FORCE_INLINES") +--- src/ext/PBA/SparseBundleCPU.cpp.orig 2017-06-15 14:32:01 UTC ++++ src/ext/PBA/SparseBundleCPU.cpp +@@ -52,15 +52,16 @@ using std::max; + #if defined(_M_ARM) && _M_ARM >= 7 && !defined(DISABLE_CPU_NEON) + #include + #define CPUPBA_USE_NEON +-#elif defined(__ARM_NEON__) && !defined(DISABLE_CPU_NEON) ++#elif defined(__ARM_NEON) && !defined(DISABLE_CPU_NEON) + #include + #define CPUPBA_USE_NEON + #endif +-#elif defined(CPUPBA_USE_AVX) // Using AVX ++#elif defined(__AVX__) && !defined(DISABLE_CPU_AVX) // Using AVX + #include ++#define CPUPBA_USE_AVX + #undef CPUPBA_USE_SSE + #undef POINT_DATA_ALIGN4 +-#elif !defined(DISABLE_CPU_SSE) // Using SSE ++#elif defined(__SSE__) && !defined(DISABLE_CPU_SSE) // Using SSE + #define CPUPBA_USE_SSE + #include + #include +--- src/ext/SiftGPU/CMakeLists.txt.orig 2017-06-15 14:32:01 UTC ++++ src/ext/SiftGPU/CMakeLists.txt +@@ -1,13 +1,9 @@ + set(SIFT_GPU_ENABLE_OPENCL FALSE) +-set(SIFT_GPU_ENABLE_SSE TRUE) + set(SIFT_GPU_ENABLE_DEVIL FALSE) + set(SIFT_GPU_PREFER_GLUT TRUE) + + if(NOT IS_MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") +- if(SIFT_GPU_ENABLE_SSE) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=core2 -mfpmath=sse") +- endif() + endif() + + if(SIFT_GPU_PREFER_GLUT) Property changes on: branches/2017Q2/graphics/colmap/files/patch-no-sse ___________________________________________________________________ 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 Index: branches/2017Q2 =================================================================== --- branches/2017Q2 (revision 446184) +++ branches/2017Q2 (revision 446185) Property changes on: branches/2017Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r446135