Index: head/graphics/colmap/Makefile =================================================================== --- head/graphics/colmap/Makefile (revision 528080) +++ head/graphics/colmap/Makefile (revision 528081) @@ -1,94 +1,94 @@ # $FreeBSD$ PORTNAME= colmap DISTVERSION= 3.5 PORTREVISION= 10 CATEGORIES= graphics PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= b5ccc54e68e3.patch:-p1 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}/lib/VLFeat/LICENSE LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/COPYING.txt # also FLANN LICENSE_FILE_CC-BY-3.0= ${WRKSRC}/src/ui/media/LICENSE LICENSE_FILE_GPLv3+ = ${WRKSRC}/lib/PBA/LICENSE # also Graclus, LSD LICENSE_FILE_MIT= ${WRKSRC}/lib/PoissonRecon/LICENSE LICENSE_FILE_SIFTGPU= ${WRKSRC}/lib/SiftGPU/LICENSE LICENSE_PERMS_SIFTGPU= dist-mirror pkg-mirror auto-accept 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 eigen:3 gl localbase qt:5 \ sqlite USE_GITHUB= yes USE_GL= gl glew USE_QT= qmake_build buildtools_build core gui opengl_build widgets EXCLUDE= SQLite EXTRACT_AFTER_ARGS= ${EXCLUDE:S,^,--exclude lib/,} CMAKE_OFF= BOOST_STATIC CUDA_ENABLED LDFLAGS+= -Wl,--as-needed # gflags, glu, xi, xmu TEST_TARGET= test OPTIONS_DEFINE= CGAL DOCS OPENMP SIMD TEST OPTIONS_DEFAULT= CGAL OPENMP SIMD CGAL_DESC= Graph-cut on Delaunay triangulation based meshing algorithm CGAL_LIB_DEPENDS= libCGAL.so:math/cgal CGAL_CMAKE_BOOL= CGAL_ENABLED DOCS_BUILD_DEPENDS= gmake:devel/gmake \ sphinx-build:textproc/py-sphinx DOCS_PORTDOCS= * OPENMP_USES= compiler:openmp OPENMP_CMAKE_BOOL= OPENMP_ENABLED .if ${MACHINE_ARCH} == i386 || !exists(/usr/include/omp.h) # XXX base/230888 via #pragma omp atomic -# XXX ports/199603 + ports/210337 +# XXX ports/199603: LLVM openmp in base doesn't support aarch64, armv6, armv7 yet OPENMP_VARS= OPENMP=gcc- .endif SIMD_CMAKE_BOOL= SIMD_ENABLED TEST_CMAKE_BOOL= TESTS_ENABLED post-patch: # XXX math/flann has -DUSE_OPENMP=OFF and lacks tunning: # https://github.com/colmap/colmap/commit/4b594eb85c13 # https://github.com/colmap/colmap/commit/1e9f1f3324cd @${REINPLACE_CMD} -e '/SQLite/d' \ ${WRKSRC}/lib/CMakeLists.txt @${REINPLACE_CMD} -e 's,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: @${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} html -C${WRKSRC}/doc pre-install-TEST-on: do-test post-install: # XXX Clean up garbage after install(DIRECTORY) @${FIND} ${STAGEDIR}${PREFIX}/include -type d -empty -delete post-install-DOCS-on: (cd ${WRKSRC}/doc/_build/html && ${COPYTREE_SHARE} \ "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}) .include Index: head/graphics/waifu2x-ncnn-vulkan/Makefile =================================================================== --- head/graphics/waifu2x-ncnn-vulkan/Makefile (revision 528080) +++ head/graphics/waifu2x-ncnn-vulkan/Makefile (revision 528081) @@ -1,47 +1,47 @@ # $FreeBSD$ PORTNAME= waifu2x-ncnn-vulkan DISTVERSION= 20200224 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= Scale and denoise images using convolutional neural networks LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= glslangValidator:devel/glslang \ ${LOCALBASE}/include/vulkan/vulkan.h:devel/vulkan-headers \ ${LOCALBASE}/lib/libvulkan.so:graphics/vulkan-loader \ ${LOCALBASE}/lib/libncnn.a:science/ncnn USES= cmake compiler:${OPENMP}c++11-lib USE_GITHUB= yes GH_ACCOUNT= nihui CMAKE_SOURCE_PATH= ${WRKSRC}/src LDFLAGS+= -lpthread # XXX Convert ncnn to shared library PLIST_FILES= bin/${PORTNAME} PORTDATA= * .if !exists(/usr/include/omp.h) -# XXX ports/199603 + ports/210337 +# XXX ports/199603: LLVM openmp in base doesn't support aarch64, armv6, armv7 yet OPENMP= gcc- .endif pre-configure: @if ${GREP} -q 'NCNN_VULKAN.*0' ${LOCALBASE}/include/ncnn/platform.h; then \ ${ECHO_MSG} "${PKGNAME}: Needs ncnn built with VULKAN enabled."; \ return 1; \ fi post-patch: @${REINPLACE_CMD} -e '/PATHSTR/s,models-,${DATADIR}/&,' \ ${WRKSRC}/src/main.cpp do-install: ${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin (cd ${WRKSRC}/models && ${COPYTREE_SHARE} "${PORTDATA}" \ ${STAGEDIR}${DATADIR}) .include Index: head/math/ceres-solver/Makefile =================================================================== --- head/math/ceres-solver/Makefile (revision 528080) +++ head/math/ceres-solver/Makefile (revision 528081) @@ -1,120 +1,120 @@ # $FreeBSD$ PORTNAME= ceres-solver DISTVERSION= 1.14.0 PORTREVISION= 16 CATEGORIES= math MAINTAINER= jbeich@FreeBSD.org COMMENT= Nonlinear least squares minimizer LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libglog.so:devel/glog RUN_DEPENDS:= ${BUILD_DEPENDS:Meigen*} USES= cmake compiler:${OPENMP}c++11-lib eigen:3 localbase shebangfix USE_GITHUB= yes USE_LDCONFIG= yes SHEBANG_FILES= examples/slam/pose_graph_*/plot_results.py \ scripts/make_docs.py CMAKE_ON= CXX11 BUILD_SHARED_LIBS CMAKE_OFF= BUILD_BENCHMARKS LDFLAGS+= -Wl,--as-needed # -lccolamd -lcholmod -lrt from suitesparse PLIST_SUB= VERSION=${DISTVERSION:C/rc.*//} EXAMPLESDIR= ${PREFIX}/share/examples/${PORTNAME:S/-solver//} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:S/-solver//} PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= CUSTOM_BLAS EXAMPLES DOCS GFLAGS LAPACK SCHUR TEST OPTIONS_DEFAULT=CUSTOM_BLAS CXSPARSE OPENBLAS OPENMP SCHUR SUITESPARSE OPTIONS_RADIO= LAPACK THREADS OPTIONS_RADIO_LAPACK= ATLAS GOTOBLAS NETLIB OPENBLAS OPTIONS_RADIO_THREADS= OPENMP TBB OPTIONS_GROUP= SPARSE OPTIONS_GROUP_SPARSE= CXSPARSE EIGENSPARSE SUITESPARSE CUSTOM_BLAS_DESC= Handcoded BLAS routines instead of Eigen CUSTOM_BLAS_CMAKE_BOOL= CUSTOM_BLAS DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx DOCS_USES= python:build DOCS_CMAKE_BOOL= BUILD_DOCUMENTATION EXAMPLES_CMAKE_BOOL= BUILD_EXAMPLES EXAMPLES_IMPLIES= GFLAGS GFLAGS_DESC= Google Flags support GFLAGS_LIB_DEPENDS= libgflags.so:devel/gflags GFLAGS_CMAKE_BOOL= GFLAGS OPENMP_USES= compiler:openmp OPENMP_CMAKE_BOOL= OPENMP .if !exists(/usr/include/omp.h) -# XXX ports/199603 + ports/210337 +# XXX ports/199603: LLVM openmp in base doesn't support aarch64, armv6, armv7 yet OPENMP_VARS= OPENMP=gcc- .endif SCHUR_DESC= Fixed-size schur specializations SCHUR_CMAKE_BOOL= SCHUR_SPECIALIZATIONS TBB_DESC= Intel threading building blocks TBB_LIB_DEPENDS= libtbb.so:devel/tbb TBB_CMAKE_BOOL= TBB # XXX Unbundle googletest/googlemock TEST_CMAKE_BOOL= BUILD_TESTING TEST_TEST_TARGET= test TEST_IMPLIES= GFLAGS LAPACK_DESC= Linear Algebra PACKage LAPACK_CMAKE_BOOL= LAPACK # Avoid conflict with Ceres threading by using single-threaded BLAS library. # BLASLIB from USES=blaslapack cannot be used as it's multi-threaded. # https://github.com/xianyi/OpenBLAS/wiki/faq#multi-threaded ATLAS_USES= blaslapack:atlas ATLAS_CMAKE_ON= -DBLA_VENDOR:STRING="ATLAS" \ -DBLAS_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libcblas.so" \ -DLAPACK_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libalapack.so" ATLAS_IMPLIES= LAPACK GOTOBLAS_DESC= Goto blas implementation GOTOBLAS_USES= blaslapack:gotoblas GOTOBLAS_CMAKE_ON= -DBLA_VENDOR:STRING="Goto" GOTOBLAS_IMPLIES= LAPACK NETLIB_USES= blaslapack:netlib NETLIB_CMAKE_ON= -DBLA_VENDOR:STRING="Generic" NETLIB_IMPLIES= LAPACK OPENBLAS_USES= blaslapack:openblas OPENBLAS_CMAKE_ON= -DBLA_VENDOR:STRING="OpenBLAS" OPENBLAS_IMPLIES= LAPACK SPARSE_DESC= Sparse linear algebra library CXSPARSE_DESC= CXSparse support CXSPARSE_LIB_DEPENDS= libcxsparse.so:math/suitesparse CXSPARSE_CMAKE_ON= -DCXSPARSE_INCLUDE_DIR:PATH="${LOCALBASE}/include/suitesparse" CXSPARSE_CMAKE_BOOL= CXSPARSE EIGENSPARSE_DESC= Simplicial Cholesky factorization in Eigen EIGENSPARSE_CMAKE_BOOL= EIGENSPARSE EIGENSPARSE_VARS= LICENSE+=LGPL21+ LICENSE_COMB=multi \ LICENSE_FILE_BSD3CLAUSE="${LICENSE_FILE}" SUITESPARSE_DESC= SuiteSparse support SUITESPARSE_LIB_DEPENDS=libspqr.so:math/suitesparse SUITESPARSE_CMAKE_BOOL= SUITESPARSE post-patch-DOCS-on: @${REINPLACE_CMD} -e 's,python,${PYTHON_CMD:T},' \ ${WRKSRC}/docs/source/CMakeLists.txt pre-install-TEST-on: do-test post-install-EXAMPLES-on: # Copy examples (stripped), their source and sample data but not tests programs (cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) (cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${EXAMPLESDIR}) (cd ${BUILD_WRKSRC} && ${COPYTREE_SHARE} bin ${STAGEDIR}${EXAMPLESDIR}) @${RM} -r ${STAGEDIR}${EXAMPLESDIR}/bin/*_test -@${STRIP_CMD} ${STAGEDIR}${EXAMPLESDIR}/bin/* # may fail for non-root .include Index: head/math/suitesparse/Makefile =================================================================== --- head/math/suitesparse/Makefile (revision 528080) +++ head/math/suitesparse/Makefile (revision 528081) @@ -1,71 +1,71 @@ # Created by: Maho Nakata # $FreeBSD$ PORTNAME= suitesparse DISTVERSION= 5.4.0 PORTREVISION= 5 CATEGORIES= math MASTER_SITES= http://faculty.cse.tamu.edu/davis/SuiteSparse/ \ https://mirror.sobukus.de/files/src/suitesparse/ DISTNAME= SuiteSparse-${PORTVERSION} MAINTAINER= fortran@FreeBSD.org COMMENT= SuiteSparse is a set of packages for sparse matrices calculation LICENSE= GPLv2 LGPL21 LICENSE_COMB= dual LIB_DEPENDS= libmetis.so:math/metis USES= cmake:insource compiler:${OPENMP}c++11-lib fortran gmake localbase:ldflags USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/SuiteSparse ALL_TARGET= library # skip demos INSTALL_TARGET= install # skip USES=cmake MAKE_ENV= BLAS="${BLASLIB}" LAPACK="${LAPACKLIB}" \ MY_METIS_LIB="-lmetis" \ JOBS="${MAKE_JOBS_NUMBER}" \ CMAKE_OPTIONS='${CMAKE_ARGS}' \ INSTALL="${STAGEDIR}${PREFIX}" \ INSTALL_DOC="${STAGEDIR}${DOCSDIR}" \ INSTALL_INCLUDE="${STAGEDIR}${PREFIX}/include/${PORTNAME}" CMAKE_ARGS= -DCMAKE_INSTALL_INCLUDEDIR:PATH="include/${PORTNAME}" LDFLAGS+= -L${WRKSRC}/lib # prevent linking with shared libs from the preinstalled older versions CONFLICTS_INSTALL= mongoose plinkseq # bin/mongoose OPTIONS_DEFINE= DOCS OPENMP TBB OPTIONS_RADIO= BLAS OPTIONS_RADIO_BLAS= ATLAS GOTOBLAS NETLIB OPENBLAS OPTIONS_DEFAULT= OPENBLAS OPENMP TBB ATLAS_USES= blaslapack:atlas GOTOBLAS_DESC= Goto blas implementation GOTOBLAS_USES= blaslapack:gotoblas NETLIB_USES= blaslapack:netlib OPENBLAS_USES= blaslapack:openblas OPENMP_USES= compiler:openmp OPENMP_MAKE_ENV_OFF= CFOPENMP= .if !exists(/usr/include/omp.h) -# XXX ports/199603 + ports/210337 +# XXX ports/199603: LLVM openmp in base doesn't support aarch64, armv6, armv7 yet OPENMP_VARS= OPENMP=gcc- .endif TBB_DESC= Intel threading building blocks TBB_LIB_DEPENDS= libtbb.so:devel/tbb TBB_MAKE_ENV= TBB="-ltbb" SPQR_CONFIG="-DHAVE_TBB" post-extract: ${RM} -r ${WRKSRC}/metis-* do-configure: # skip USES=cmake post-patch-OPENMP-off: @${REINPLACE_CMD} -e '/find_package.*OpenMP/d' \ ${WRKSRC}/GraphBLAS/CMakeLists.txt post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/*.so .include