Index: branches/2016Q4/math/eigen3/Makefile =================================================================== --- branches/2016Q4/math/eigen3/Makefile (revision 423318) +++ branches/2016Q4/math/eigen3/Makefile (revision 423319) @@ -1,22 +1,23 @@ # $FreeBSD$ PORTNAME= eigen PORTVERSION= 3.2.9 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= https://bitbucket.org/${PORTNAME}/${PORTNAME}/get/ DISTNAME= ${PORTVERSION} DIST_SUBDIR= ${PORTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Lightweight library for vector and matrix math LICENSE= LGPL21 MPL LICENSE_COMB= multi CMAKE_ARGS= -DPKGCONFIG_INSTALL_DIR:PATH="${PREFIX}/libdata/pkgconfig" USES= cmake:outsource tar:bzip2 NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTNAME}-dc6cfdf9bcec .include Index: branches/2016Q4/math/eigen3/files/patch-unsupported_Eigen_src_MatrixFunctions_MatrixExponential.h =================================================================== --- branches/2016Q4/math/eigen3/files/patch-unsupported_Eigen_src_MatrixFunctions_MatrixExponential.h (nonexistent) +++ branches/2016Q4/math/eigen3/files/patch-unsupported_Eigen_src_MatrixFunctions_MatrixExponential.h (revision 423319) @@ -0,0 +1,63 @@ +Back out 8125108ba3e8 to unbreak consumers on libstdc++ 4.2 + + In file included from /usr/local/include/eigen3/unsupported/Eigen/MatrixFunctions:58, + from modules/contrib/src/rgbdodometry.cpp:65: + /usr/local/include/eigen3/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h: In member function 'void Eigen::MatrixExponential::computeUV(float)': + /usr/local/include/eigen3/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h:296: error: call of overloaded 'pow(int, int&)' is ambiguous + /usr/include/math.h:210: note: candidates are: double pow(double, double) + /usr/include/c++/4.2/cmath:357: note: float std::pow(float, float) + /usr/include/c++/4.2/cmath:361: note: long double std::pow(long double, long double) + /usr/include/c++/4.2/cmath:365: note: double std::pow(double, int) + /usr/include/c++/4.2/cmath:369: note: float std::pow(float, int) + /usr/include/c++/4.2/cmath:373: note: long double std::pow(long double, int) + +--- unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h.orig 2016-07-18 14:28:24 UTC ++++ unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h +@@ -293,7 +293,11 @@ + const float maxnorm = 3.925724783138660f; + frexp(m_l1norm / maxnorm, &m_squarings); + if (m_squarings < 0) m_squarings = 0; ++#if !defined(__GLIBCXX__) || __GLIBCXX__ > 20070831 + MatrixType A = m_M / Scalar(pow(2, m_squarings)); ++#else ++ MatrixType A = m_M / pow(Scalar(2), m_squarings); ++#endif + pade7(A); + } + } +@@ -315,7 +315,11 @@ + const double maxnorm = 5.371920351148152; + frexp(m_l1norm / maxnorm, &m_squarings); + if (m_squarings < 0) m_squarings = 0; ++#if !defined(__GLIBCXX__) || __GLIBCXX__ > 20070831 + MatrixType A = m_M / Scalar(pow(2, m_squarings)); ++#else ++ MatrixType A = m_M / pow(Scalar(2), m_squarings); ++#endif + pade13(A); + } + } +@@ -340,7 +340,11 @@ + const long double maxnorm = 4.0246098906697353063L; + frexp(m_l1norm / maxnorm, &m_squarings); + if (m_squarings < 0) m_squarings = 0; ++#if !defined(__GLIBCXX__) || __GLIBCXX__ > 20070831 + MatrixType A = m_M / Scalar(pow(2, m_squarings)); ++#else ++ MatrixType A = m_M / pow(Scalar(2), m_squarings); ++#endif + pade13(A); + } + #elif LDBL_MANT_DIG <= 106 // double-double +@@ -376,7 +376,11 @@ + const long double maxnorm = 2.884233277829519311757165057717815L; + frexp(m_l1norm / maxnorm, &m_squarings); + if (m_squarings < 0) m_squarings = 0; ++#if !defined(__GLIBCXX__) || __GLIBCXX__ > 20070831 + MatrixType A = m_M / Scalar(pow(2, m_squarings)); ++#else ++ MatrixType A = m_M / pow(Scalar(2), m_squarings); ++#endif + pade17(A); + } + #else Property changes on: branches/2016Q4/math/eigen3/files/patch-unsupported_Eigen_src_MatrixFunctions_MatrixExponential.h ___________________________________________________________________ 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/2016Q4 =================================================================== --- branches/2016Q4 (revision 423318) +++ branches/2016Q4 (revision 423319) Property changes on: branches/2016Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r423317