Index: head/math/ceres-solver/files/patch-include_ceres_jet.h =================================================================== --- head/math/ceres-solver/files/patch-include_ceres_jet.h (revision 426042) +++ head/math/ceres-solver/files/patch-include_ceres_jet.h (nonexistent) @@ -1,13 +0,0 @@ -https://github.com/ceres-solver/ceres-solver/issues/235 - ---- include/ceres/jet.h.orig 2016-10-13 16:52:02 UTC -+++ include/ceres/jet.h -@@ -242,7 +242,7 @@ struct Jet { - 16 <= ::ceres::port_constants::kMaxAlignBytes; - static constexpr int kAlignHint = kShouldAlignMatrix ? - Eigen::AutoAlign : Eigen::DontAlign; -- static constexpr size_t kAlignment = kShouldAlignMatrix ? 16 : 1; -+ static constexpr size_t kAlignment = kShouldAlignMatrix ? 16 : 4; - alignas(kAlignment) Eigen::Matrix v; - #endif - }; Property changes on: head/math/ceres-solver/files/patch-include_ceres_jet.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 Index: head/math/ceres-solver/Makefile =================================================================== --- head/math/ceres-solver/Makefile (revision 426042) +++ head/math/ceres-solver/Makefile (revision 426043) @@ -1,110 +1,110 @@ # $FreeBSD$ PORTNAME= ceres-solver -DISTVERSION= 1.12.0rc1 -PORTREVISION= 2 +DISTVERSION= 1.12.0rc2-3 +DISTVERSIONSUFFIX= -gc5c6f55 CATEGORIES= math MAINTAINER= jbeich@FreeBSD.org COMMENT= Nonlinear least squares minimizer LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= eigen>=3.2.2:math/eigen3 LIB_DEPENDS= libglog.so:devel/glog RUN_DEPENDS:= ${BUILD_DEPENDS:Meigen*} USES= cmake:outsource compiler:${OPENMP}c++11-lib localbase shebangfix USE_GITHUB= yes USE_LDCONFIG= yes SHEBANG_FILES= examples/slam/pose_graph_*/plot_results.py \ scripts/make_docs.py CMAKE_ARGS= -DCXX11=on -DBUILD_SHARED_LIBS=on LDFLAGS+= -Wl,--as-needed # -lccolamd -lcholmod -lrt from suitesparse -PLIST_SUB= VERSION=${PORTVERSION:R} +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 OPENMP SCHUR TEST OPTIONS_DEFAULT=CUSTOM_BLAS CXSPARSE NETLIB OPENMP SCHUR SUITESPARSE OPTIONS_RADIO= LAPACK OPTIONS_RADIO_LAPACK= ATLAS GOTOBLAS NETLIB OPENBLAS 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 OPENMP_VARS= OPENMP=gcc- # XXX ports/210337 SCHUR_DESC= Fixed-size schur specializations SCHUR_CMAKE_BOOL= SCHUR_SPECIALIZATIONS # XXX Unbundle googletest/googlemock TEST_CMAKE_BOOL= BUILD_TESTING TEST_TEST_TARGET= test ARGS="-V" TEST_IMPLIES= GFLAGS LAPACK_DESC= Linear Algebra PACKage LAPACK_USES= fortran # LDFLAGS LAPACK_CMAKE_ON= -DBLAS_LIBRARIES="${BLASLIB}" -DLAPACK_LIBRARIES="${LAPACKLIB}" LAPACK_CMAKE_BOOL= LAPACK ATLAS_USES= blaslapack:atlas ATLAS_CMAKE_ON= -DBLA_VENDOR="ATLAS" ATLAS_IMPLIES= LAPACK GOTOBLAS_DESC= Goto blas implementation GOTOBLAS_USES= blaslapack:gotoblas GOTOBLAS_CMAKE_ON= -DBLA_VENDOR="Goto" GOTOBLAS_IMPLIES= LAPACK NETLIB_USES= blaslapack:netlib NETLIB_CMAKE_ON= -DBLA_VENDOR="Generic" NETLIB_IMPLIES= LAPACK OPENBLAS_USES= blaslapack:openblas OPENBLAS_CMAKE_ON= -DBLA_VENDOR="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="${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 SUITESPARSE_IMPLIES= LAPACK 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/ceres-solver/distinfo =================================================================== --- head/math/ceres-solver/distinfo (revision 426042) +++ head/math/ceres-solver/distinfo (revision 426043) @@ -1,3 +1,3 @@ -TIMESTAMP = 1474949998 -SHA256 (ceres-solver-ceres-solver-1.12.0rc1_GH0.tar.gz) = 71c4af1d9dc434327b4af509d9a5cd4f509cc60c7f349bc0fac20ca51c02569b -SIZE (ceres-solver-ceres-solver-1.12.0rc1_GH0.tar.gz) = 3413229 +TIMESTAMP = 1478963838 +SHA256 (ceres-solver-ceres-solver-1.12.0rc2-3-gc5c6f55_GH0.tar.gz) = ab1c101dcf5a1abf6128cf3a00b9d38ad7939c07faaf89d931dc9dfb5bc4d2f9 +SIZE (ceres-solver-ceres-solver-1.12.0rc2-3-gc5c6f55_GH0.tar.gz) = 3413993 Index: head/math/ceres-solver/pkg-plist =================================================================== --- head/math/ceres-solver/pkg-plist (revision 426042) +++ head/math/ceres-solver/pkg-plist (revision 426043) @@ -1,52 +1,53 @@ include/ceres/autodiff_cost_function.h include/ceres/autodiff_local_parameterization.h include/ceres/c_api.h include/ceres/ceres.h include/ceres/conditioned_cost_function.h include/ceres/cost_function.h include/ceres/cost_function_to_functor.h include/ceres/covariance.h include/ceres/crs_matrix.h include/ceres/cubic_interpolation.h include/ceres/dynamic_autodiff_cost_function.h +include/ceres/dynamic_cost_function.h include/ceres/dynamic_cost_function_to_functor.h include/ceres/dynamic_numeric_diff_cost_function.h include/ceres/fpclassify.h include/ceres/gradient_checker.h include/ceres/gradient_problem.h include/ceres/gradient_problem_solver.h include/ceres/internal/autodiff.h include/ceres/internal/config.h include/ceres/internal/disable_warnings.h include/ceres/internal/eigen.h include/ceres/internal/fixed_array.h include/ceres/internal/macros.h include/ceres/internal/manual_constructor.h include/ceres/internal/numeric_diff.h include/ceres/internal/port.h include/ceres/internal/reenable_warnings.h include/ceres/internal/scoped_ptr.h include/ceres/internal/variadic_evaluate.h include/ceres/iteration_callback.h include/ceres/jet.h include/ceres/local_parameterization.h include/ceres/loss_function.h include/ceres/normal_prior.h include/ceres/numeric_diff_cost_function.h include/ceres/numeric_diff_options.h include/ceres/ordered_groups.h include/ceres/problem.h include/ceres/rotation.h include/ceres/sized_cost_function.h include/ceres/solver.h include/ceres/types.h include/ceres/version.h lib/cmake/Ceres/CeresConfig.cmake lib/cmake/Ceres/CeresConfigVersion.cmake lib/cmake/Ceres/CeresTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Ceres/CeresTargets.cmake lib/cmake/Ceres/FindEigen.cmake lib/cmake/Ceres/FindGlog.cmake lib/libceres.so lib/libceres.so.1 lib/libceres.so.%%VERSION%%