Revision: 124732 https://trac.macports.org/changeset/124732 Author: mmoll@macports.org Date: 2014-08-27 12:16:55 -0700 (Wed, 27 Aug 2014) Log Message: ----------- science/ompl: add upstream patch to make code compile with latest boost Modified Paths: -------------- trunk/dports/science/ompl/Portfile Added Paths: ----------- trunk/dports/science/ompl/files/ trunk/dports/science/ompl/files/patch-ODESolver.h.diff Modified: trunk/dports/science/ompl/Portfile =================================================================== --- trunk/dports/science/ompl/Portfile 2014-08-27 19:03:44 UTC (rev 124731) +++ trunk/dports/science/ompl/Portfile 2014-08-27 19:16:55 UTC (rev 124732) @@ -7,6 +7,7 @@ name ompl version 0.14.2 +revision 1 categories science maintainers mmoll description The Open Motion Planning Library (OMPL) @@ -16,11 +17,11 @@ platforms darwin license BSD master_sites https://bitbucket.org/ompl/ompl/downloads -dist_subdir ${name}/${version}_1 checksums md5 43ea02ca9ffff1719a87edf570874eaf \ sha1 8410ea13e5b58c790cbfff7f369a09c6a0ea3a8f \ rmd160 51dddb685f100bd9ce2772f860f610d5dcf428ef distname ${name}-${version}-Source +patchfiles patch-ODESolver.h.diff depends_lib-append port:boost port:ode port:flann port:triangle # We "inherit" the compiler fallback and blacklist from the Boost port, Added: trunk/dports/science/ompl/files/patch-ODESolver.h.diff =================================================================== --- trunk/dports/science/ompl/files/patch-ODESolver.h.diff (rev 0) +++ trunk/dports/science/ompl/files/patch-ODESolver.h.diff 2014-08-27 19:16:55 UTC (rev 124732) @@ -0,0 +1,14 @@ +--- ompl/src/ompl/control/ODESolver.h 2013-07-09 19:54:58.000000000 -0500 ++++ ompl/src/ompl/control/ODESolver.h 2014-08-18 09:10:11.000000000 -0500 +@@ -318,7 +317,11 @@ + { + ODESolver::ODEFunctor odefunc (ode_, control); + ++#if BOOST_VERSION < 105600 + odeint::controlled_runge_kutta< Solver > solver (odeint::default_error_checker<double>(maxError_, maxEpsilonError_)); ++#else ++ typename boost::numeric::odeint::result_of::make_controlled< Solver >::type solver = make_controlled( 1.0e-6 , 1.0e-6 , Solver() ); ++#endif + odeint::integrate_adaptive (solver, odefunc, state, 0.0, duration, intStep_); + } +