<pre style='margin:0'>
Mark Moll (mamoll) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d97830c817c1f052019b17ecb6cd1d569d6efeed">https://github.com/macports/macports-ports/commit/d97830c817c1f052019b17ecb6cd1d569d6efeed</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d97830c817c science/ompl: update to version 1.6.0
</span>d97830c817c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d97830c817c1f052019b17ecb6cd1d569d6efeed
</span>Author: Mark Moll <mmoll@macports.org>
AuthorDate: Mon Jan 16 16:56:24 2023 -0800
<span style='display:block; white-space:pre;color:#404040;'> science/ompl: update to version 1.6.0
</span>---
science/ompl/Portfile | 73 ++++++++++++++++++++++-----------------------------
1 file changed, 32 insertions(+), 41 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/ompl/Portfile b/science/ompl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ef159720435..5fcb02d56d0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/ompl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/ompl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,27 +11,29 @@ maintainers {mmoll @mamoll}
</span> description The Open Motion Planning Library (OMPL)
long_description The Open Motion Planning Library (OMPL) consists of a set \
of sampling-based motion planning algorithms.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ompl ompl 1.5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ompl ompl 1.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> homepage http://ompl.kavrakilab.org
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 538d9625dcf49942b750b744d747f1e67cb14f93 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 276e54ce68390dc2c00749fb4b32621cae823e17a4826f0e56d5a30bf6266db4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 23082270
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 06eb0389277f0f34d1c304cca25b16563d12643b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fe9dfa3f5d9912087f3fee522fb4333a9740ef82bc8da9580a5af6c12e2c92c6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 23395140
</span> depends_build-append port:pkgconfig
depends_lib-append port:ode port:flann port:triangle port:eigen3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span> configure.args-append -DOMPL_BUILD_DEMOS=OFF \
-DOMPL_BUILD_TESTS=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_DISABLE_FIND_PACKAGE_spot=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOMPL_REGISTRATION=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_spot=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
</span>
# generate the extra C++ code needed for Python bindings. This code seems
# somewhat dependent on compiler and/or boost version, so we can't
# pre-generate them and make them available as an extra download.
post-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python27] || [variant_isset python35] || [variant_isset python36] || [variant_isset python37] || [variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python35] || [variant_isset python36] || [variant_isset python37] || [variant_isset python38] || [variant_isset python39] || [variant_isset python310] || [variant_isset python311]} {
</span> # enable parallel build on at most 2 cores. Generating the bindings
# uses large amounts of memory, so don't use more cores.
if { ${use_parallel_build} } { set cj "-j 2" } else { set cj "" }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,13 +61,12 @@ http://ompl.kavrakilab.org/license.html#ricelicense"
</span> -DCMAKE_DISABLE_FIND_PACKAGE_PQP=ON \
-DOMPLAPP_RESOURCE_DIR=${prefix}/share/ompl/resources \
-DASSIMP_LIBRARIES=assimp -DASSIMP_INCLUDE_DIRS=${prefix}/include
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup ompl omplapp 1.5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup ompl omplapp 1.6.0
</span> master_sites https://github.com/ompl/omplapp/releases/download/${version}
distname omplapp-${version}-Source
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-findeigen.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 ba38ffc0999a3d7751d1b322b86b9a72e1c0c6b1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1e2944e06a4eb1aa0d5e902e20dd0c145513e803e1663b7d41ef5d79527dcfdd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 38170372
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 800a090a0dcb45544974cd1b87093e8b57325915 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 34ef2c99214f1d8edb8039fd19a45b7b460eb69e2845557a62d37b2de4b51880 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 38490533
</span> notes "
If you intend to use ompl_webapp, you need to first launch the redis server and set the following environment variables:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,50 +81,43 @@ variant spot description {Include support for automaton generation from LTL spec
</span> depends_lib-append port:spot
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pythons_suffixes {27 35 36 37 38 39}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_versions {3.5 3.6 3.7 3.8 3.9 3.10 3.11}
</span>
set pythons_ports {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend pythons_ports python${s}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v ${pythons_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend pythons_ports python[string map {. {}} ${v}]
</span> }
proc python_dir {} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- global pythons_suffixes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global pythons_versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach p ${pythons_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set s [string map {. {}} ${p}]
</span> if {[variant_isset python${s}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set p python[string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return [file normalize [exec ${p} -c "import sys; print(sys.prefix)"]/lib/${p}/site-packages]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return [file normalize [exec python${p} -c "import sys; print(sys.prefix)"]/lib/${p}/site-packages]
</span> }
}
error "Python support not enabled."
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v ${pythons_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set s [string map {. {}} ${v}]
</span> set p python${s}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set v [string index ${s} 0].[string index ${s} 1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vnodots [string index ${s} 0][string index ${s} 1]
</span> set i [lsearch -exact ${pythons_ports} ${p}]
set c [lreplace ${pythons_ports} ${i} ${i}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant ${p} description "Use Python ${v} for python bindings" conflicts {*}${c} debug "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${p} description "Use Python ${v} for python bindings" "
</span> depends_build-append port:py${s}-pyplusplus
depends_lib-append port:${p}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DPYTHON_EXEC=${prefix}/bin/python${v}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPYTHON_EXEC=${prefix}/bin/python${v} -DPYPY=${prefix}/bin/pypy38
</span> boost.require_numpy yes
# the python bindings rely on Boost.Python, so make sure it is installed.
require_active_variants [boost::depends_portname]-numpy ${p}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove if statement when pypy is no longer broken on Big Sur
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 20} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # use PyPy to generate Python bindings, which is *much* faster than CPython
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${v} eq \"2.7\" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pypy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append port:pypy36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # use PyPy to generate Python bindings, which is *much* faster than CPython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pypy38
</span>
if { [variant_isset app] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch.pre_args -p0
</span> depends_lib-append \
port:py${s}-pyqt5 \
port:py${s}-opengl \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,7 +138,6 @@ foreach s ${pythons_suffixes} {
</span> ln -sf ${prefix}/share/ompl/resources/3D ${destroot}${prefix}/share/ompl/webapp/static/problem_files/3D
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch.pre_args -p1
</span> post-destroot {
# extra copy of libs not needed in site_packages and causes problems with rpaths
set site_packages \[python_dir\]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -155,16 +148,14 @@ foreach s ${pythons_suffixes} {
</span> }
# enable one python variant so that the python bindings can be compiled
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set selected_python ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-foreach s ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set selected_python python310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach v ${pythons_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set s [string map {. {}} ${v}]
</span> if {[variant_isset python${s}]} {
set selected_python python${s}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${selected_python} eq "" && ![variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # should be the same default Python as boost-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +python39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +${selected_python}
</span>
livecheck.type regex
livecheck.url http://ompl.kavrakilab.org/download.html
</pre><pre style='margin:0'>
</pre>