math/octomap: Update 1.9.0 -> 1.9.1

Reported by:	portscout
This commit is contained in:
Yuri Victorovich 2019-11-24 18:56:27 +00:00
parent 1f262a1a34
commit 60e55aa262
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=518349
4 changed files with 14 additions and 13 deletions

View file

@ -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

View file

@ -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

View file

@ -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)

View file

@ -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