From nobody Tue May 31 09:01:29 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 9B84C1B57DE2; Tue, 31 May 2022 09:01:30 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LC5qZ244nz4lyD; Tue, 31 May 2022 09:01:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653987690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/e7JL2AR5Eohhwx5eEVA2h1JXZ5/yU/ZXi7YjgGJ90o=; b=dy3/AyMsFvs3BfC26xbp2crU5Bzuk9TPQQxgItnr2BRXM5Xep309Lwc0RRCQ5KVFe4eOsE QH5J/57ymlxmBW8+RXDzmR69KcWJdP0ImNeeGgUp9fGOSwBOA16y04DTMuaLVjfgx9RXyq z8a5+czjdb2LKyuXqtntc7Q0Q/Io/BPni2N0AT7HxF/ra2OavZuQsmgCGPpSO8MnGs75y2 mrSUZ4RctBCiu77H090N9vGeICYbGdviPfHYy3+IJFIUOk1+e2x/lfUAN48R+2aVFSBBLB JbTi5uwLcaLpzt/Cw2Qq9HcqIBVUhROHQ/Le3S7nq2RkSsYHD6/+6Qm1SK9o6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F00B699A; Tue, 31 May 2022 09:01:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24V91TX5061604; Tue, 31 May 2022 09:01:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24V91T0B061603; Tue, 31 May 2022 09:01:29 GMT (envelope-from git) Date: Tue, 31 May 2022 09:01:29 GMT Message-Id: <202205310901.24V91T0B061603@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 2fe85bfe92a9 - main - math/octomap: Update 1.9.7 -> 1.9.8 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2fe85bfe92a9754967115cb0b987c34c702967d7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653987690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/e7JL2AR5Eohhwx5eEVA2h1JXZ5/yU/ZXi7YjgGJ90o=; b=srVqE37NVgJvkumxczOlE/4jpupICuPQ7kJeUo2OEJQXxaXW/xWx+jS++N9qVZU1uNMjdx k4pSlStuXHg6Sjp5UsznPoFwvxHY8glLu2POUtJioCX1G4TJkFgyZy69dERKtlUUz4Max+ UmuM9pYzc2REyffhHOAQigzeBy1BV3gegz+cwpCvk0/QiiLQcZZYsgtOROjQ+YBbo/JHhG i30GbZgIPqGahzs8Qs/WJLhghe5g4PAlIvPzPTLX56iIDTG774H7q/brVumLo09nuMvd4O NqgGgfkqlNl+JAKuwpnZg/UlZ5PlZTE3ApbFUaxFRrNe/5FmQQ7eBHvitZPLGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653987690; a=rsa-sha256; cv=none; b=VM4rrSjy6wZ1LkO8vTgwYeQ3Q4GvobWN3HzYDwNOed2hfPoUYzHKqRjqu33qLfvcyGqyPD Q+B/uUlOyCyhK0YOcIH6rirQ6IiGcc8mrzYjhK70DPP7bkAn5MPmVTvGkUWOEsCqASJ7Zo ulE4PGEI0BZiOpuRvI+M8pLqFfxccoLM9GlnVh4aldxBayMx35kp9GU3qvB6+E79RuPguL JwqcH1YfC+WrvxPtDgmkFenC4abZ5IhuAg9JvRnxdWBoAoa8jlAHjRXxJTvL6RLb/FFWKD hFvlpOr8TPoXfq7g8TvO8cxJSIKf5lirIYkpZ4CBHwUw/3NovA5v0YqnVEghYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=2fe85bfe92a9754967115cb0b987c34c702967d7 commit 2fe85bfe92a9754967115cb0b987c34c702967d7 Author: Yuri Victorovich AuthorDate: 2022-05-31 07:50:03 +0000 Commit: Yuri Victorovich CommitDate: 2022-05-31 09:01:22 +0000 math/octomap: Update 1.9.7 -> 1.9.8 --- math/octomap/Makefile | 10 ++++----- math/octomap/distinfo | 6 +++--- .../files/patch-dynamicEDT3D_src_CMakeLists.txt | 6 +++--- .../octomap/files/patch-octomap_src_CMakeLists.txt | 4 ++-- .../files/patch-octomap_src_math_CMakeLists.txt | 8 ++++---- .../files/patch-octovis_CMakeLists__src.txt | 24 +++++++++++++++------- math/octomap/pkg-plist | 8 ++++---- 7 files changed, 38 insertions(+), 28 deletions(-) diff --git a/math/octomap/Makefile b/math/octomap/Makefile index dbec3e54ec0b..223a55bcf127 100644 --- a/math/octomap/Makefile +++ b/math/octomap/Makefile @@ -1,7 +1,6 @@ PORTNAME= octomap DISTVERSIONPREFIX= v -DISTVERSION= 1.9.7 -PORTREVISION= 1 +DISTVERSION= 1.9.8 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org @@ -14,13 +13,14 @@ LICENSE_FILE_GPLv2= ${WRKSRC}/octovis/LICENSE.txt LIB_DEPENDS= libQGLViewer-qt5.so:graphics/libQGLViewer -USES= cmake compiler:c++11-lang localbase:ldflags gl qt:5 -USE_GITHUB= yes -GH_ACCOUNT= OctoMap +USES= cmake:testing compiler:c++11-lang localbase:ldflags gl qt:5 USE_QT= core gui opengl xml widgets buildtools_build qmake_build USE_GL= gl glu USE_LDCONFIG= yes +USE_GITHUB= yes +GH_ACCOUNT= OctoMap + # Viewer is broken: https://github.com/OctoMap/octomap/issues/224, and libQGLViewer detection is broken: https://github.com/OctoMap/octomap/issues/225 #CMAKE_ON= OCTOVIS_QT5 CMAKE_ARGS= -DQGLVIEWER_BASE_DIR:PATH=${LOCALBASE}/include/QGLViewer #-DQGLViewer_LIBRARY_DIR_OTHER:PATH=${LOCALBASE}/lib diff --git a/math/octomap/distinfo b/math/octomap/distinfo index 20e1d0b22471..7def9824dee2 100644 --- a/math/octomap/distinfo +++ b/math/octomap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1620605016 -SHA256 (OctoMap-octomap-v1.9.7_GH0.tar.gz) = 3e9ac020686ceb4e17e161bffc5a0dafd9cccab33adeb9adee59a61c418ea1c1 -SIZE (OctoMap-octomap-v1.9.7_GH0.tar.gz) = 1684088 +TIMESTAMP = 1653983015 +SHA256 (OctoMap-octomap-v1.9.8_GH0.tar.gz) = 417af6da4e855e9a83b93458aa98b01a2c88f880088baad2b59d323ce162586e +SIZE (OctoMap-octomap-v1.9.8_GH0.tar.gz) = 1693311 diff --git a/math/octomap/files/patch-dynamicEDT3D_src_CMakeLists.txt b/math/octomap/files/patch-dynamicEDT3D_src_CMakeLists.txt index b1d079bf3ab1..000e1a04e2d1 100644 --- a/math/octomap/files/patch-dynamicEDT3D_src_CMakeLists.txt +++ b/math/octomap/files/patch-dynamicEDT3D_src_CMakeLists.txt @@ -1,6 +1,6 @@ ---- dynamicEDT3D/src/CMakeLists.txt.orig 2018-11-20 06:37:53 UTC +--- dynamicEDT3D/src/CMakeLists.txt.orig 2022-05-12 20:49:09 UTC +++ dynamicEDT3D/src/CMakeLists.txt -@@ -9,28 +9,28 @@ set_target_properties(dynamicedt3d PROPE +@@ -9,28 +9,28 @@ set_target_properties(dynamicedt3d PROPERTIES ) target_link_libraries(dynamicedt3d ${OCTOMAP_LIBRARIES}) @@ -33,5 +33,5 @@ -install(TARGETS dynamicedt3d dynamicedt3d-static +install(TARGETS dynamicedt3d EXPORT dynamicEDT3DTargets - INCLUDES DESTINATION include + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ${INSTALL_TARGETS_DEFAULT_ARGS} diff --git a/math/octomap/files/patch-octomap_src_CMakeLists.txt b/math/octomap/files/patch-octomap_src_CMakeLists.txt index 0dab6634c922..285dc6b7c31c 100644 --- a/math/octomap/files/patch-octomap_src_CMakeLists.txt +++ b/math/octomap/files/patch-octomap_src_CMakeLists.txt @@ -1,4 +1,4 @@ ---- octomap/src/CMakeLists.txt.orig 2019-11-23 20:56:23 UTC +--- octomap/src/CMakeLists.txt.orig 2022-05-12 20:49:09 UTC +++ octomap/src/CMakeLists.txt @@ -16,9 +16,9 @@ set_target_properties( octomap PROPERTIES VERSION ${OCTOMAP_VERSION} @@ -29,5 +29,5 @@ -install(TARGETS octomap octomap-static +install(TARGETS octomap EXPORT octomap-targets - INCLUDES DESTINATION include + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ${INSTALL_TARGETS_DEFAULT_ARGS} diff --git a/math/octomap/files/patch-octomap_src_math_CMakeLists.txt b/math/octomap/files/patch-octomap_src_math_CMakeLists.txt index ef05b4b2c385..4f3613a33ea6 100644 --- a/math/octomap/files/patch-octomap_src_math_CMakeLists.txt +++ b/math/octomap/files/patch-octomap_src_math_CMakeLists.txt @@ -1,8 +1,8 @@ ---- octomap/src/math/CMakeLists.txt.orig 2018-11-20 06:36:08 UTC +--- octomap/src/math/CMakeLists.txt.orig 2022-05-12 20:49:09 UTC +++ octomap/src/math/CMakeLists.txt -@@ -14,17 +14,17 @@ SET_TARGET_PROPERTIES( octomath PROPERTI +@@ -12,17 +12,17 @@ SET_TARGET_PROPERTIES( octomath PROPERTIES + SOVERSION ${OCTOMAP_SOVERSION} ) - # INSTALL_NAME_DIR seems to be necessary for MacOS X -ADD_LIBRARY( octomath-static STATIC ${octomath_SRCS}) -SET_TARGET_PROPERTIES(octomath-static PROPERTIES OUTPUT_NAME "octomath") @@ -20,5 +20,5 @@ -install(TARGETS octomath octomath-static +install(TARGETS octomath EXPORT octomap-targets - INCLUDES DESTINATION include + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ${INSTALL_TARGETS_DEFAULT_ARGS} diff --git a/math/octomap/files/patch-octovis_CMakeLists__src.txt b/math/octomap/files/patch-octovis_CMakeLists__src.txt index 2f45d787664f..f3014c571154 100644 --- a/math/octomap/files/patch-octovis_CMakeLists__src.txt +++ b/math/octomap/files/patch-octovis_CMakeLists__src.txt @@ -1,19 +1,29 @@ ---- octovis/CMakeLists_src.txt.orig 2018-11-20 06:29:27 UTC +--- octovis/CMakeLists_src.txt.orig 2022-05-12 20:49:09 UTC +++ octovis/CMakeLists_src.txt -@@ -99,9 +99,9 @@ include_directories(${CMAKE_CURRENT_BINA +@@ -99,14 +99,14 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAK # Library target -add_library(octovis-static STATIC ${viewerlib_SRCS}) --target_link_libraries(octovis-static) +-target_link_libraries(octovis-static +- ${OPENGL_gl_LIBRARY} +- ${OPENGL_glu_LIBRARY} +- ${OCTOMAP_LIBRARIES} +- ${QGLViewer_LIBRARIES} +-) -set_target_properties(octovis-static PROPERTIES OUTPUT_NAME octovis) +#add_library(octovis-static STATIC ${viewerlib_SRCS}) -+#target_link_libraries(octovis-static) ++#target_link_libraries(octovis-static ++# ${OPENGL_gl_LIBRARY} ++# ${OPENGL_glu_LIBRARY} ++# ${OCTOMAP_LIBRARIES} ++# ${QGLViewer_LIBRARIES} ++#) +#set_target_properties(octovis-static PROPERTIES OUTPUT_NAME octovis) add_library(octovis-shared SHARED ${viewerlib_SRCS}) target_link_libraries(octovis-shared -@@ -119,7 +119,7 @@ set_target_properties(octovis-shared PRO +@@ -124,7 +124,7 @@ set_target_properties(octovis-shared PROPERTIES # directly depend on the octomap library target when building the # complete distribution, so it is recompiled as needed if (CMAKE_PROJECT_NAME STREQUAL "octomap-distribution") @@ -22,7 +32,7 @@ ADD_DEPENDENCIES(octovis-shared octomap) endif() -@@ -146,10 +146,10 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DI +@@ -151,10 +151,10 @@ if(NOT EXISTS "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake file(MAKE_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/cmake/octovis") endif() @@ -33,5 +43,5 @@ -install(TARGETS octovis octovis-static octovis-shared +install(TARGETS octovis octovis-shared EXPORT octovis-targets - INCLUDES DESTINATION include + INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ${INSTALL_TARGETS_DEFAULT_ARGS} diff --git a/math/octomap/pkg-plist b/math/octomap/pkg-plist index 765af73a32ba..d505f617bf4c 100644 --- a/math/octomap/pkg-plist +++ b/math/octomap/pkg-plist @@ -54,16 +54,16 @@ include/octovis/SelectionBox.h include/octovis/TrajectoryDrawer.h lib/libdynamicedt3d.so lib/libdynamicedt3d.so.1.9 -lib/libdynamicedt3d.so.1.9.7 +lib/libdynamicedt3d.so.1.9.8 lib/liboctomap.so lib/liboctomap.so.1.9 -lib/liboctomap.so.1.9.7 +lib/liboctomap.so.1.9.8 lib/liboctomath.so lib/liboctomath.so.1.9 -lib/liboctomath.so.1.9.7 +lib/liboctomath.so.1.9.8 lib/liboctovis.so lib/liboctovis.so.1.9 -lib/liboctovis.so.1.9.7 +lib/liboctovis.so.1.9.8 libdata/pkgconfig/dynamicEDT3D.pc libdata/pkgconfig/octomap.pc share/ament_index/resource_index/packages/dynamicEDT3D