Index: head/graphics/colmap/Makefile =================================================================== --- head/graphics/colmap/Makefile (revision 449263) +++ head/graphics/colmap/Makefile (revision 449264) @@ -1,86 +1,84 @@ # $FreeBSD$ PORTNAME= colmap -DISTVERSION= 3.1-4 -DISTVERSIONSUFFIX= -g542ce21 # doc fixes -PORTREVISION= 1 +DISTVERSION= 3.2 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_GL= gl glew 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 TEST 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 TEST_CMAKE_BOOL= TESTS_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-TEST-on: do-test post-install-DOCS-on: (cd ${WRKSRC}/doc/_build/html && ${COPYTREE_SHARE} \ "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include Index: head/graphics/colmap/distinfo =================================================================== --- head/graphics/colmap/distinfo (revision 449263) +++ head/graphics/colmap/distinfo (revision 449264) @@ -1,3 +1,3 @@ -TIMESTAMP = 1497537121 -SHA256 (colmap-colmap-3.1-4-g542ce21_GH0.tar.gz) = c8b6c5f9eea30f8e5ff95fe87ff1cc6123639c450602035082d33609b6e275de -SIZE (colmap-colmap-3.1-4-g542ce21_GH0.tar.gz) = 5657539 +TIMESTAMP = 1504347098 +SHA256 (colmap-colmap-3.2_GH0.tar.gz) = 7d86d3a0a68efdbcdde7bf4f24fdf40f695e61454c8497d519e9c823d148e424 +SIZE (colmap-colmap-3.2_GH0.tar.gz) = 5674070 Index: head/graphics/colmap/files/patch-no-sse =================================================================== --- head/graphics/colmap/files/patch-no-sse (revision 449263) +++ head/graphics/colmap/files/patch-no-sse (revision 449264) @@ -1,50 +1,34 @@ 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) Index: head/graphics/colmap/files/patch-vlfeat-rtcpu =================================================================== --- head/graphics/colmap/files/patch-vlfeat-rtcpu (revision 449263) +++ head/graphics/colmap/files/patch-vlfeat-rtcpu (revision 449264) @@ -1,83 +1,87 @@ build: don't force SSE2/AVX, enable at runtime instead --- CMakeLists.txt.orig 2017-05-22 13:02:37 UTC +++ CMakeLists.txt @@ -17,8 +17,6 @@ include(CheckCXXCompilerFlag) # the CMake policies in this file include(${CMAKE_SOURCE_DIR}/cmake/CMakeHelper.cmake NO_POLICY_SCOPE) -include(${CMAKE_SOURCE_DIR}/cmake/CheckSSEExtensions.cmake) - if(EXISTS ${CMAKE_SOURCE_DIR}/LocalConfig.cmake) include(${CMAKE_SOURCE_DIR}/LocalConfig.cmake) endif() @@ -28,6 +26,7 @@ endif() # Options ################################################################################ +option(SIMD_ENABLED "Whether to enable SIMD optimizations" ON) option(OPENMP_ENABLED "Whether to enable OpenMP" ON) option(LTO_ENABLED "Whether to enable link-time optimization" ON) option(CUDA_ENABLED "Whether to enable CUDA, if available" ON) ---- src/ext/VLFeat/CMakeLists.txt.orig 2016-12-07 13:47:54 UTC +--- src/ext/VLFeat/CMakeLists.txt.orig 2017-09-02 10:11:38 UTC +++ src/ext/VLFeat/CMakeLists.txt -@@ -1,8 +1,27 @@ --if(IS_MSVC OR NOT HAS_AVX_EXTENSION) -- add_definitions(-DVL_DISABLE_AVX) +@@ -1,14 +1,25 @@ +-if(IS_GNU OR IS_CLANG) +- if(NOT HAS_AVX_EXTENSION) +- add_definitions(-DVL_DISABLE_AVX) +- endif() +set(VLFEAT_SOURCE_FILES) -+ + +- if(NOT HAS_SSE2_EXTENSION) +- add_definitions(-DVL_DISABLE_SSE2) +- endif() +if(CMAKE_SYSTEM_PROCESSOR MATCHES "[ix].?86|amd64|AMD64") + set(IS_X86 TRUE) - endif() ++endif() --if(IS_MSVC OR NOT HAS_SSE2_EXTENSION) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SSE_FLAGS}") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SSE_FLAGS}") +if(SIMD_ENABLED AND IS_X86 AND NOT IS_MSVC) + set(SSE2_SOURCES + imopv_sse2.c + imopv_sse2.h + mathop_sse2.c + mathop_sse2.h) + set(AVX_SOURCES + mathop_avx.c + mathop_avx.h) + + list(APPEND VLFEAT_SOURCE_FILES ${AVX_SOURCES} ${SSE2_SOURCES}) + + set_source_files_properties(${AVX_SOURCES} + PROPERTIES COMPILE_FLAGS "-mavx") + set_source_files_properties(${SSE2_SOURCES} + PROPERTIES COMPILE_FLAGS "-msse2") -+else() -+ add_definitions(-DVL_DISABLE_AVX) + else() + add_definitions(-DVL_DISABLE_AVX) add_definitions(-DVL_DISABLE_SSE2) - endif() - -@@ -10,7 +29,7 @@ if(NOT OPENMP_ENABLED OR NOT OPENMP_FOUN +@@ -18,7 +29,7 @@ if(NOT OPENMP_ENABLED OR NOT OPENMP_FOUND) add_definitions(-DVL_DISABLE_OPENMP) endif() -set(VLFEAT_SOURCE_FILES +list(APPEND VLFEAT_SOURCE_FILES aib.c aib.h array.c -@@ -44,8 +63,6 @@ set(VLFEAT_SOURCE_FILES +@@ -52,8 +63,6 @@ set(VLFEAT_SOURCE_FILES ikmeans_lloyd.tc imopv.c imopv.h - imopv_sse2.c - imopv_sse2.h kdtree.c kdtree.h kmeans.c -@@ -56,10 +73,6 @@ set(VLFEAT_SOURCE_FILES +@@ -64,10 +73,6 @@ set(VLFEAT_SOURCE_FILES liop.h mathop.c mathop.h - mathop_avx.c - mathop_avx.h - mathop_sse2.c - mathop_sse2.h mser.c mser.h pgm.c