diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2019-11-24 18:56:27 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2019-11-24 18:56:27 +0000 |
| commit | 60e55aa2622154e700424cdcd6c19a8a0e8e68bc (patch) | |
| tree | 1cb69463dc6269427e91bff777d4224547b412a0 /math/octomap | |
| parent | 1f262a1a34fde495892877756dde255dcf5ddac0 (diff) | |
| download | ports-60e55aa2622154e700424cdcd6c19a8a0e8e68bc.tar.gz ports-60e55aa2622154e700424cdcd6c19a8a0e8e68bc.zip | |
math/octomap: Update 1.9.0 -> 1.9.1
Reported by: portscout
Notes
Notes:
svn path=/head/; revision=518349
Diffstat (limited to 'math/octomap')
| -rw-r--r-- | math/octomap/Makefile | 5 | ||||
| -rw-r--r-- | math/octomap/distinfo | 6 | ||||
| -rw-r--r-- | math/octomap/files/patch-octomap_src_CMakeLists.txt | 10 | ||||
| -rw-r--r-- | math/octomap/pkg-plist | 6 |
4 files changed, 14 insertions, 13 deletions
diff --git a/math/octomap/Makefile b/math/octomap/Makefile index ba8aaf44ca59..95ab9bb2f66b 100644 --- a/math/octomap/Makefile +++ b/math/octomap/Makefile @@ -2,8 +2,7 @@ PORTNAME= octomap DISTVERSIONPREFIX= v -DISTVERSION= 1.9.0 -PORTREVISION= 1 +DISTVERSION= 1.9.1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -14,7 +13,7 @@ LICENSE_COMB= dual LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/octomap/LICENSE.txt LICENSE_FILE_GPLv2= ${WRKSRC}/octovis/LICENSE.txt -BUILD_DEPENDS= libQGLViewer>0:graphics/libQGLViewer # otherwise it doesn't build, see https://github.com/OctoMap/octomap/issues/225 +BUILD_DEPENDS= libQGLViewer>0:graphics/libQGLViewer # otherwise it doesn't build, see https://github.com/OctoMap/octomap/issues/225 USES= cmake localbase:ldflags USE_GITHUB= yes diff --git a/math/octomap/distinfo b/math/octomap/distinfo index 5ff98f2db949..3dfbbca63de1 100644 --- a/math/octomap/distinfo +++ b/math/octomap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1542791562 -SHA256 (OctoMap-octomap-v1.9.0_GH0.tar.gz) = 5f81c9a8cbc9526b2e725251cd3a829e5222a28201b394314002146d8b9214dd -SIZE (OctoMap-octomap-v1.9.0_GH0.tar.gz) = 1682421 +TIMESTAMP = 1574617955 +SHA256 (OctoMap-octomap-v1.9.1_GH0.tar.gz) = 9abce615d9f3f97a15ba129a10e3a01f9bef9aad178f2ef398f9a925f793c7b9 +SIZE (OctoMap-octomap-v1.9.1_GH0.tar.gz) = 1682526 diff --git a/math/octomap/files/patch-octomap_src_CMakeLists.txt b/math/octomap/files/patch-octomap_src_CMakeLists.txt index 96d382dd341f..0dab6634c922 100644 --- a/math/octomap/files/patch-octomap_src_CMakeLists.txt +++ b/math/octomap/files/patch-octomap_src_CMakeLists.txt @@ -1,17 +1,19 @@ ---- octomap/src/CMakeLists.txt.orig 2017-04-28 19:49:53 UTC +--- octomap/src/CMakeLists.txt.orig 2019-11-23 20:56:23 UTC +++ octomap/src/CMakeLists.txt -@@ -16,8 +16,8 @@ set_target_properties( octomap PROPERTIE +@@ -16,9 +16,9 @@ set_target_properties( octomap PROPERTIES VERSION ${OCTOMAP_VERSION} SOVERSION ${OCTOMAP_SOVERSION} ) -ADD_LIBRARY( octomap-static STATIC ${octomap_SRCS}) -SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap") +-add_dependencies(octomap-static octomath-static) +#ADD_LIBRARY( octomap-static STATIC ${octomap_SRCS}) +#SET_TARGET_PROPERTIES(octomap-static PROPERTIES OUTPUT_NAME "octomap") ++#add_dependencies(octomap-static octomath-static) TARGET_LINK_LIBRARIES(octomap octomath) -@@ -25,7 +25,7 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DI +@@ -26,7 +26,7 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap") endif() @@ -20,7 +22,7 @@ APPEND FILE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octomap/octomap-targets.cmake") ADD_SUBDIRECTORY( testing ) -@@ -66,7 +66,7 @@ TARGET_LINK_LIBRARIES(intersection_examp +@@ -67,7 +67,7 @@ TARGET_LINK_LIBRARIES(intersection_example octomap) ADD_EXECUTABLE(octree2pointcloud octree2pointcloud.cpp) TARGET_LINK_LIBRARIES(octree2pointcloud octomap) diff --git a/math/octomap/pkg-plist b/math/octomap/pkg-plist index b081bb989527..7e3ac711d72a 100644 --- a/math/octomap/pkg-plist +++ b/math/octomap/pkg-plist @@ -46,13 +46,13 @@ include/octomap/octomap_types.h include/octomap/octomap_utils.h lib/libdynamicedt3d.so lib/libdynamicedt3d.so.1.9 -lib/libdynamicedt3d.so.1.9.0 +lib/libdynamicedt3d.so.1.9.1 lib/liboctomap.so lib/liboctomap.so.1.9 -lib/liboctomap.so.1.9.0 +lib/liboctomap.so.1.9.1 lib/liboctomath.so lib/liboctomath.so.1.9 -lib/liboctomath.so.1.9.0 +lib/liboctomath.so.1.9.1 libdata/pkgconfig/dynamicEDT3D.pc libdata/pkgconfig/octomap.pc share/dynamicEDT3D/dynamicEDT3DConfig-version.cmake |