From owner-svn-ports-all@freebsd.org Tue Oct 13 03:34:38 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AD638430683; Tue, 13 Oct 2020 03:34:38 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C9Ll24VHdz42qv; Tue, 13 Oct 2020 03:34:38 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7D4921727D; Tue, 13 Oct 2020 03:34:38 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09D3YcaV097513; Tue, 13 Oct 2020 03:34:38 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09D3YbjR097508; Tue, 13 Oct 2020 03:34:37 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202010130334.09D3YbjR097508@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Tue, 13 Oct 2020 03:34:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552178 - in head/misc/ompl: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/misc/ompl: . files X-SVN-Commit-Revision: 552178 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Oct 2020 03:34:38 -0000 Author: yuri Date: Tue Oct 13 03:34:37 2020 New Revision: 552178 URL: https://svnweb.freebsd.org/changeset/ports/552178 Log: misc/ompl: Update 1.4.2 -> 1.5.0 Also update WWW. Modified: head/misc/ompl/Makefile head/misc/ompl/distinfo head/misc/ompl/files/patch-CMakeLists.txt head/misc/ompl/files/patch-CMakeModules_CompilerSettings.cmake head/misc/ompl/pkg-descr head/misc/ompl/pkg-plist Modified: head/misc/ompl/Makefile ============================================================================== --- head/misc/ompl/Makefile Tue Oct 13 02:51:21 2020 (r552177) +++ head/misc/ompl/Makefile Tue Oct 13 03:34:37 2020 (r552178) @@ -1,11 +1,8 @@ # $FreeBSD$ PORTNAME= ompl -DISTVERSION= 1.4.2 -DISTVERSIONSUFFIX= -Source -PORTREVISION= 3 +DISTVERSION= 1.5.0 CATEGORIES= misc comms -MASTER_SITES= http://cdn.bitbucket.org/${PORTNAME}/${PORTNAME}/downloads/ MAINTAINER= yuri@FreeBSD.org COMMENT= Open Motion Planning Library @@ -15,10 +12,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libboost_system.so:devel/boost-libs -USES= cmake compiler:c++11-lang eigen:3 pkgconfig zip +USES= cmake compiler:c++11-lang eigen:3 pkgconfig +USE_GITHUB= yes USE_LDCONFIG= yes -CMAKE_OFF= OMPL_REGISTRATION OMPL_BUILD_TESTS OMPL_BUILD_DEMOS +CMAKE_OFF= OMPL_REGISTRATION OMPL_BUILD_TESTS OMPL_BUILD_DEMOS OMPL_VERSIONED_INSTALL OPTIONS_DEFINE= FLANN MORSE OPENDE SPOT TRIANGLE PLANNERARENA OPTIONS_DEFAULT= FLANN MORSE OPENDE TRIANGLE @@ -52,9 +50,6 @@ post-patch-${o}-off: post-patch-PLANNERARENA-off: @${REINPLACE_CMD} 's|find_program(R_EXEC|#&|' ${WRKSRC}/CMakeLists.txt - -post-patch-SPOT-on: - @${REINPLACE_CMD} 's|-std=c++11|-std=c++14|' ${WRKSRC}/CMakeModules/CompilerSettings.cmake post-configure: @${REINPLACE_CMD} 's|/usr/bin/morse|${LOCALBASE}/bin/morse|' ${BUILD_WRKSRC}/CMakeCache.txt Modified: head/misc/ompl/distinfo ============================================================================== --- head/misc/ompl/distinfo Tue Oct 13 02:51:21 2020 (r552177) +++ head/misc/ompl/distinfo Tue Oct 13 03:34:37 2020 (r552178) @@ -1,3 +1,3 @@ -TIMESTAMP = 1557120365 -SHA256 (ompl-1.4.2-Source.zip) = 25ea88a89981a15896214d0896aa31e034dcd7368b29826679ab766ff5d10ef1 -SIZE (ompl-1.4.2-Source.zip) = 23592084 +TIMESTAMP = 1602556395 +SHA256 (ompl-ompl-1.5.0_GH0.tar.gz) = a7df8611b7823ef44c731f02897571adfc23551e85c6618d926e7720004267a5 +SIZE (ompl-ompl-1.5.0_GH0.tar.gz) = 23081668 Modified: head/misc/ompl/files/patch-CMakeLists.txt ============================================================================== --- head/misc/ompl/files/patch-CMakeLists.txt Tue Oct 13 02:51:21 2020 (r552177) +++ head/misc/ompl/files/patch-CMakeLists.txt Tue Oct 13 03:34:37 2020 (r552178) @@ -1,25 +1,8 @@ ---- CMakeLists.txt.orig 2018-06-24 21:58:25 UTC +--- CMakeLists.txt.orig 2020-06-02 18:39:48 UTC +++ CMakeLists.txt -@@ -97,8 +97,8 @@ enable_testing() - set_package_properties(Python PROPERTIES - URL "http://python.org" - PURPOSE "Used for python bindings.") --find_package(Python QUIET) --find_boost_python() -+find_package(Python QUIET) -+find_boost_python() - - if(PYTHON_FOUND) - set_package_properties(pypy PROPERTIES -@@ -171,12 +171,12 @@ if(PYTHON_FOUND AND NOT Boost_VERSION VE - endif() - - # R is needed for running Planner Arena locally --find_program(R_EXEC R) -+find_program(R_EXEC R) - - add_subdirectory(py-bindings) +@@ -179,7 +179,7 @@ find_program(R_EXEC R) add_subdirectory(src) + add_subdirectory(py-bindings) add_subdirectory(tests) -add_subdirectory(demos) +#add_subdirectory(demos) Modified: head/misc/ompl/files/patch-CMakeModules_CompilerSettings.cmake ============================================================================== --- head/misc/ompl/files/patch-CMakeModules_CompilerSettings.cmake Tue Oct 13 02:51:21 2020 (r552177) +++ head/misc/ompl/files/patch-CMakeModules_CompilerSettings.cmake Tue Oct 13 03:34:37 2020 (r552178) @@ -1,26 +1,17 @@ ---- CMakeModules/CompilerSettings.cmake.orig 2018-08-04 19:52:03 UTC +--- CMakeModules/CompilerSettings.cmake.orig 2020-06-02 18:39:48 UTC +++ CMakeModules/CompilerSettings.cmake -@@ -21,12 +21,12 @@ if(CMAKE_COMPILER_IS_GNUCXX) - -Wno-noexcept-type - -Wno-deprecated-declarations) +@@ -5,12 +5,12 @@ set(CMAKE_CXX_EXTENSIONS OFF) + if(CMAKE_COMPILER_IS_GNUCXX) + add_definitions(-W -Wall -Wextra -Wno-system-headers) # prepend optimizion flag (in case the default setting doesn't include one) - set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE}") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") endif(CMAKE_COMPILER_IS_GNUCXX) - if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - add_definitions(-W -Wall -Wextra -Wno-missing-field-initializers -Wno-unused -Wno-unused-parameter -Wno-delete-non-virtual-dtor -Wno-overloaded-virtual -Wno-unknown-pragmas -Qunused-arguments -Wno-deprecated-register -Wno-mismatched-tags -Wno-deprecated-declarations) + if(CMAKE_CXX_COMPILER_ID MATCHES "^(Apple)?Clang$") + add_definitions(-W -Wall -Wextra -Wno-system-headers) # prepend optimizion flag (in case the default setting doesn't include one) - set(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE}") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}") endif() - if(MSVC OR MSVC90 OR MSVC10) -@@ -42,7 +42,7 @@ if(IS_ICPC) - add_definitions(-wd191 -wd411 -wd654 -wd1125 -wd1292 -wd1565 -wd1628 -wd2196) - set(CMAKE_AR "xiar" CACHE STRING "Intel archiver" FORCE) - set(CMAKE_CXX_FLAGS "-pthread" CACHE STRING "Default compile flags" FORCE) -- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" -+ set(CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG" - CACHE STRING "Flags used by the C++ compiler during release builds." FORCE) - set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g" CACHE STRING - "Flags used by the C++ compiler during debug builds." FORCE) + if(MSVC) Modified: head/misc/ompl/pkg-descr ============================================================================== --- head/misc/ompl/pkg-descr Tue Oct 13 02:51:21 2020 (r552177) +++ head/misc/ompl/pkg-descr Tue Oct 13 03:34:37 2020 (r552178) @@ -9,4 +9,4 @@ tutorials, demos, and programming assignments are desi about sampling-based motion planning. The library is also available for use through Robot Operating System (ROS). -WWW: https://bitbucket.org/ompl/ompl/src/default/ +WWW: https://ompl.kavrakilab.org/ Modified: head/misc/ompl/pkg-plist ============================================================================== --- head/misc/ompl/pkg-plist Tue Oct 13 02:51:21 2020 (r552177) +++ head/misc/ompl/pkg-plist Tue Oct 13 03:34:37 2020 (r552178) @@ -34,6 +34,7 @@ include/ompl/base/ValidStateSampler.h include/ompl/base/goals/GoalLazySamples.h include/ompl/base/goals/GoalRegion.h include/ompl/base/goals/GoalSampleableRegion.h +include/ompl/base/goals/GoalSpace.h include/ompl/base/goals/GoalState.h include/ompl/base/goals/GoalStates.h include/ompl/base/objectives/MaximizeMinClearanceObjective.h @@ -44,12 +45,16 @@ include/ompl/base/objectives/StateCostIntegralObjectiv include/ompl/base/objectives/VFMechanicalWorkOptimizationObjective.h include/ompl/base/objectives/VFUpstreamCriterionOptimizationObjective.h include/ompl/base/samplers/BridgeTestValidStateSampler.h +include/ompl/base/samplers/DeterministicStateSampler.h include/ompl/base/samplers/GaussianValidStateSampler.h include/ompl/base/samplers/InformedStateSampler.h include/ompl/base/samplers/MaximizeClearanceValidStateSampler.h include/ompl/base/samplers/MinimumClearanceValidStateSampler.h include/ompl/base/samplers/ObstacleBasedValidStateSampler.h include/ompl/base/samplers/UniformValidStateSampler.h +include/ompl/base/samplers/deterministic/DeterministicSequence.h +include/ompl/base/samplers/deterministic/HaltonSequence.h +include/ompl/base/samplers/deterministic/PrecomputedSequence.h include/ompl/base/samplers/informed/OrderedInfSampler.h include/ompl/base/samplers/informed/PathLengthDirectInfSampler.h include/ompl/base/samplers/informed/RejectionInfSampler.h @@ -70,6 +75,8 @@ include/ompl/base/spaces/constraint/AtlasStateSpace.h include/ompl/base/spaces/constraint/ConstrainedStateSpace.h include/ompl/base/spaces/constraint/ProjectedStateSpace.h include/ompl/base/spaces/constraint/TangentBundleStateSpace.h +include/ompl/base/terminationconditions/CostConvergenceTerminationCondition.h +include/ompl/base/terminationconditions/IterationTerminationCondition.h include/ompl/config.h include/ompl/control/Control.h include/ompl/control/ControlSampler.h @@ -105,6 +112,7 @@ include/ompl/control/planners/syclop/SyclopEST.h include/ompl/control/planners/syclop/SyclopRRT.h include/ompl/control/spaces/DiscreteControlSpace.h include/ompl/control/spaces/RealVectorControlSpace.h +include/ompl/datastructures/AdjacencyList.h include/ompl/datastructures/BinaryHeap.h include/ompl/datastructures/DynamicSSSP.h include/ompl/datastructures/GreedyKCenters.h @@ -129,12 +137,12 @@ include/ompl/extensions/morse/MorseStatePropagator.h include/ompl/extensions/morse/MorseStateSpace.h include/ompl/extensions/morse/MorseStateValidityChecker.h include/ompl/extensions/morse/MorseTerminationCondition.h -include/ompl/extensions/opende/OpenDEControlSpace.h -include/ompl/extensions/opende/OpenDEEnvironment.h -include/ompl/extensions/opende/OpenDESimpleSetup.h -include/ompl/extensions/opende/OpenDEStatePropagator.h -include/ompl/extensions/opende/OpenDEStateSpace.h -include/ompl/extensions/opende/OpenDEStateValidityChecker.h +include/ompl/extensions/ode/OpenDEControlSpace.h +include/ompl/extensions/ode/OpenDEEnvironment.h +include/ompl/extensions/ode/OpenDESimpleSetup.h +include/ompl/extensions/ode/OpenDEStatePropagator.h +include/ompl/extensions/ode/OpenDEStateSpace.h +include/ompl/extensions/ode/OpenDEStateValidityChecker.h include/ompl/extensions/triangle/PropositionalTriangularDecomposition.h include/ompl/extensions/triangle/TriangularDecomposition.h include/ompl/geometric/GeneticSearch.h @@ -145,13 +153,6 @@ include/ompl/geometric/PathSimplifier.h include/ompl/geometric/SimpleSetup.h include/ompl/geometric/planners/AnytimePathShortening.h include/ompl/geometric/planners/PlannerIncludes.h -include/ompl/geometric/planners/bitstar/BITstar.h -include/ompl/geometric/planners/bitstar/datastructures/CostHelper.h -include/ompl/geometric/planners/bitstar/datastructures/HelperFunctions.h -include/ompl/geometric/planners/bitstar/datastructures/IdGenerator.h -include/ompl/geometric/planners/bitstar/datastructures/ImplicitGraph.h -include/ompl/geometric/planners/bitstar/datastructures/SearchQueue.h -include/ompl/geometric/planners/bitstar/datastructures/Vertex.h include/ompl/geometric/planners/cforest/CForest.h include/ompl/geometric/planners/cforest/CForestStateSampler.h include/ompl/geometric/planners/cforest/CForestStateSpaceWrapper.h @@ -162,6 +163,18 @@ include/ompl/geometric/planners/experience/LightningRe include/ompl/geometric/planners/experience/ThunderRetrieveRepair.h include/ompl/geometric/planners/fmt/BFMT.h include/ompl/geometric/planners/fmt/FMT.h +include/ompl/geometric/planners/informedtrees/ABITstar.h +include/ompl/geometric/planners/informedtrees/AITstar.h +include/ompl/geometric/planners/informedtrees/BITstar.h +include/ompl/geometric/planners/informedtrees/aitstar/Edge.h +include/ompl/geometric/planners/informedtrees/aitstar/ImplicitGraph.h +include/ompl/geometric/planners/informedtrees/aitstar/Vertex.h +include/ompl/geometric/planners/informedtrees/bitstar/CostHelper.h +include/ompl/geometric/planners/informedtrees/bitstar/HelperFunctions.h +include/ompl/geometric/planners/informedtrees/bitstar/IdGenerator.h +include/ompl/geometric/planners/informedtrees/bitstar/ImplicitGraph.h +include/ompl/geometric/planners/informedtrees/bitstar/SearchQueue.h +include/ompl/geometric/planners/informedtrees/bitstar/Vertex.h include/ompl/geometric/planners/kpiece/BKPIECE1.h include/ompl/geometric/planners/kpiece/Discretization.h include/ompl/geometric/planners/kpiece/KPIECE1.h @@ -174,6 +187,15 @@ include/ompl/geometric/planners/prm/PRM.h include/ompl/geometric/planners/prm/PRMstar.h include/ompl/geometric/planners/prm/SPARS.h include/ompl/geometric/planners/prm/SPARStwo.h +include/ompl/geometric/planners/quotientspace/QRRT.h +include/ompl/geometric/planners/quotientspace/algorithms/MultiQuotient.h +include/ompl/geometric/planners/quotientspace/algorithms/MultiQuotientImpl.h +include/ompl/geometric/planners/quotientspace/algorithms/QRRTImpl.h +include/ompl/geometric/planners/quotientspace/datastructures/PlannerDataVertexAnnotated.h +include/ompl/geometric/planners/quotientspace/datastructures/QuotientSpace.h +include/ompl/geometric/planners/quotientspace/datastructures/QuotientSpaceGraph.h +include/ompl/geometric/planners/rlrt/BiRLRT.h +include/ompl/geometric/planners/rlrt/RLRT.h include/ompl/geometric/planners/rrt/BiTRRT.h include/ompl/geometric/planners/rrt/InformedRRTstar.h include/ompl/geometric/planners/rrt/LBTRRT.h @@ -186,12 +208,17 @@ include/ompl/geometric/planners/rrt/RRTsharp.h include/ompl/geometric/planners/rrt/RRTstar.h include/ompl/geometric/planners/rrt/SORRTstar.h include/ompl/geometric/planners/rrt/TRRT.h +include/ompl/geometric/planners/rrt/TSRRT.h include/ompl/geometric/planners/rrt/VFRRT.h include/ompl/geometric/planners/rrt/pRRT.h include/ompl/geometric/planners/sbl/SBL.h include/ompl/geometric/planners/sbl/pSBL.h include/ompl/geometric/planners/sst/SST.h include/ompl/geometric/planners/stride/STRIDE.h +include/ompl/geometric/planners/xxl/XXL.h +include/ompl/geometric/planners/xxl/XXLDecomposition.h +include/ompl/geometric/planners/xxl/XXLPlanarDecomposition.h +include/ompl/geometric/planners/xxl/XXLPositionDecomposition.h include/ompl/tools/benchmark/Benchmark.h include/ompl/tools/benchmark/MachineSpecs.h include/ompl/tools/config/MagicConstants.h @@ -209,7 +236,6 @@ include/ompl/tools/thunder/Thunder.h include/ompl/tools/thunder/ThunderDB.h include/ompl/util/ClassForward.h include/ompl/util/Console.h -include/ompl/util/Deprecation.h include/ompl/util/DisableCompilerWarning.h include/ompl/util/Exception.h include/ompl/util/GeometricEquations.h @@ -220,14 +246,14 @@ include/ompl/util/RandomNumbers.h include/ompl/util/String.h include/ompl/util/Time.h lib/libompl.so -lib/libompl.so.1.4.2 -lib/libompl.so.15 +lib/libompl.so.1.5.0 +lib/libompl.so.16 libdata/pkgconfig/ompl.pc man/man1/ompl_benchmark_statistics.1.gz %%PLANNERARENA%%man/man1/plannerarena.1.gz %%DATADIR%%/cmake/omplConfig.cmake %%DATADIR%%/cmake/omplConfigVersion.cmake -%%DATADIR%%/ompl.conf +%%DATADIR%%/package.xml %%PLANNERARENA%%%%DATADIR%%/plannerarena/global.R %%PLANNERARENA%%%%DATADIR%%/plannerarena/plannerarena %%PLANNERARENA%%%%DATADIR%%/plannerarena/server.R