From nobody Sun May 5 15:48:36 2024 X-Original-To: dev-commits-ports-main@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 4VXTTw4Nlgz5K9mr; Sun, 05 May 2024 15:48:36 +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 4VXTTw3bq1z4tG0; Sun, 5 May 2024 15:48:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714924116; 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=pOrT2smgMc02RT0yNgoaYC/WevkyzfNtUC5G5MlY84c=; b=ibHCsq2qrUGw2cxsGLiT9quNDGhdWg4MoCwtjJsn9ig/woOwpeqLQoAC5KWxeqKh+9THTF s8H5XwKqa9301I3e4N2AjHwYVZnWGCJXf5nTsiu0S1Qa42Gq4VmOJbdEJO2+yOxi+mCqsn WCh45/86ZztUIVqDHvjX/RVX0qgTrhwhbrY2x38W8iEwCgwyDwumMMOveGgyONMPMv8Z02 UQxP+SvgX7GZru2CBSqTIcEXv2p8klK2+zLrfsZoWW1uv/WOxTb5PrBYqTX+k+ZLbYLsGy 8DBI/z/lGe1Issdo1yW3IIUQ0jfWh/4pbQar0U7AUt0al71uQbgEvE4OBEOBdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714924116; a=rsa-sha256; cv=none; b=fBrugcdUVuoRBGTgtbif2I3uwEGZ7C7UUgYswSihk9YjSttOIl/TlzMYDC20/t0fCKv4dN KEk8e9pePfqjQpitbkBLPAcgwSUFmjsg8w8TQ8r7CafeVLTzw7EihVTKcV/6FZK3OLCswB bQis/iO0PDZ9S7oG07TqchydUSqe+l2q8eOe5MLQFCyXVxG9LA/WK/u8XNbhy2z2SQR+a4 ZVithA4QI3b23sjOqesjZTw8WKGLez7jIWWpwLmz760FYPZuRD3q20Dt2/tqxadwMiRIGI Yq6OH5C5eLHHlKa0V+f8lJx+cZEaxZSo/8i/EVMfb8VRFg56BUBO3kJZkzw14w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714924116; 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=pOrT2smgMc02RT0yNgoaYC/WevkyzfNtUC5G5MlY84c=; b=n5Gu3ogJa1ja3Oo1zHjipd2Ccd447A6xPC8L7moJzznAIEqphWaG8NFF4wknJ9b6KRPEDJ 0cFMaxrfyEuw98sBn3Svp3MbzygqSuwF/QMdBVIpFDeVaArDrFBmrHo8ZhysVNP8pZURKw Lla/yalXbzXCrYpB3+8shVa1yBLvosxUyXtV5QCC3p5PqeQTDgmTssL79AbBXI4hDyE4c+ N4TFIVeal1L9qk+DjNMa2qdyW6OKjHzS5/Gq585cc/KuuaVDyWWdskaYZdM5JiVpiuCgw4 ByrflXS0zH1HDPKnRKB6IJuPzwu+NoF8xJcML1zqxwqINFTlFr/UGt2pgfaRrA== 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 4VXTTw3BxszJp6; Sun, 5 May 2024 15:48:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 445Fma4o030021; Sun, 5 May 2024 15:48:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 445FmaZv030018; Sun, 5 May 2024 15:48:36 GMT (envelope-from git) Date: Sun, 5 May 2024 15:48:36 GMT Message-Id: <202405051548.445FmaZv030018@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: c802e5200519 - main - math/{,py-}topologic: update 0.6.0 =?utf-8?Q?=E2=86=92?= 6.0.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: c802e52005198bd71ba7f5d177cdd5bf2672d235 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=c802e52005198bd71ba7f5d177cdd5bf2672d235 commit c802e52005198bd71ba7f5d177cdd5bf2672d235 Author: Yuri Victorovich AuthorDate: 2024-05-05 15:07:17 +0000 Commit: Yuri Victorovich CommitDate: 2024-05-05 15:48:31 +0000 math/{,py-}topologic: update 0.6.0 → 6.0.2 Reported by: portscout --- math/py-topologic/Makefile | 26 +++++++++------ math/py-topologic/distinfo | 6 ++-- math/py-topologic/files/patch-CMakeLists.txt | 38 ++++++++++++++++++++++ math/topologic/Makefile | 9 +++-- math/topologic/distinfo | 6 ++-- math/topologic/files/patch-CMakeLists.txt | 7 ++++ .../files/patch-TopologicCore_CMakeLists.txt | 18 ---------- math/topologic/pkg-plist | 8 ++--- 8 files changed, 75 insertions(+), 43 deletions(-) diff --git a/math/py-topologic/Makefile b/math/py-topologic/Makefile index b0d03f7b23ed..c0120d79b79b 100644 --- a/math/py-topologic/Makefile +++ b/math/py-topologic/Makefile @@ -1,7 +1,6 @@ PORTNAME= topologic DISTVERSIONPREFIX= v -DISTVERSION= 0.6.0 -PORTREVISION= 3 +DISTVERSION= 6.0.2 CATEGORIES= math PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= -space-modeling-library @@ -13,8 +12,8 @@ WWW= https://topologic.app/ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/../LICENSE -LIB_DEPENDS= libTopologicCore.so:math/topologic \ - libTKernel.so:cad/opencascade +BUILD_DEPENDS= pybind11>0:devel/pybind11 +LIB_DEPENDS= libTopologicCore.so:math/topologic USES= cmake compiler:c++17-lang localbase:ldflags python @@ -22,17 +21,24 @@ USE_GITHUB= yes GH_ACCOUNT= wassimj GH_PROJECT= Topologic -WRKSRC_SUBDIR= Python-Bindings +WRKSRC_SUBDIR= TopologicPythonBindings -CXXFLAGS+= -I${LOCALBASE}/include/OpenCASCADE +CXXFLAGS+= -I${LOCALBASE}/include/OpenCASCADE \ + -I${LOCALBASE}/include/TopologicCore +LDFLAGS+= -L${LOCALBASE}/lib/TopologicCore -PLIST_FILES= ${PYTHON_SITELIBDIR}/topologic${PYTHON_EXT_SUFFIX}.so +PLIST_FILES= ${PYTHON_SITELIBDIR}/topologic_core${PYTHON_EXT_SUFFIX}.so + +TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} do-install: # workaround for https://github.com/wassimj/Topologic/issues/34 ${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} - ${INSTALL_LIB} ${BUILD_WRKSRC}/topologic${PYTHON_EXT_SUFFIX}.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + ${INSTALL_LIB} ${BUILD_WRKSRC}/topologic_core${PYTHON_EXT_SUFFIX}.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -do-test: install - ${PYTHON_CMD} ${WRKSRC}/test/topologictest01.py +do-test: +.for tst in topologictest01 topologictest02 + ${ECHO} "====> Running test ${tst}" + ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${WRKSRC}/test/${tst}.py +.endfor .include diff --git a/math/py-topologic/distinfo b/math/py-topologic/distinfo index 3350d9e594fe..c332b42ebe53 100644 --- a/math/py-topologic/distinfo +++ b/math/py-topologic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1650340528 -SHA256 (wassimj-Topologic-v0.6.0_GH0.tar.gz) = 48f7f96c9d1552aa8bc1cf3336c0713aa8c1db3e42842a982e4748756d4107c9 -SIZE (wassimj-Topologic-v0.6.0_GH0.tar.gz) = 3848281 +TIMESTAMP = 1714893793 +SHA256 (wassimj-Topologic-v6.0.2_GH0.tar.gz) = 5a56c4847879e43d82e28db4d7f113e68d0f19bd9532aefcebeb6df92441058f +SIZE (wassimj-Topologic-v6.0.2_GH0.tar.gz) = 274112 diff --git a/math/py-topologic/files/patch-CMakeLists.txt b/math/py-topologic/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..15cf231be73b --- /dev/null +++ b/math/py-topologic/files/patch-CMakeLists.txt @@ -0,0 +1,38 @@ +--- CMakeLists.txt.orig 2024-05-04 20:00:40 UTC ++++ CMakeLists.txt +@@ -4,9 +4,7 @@ set(PROJECT_NAMESPACE Topologic) + set(PROJECT_NAMESPACE Topologic) + + +-# Import pybind11 +-set(PYBIND11_FINDPYTHON ON) +-add_subdirectory(pybind11) ++find_Package(pybind11 REQUIRED) + + + # Source groups +@@ -50,12 +48,14 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${P + target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR}/include) + + # Import TopologicCore from parent dir when not building from global project ++if (FALSE) + if(NOT TARGET ${PROJECT_NAMESPACE}::TopologicCore) + add_subdirectory(${PROJECT_SOURCE_DIR}/../TopologicCore ${PROJECT_BINARY_DIR}/TopologicCore) + endif() ++endif() + + # Dependency: TopologicCore +-target_link_libraries(${PROJECT_NAME} PRIVATE ${PROJECT_NAMESPACE}::TopologicCore) ++target_link_libraries(${PROJECT_NAME} PRIVATE TopologicCore) + + + # install definitions +@@ -66,7 +66,7 @@ install(TARGETS ${PROJECT_NAME} + + # set install rpaths to origin if TopologicCore is built as a shared lib + # in this case TopologicCore is expected to be copied into the TopologicPythonBindings install dir post-install +-get_property(TopologicCore_TARGET_TYPE TARGET TopologicCore PROPERTY TYPE) ++set(TopologicCore_TARGET_TYPE SHARED_LIBRARY) + if (${TopologicCore_TARGET_TYPE} STREQUAL SHARED_LIBRARY) + if(NOT CMAKE_INSTALL_RPATH) + if(NOT APPLE) diff --git a/math/topologic/Makefile b/math/topologic/Makefile index 215e91921fa6..12ebcf6e5c84 100644 --- a/math/topologic/Makefile +++ b/math/topologic/Makefile @@ -1,8 +1,6 @@ PORTNAME= topologic DISTVERSIONPREFIX= v -DISTVERSION= 0.6.0-3 -PORTREVISION= 2 -DISTVERSIONSUFFIX= -gdbddce9 +DISTVERSION= 6.0.2 CATEGORIES= math PKGNAMESUFFIX= -space-modeling-library @@ -13,11 +11,12 @@ WWW= https://topologic.app/ LICENSE= AGPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libTKernel.so:cad/opencascade \ +LIB_DEPENDS= libtbb.so:devel/onetbb \ + libTKernel.so:cad/opencascade \ libuuid.so:misc/e2fsprogs-libuuid USES= cmake compiler:c++14-lang localbase:ldflags -USE_LDCONFIG= yes +USE_LDCONFIG= ${PREFIX}/lib/TopologicCore USE_GITHUB= yes GH_ACCOUNT= wassimj diff --git a/math/topologic/distinfo b/math/topologic/distinfo index f0e003b311c1..35490e0ff7b1 100644 --- a/math/topologic/distinfo +++ b/math/topologic/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1668894036 -SHA256 (wassimj-Topologic-v0.6.0-3-gdbddce9_GH0.tar.gz) = fc974cde5d036d38b80dfe199bd8f04c02b2ee73478a5a4fdcc6662c23b5490b -SIZE (wassimj-Topologic-v0.6.0-3-gdbddce9_GH0.tar.gz) = 3848416 +TIMESTAMP = 1714892488 +SHA256 (wassimj-Topologic-v6.0.2_GH0.tar.gz) = 5a56c4847879e43d82e28db4d7f113e68d0f19bd9532aefcebeb6df92441058f +SIZE (wassimj-Topologic-v6.0.2_GH0.tar.gz) = 274112 diff --git a/math/topologic/files/patch-CMakeLists.txt b/math/topologic/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..5f2b6955a614 --- /dev/null +++ b/math/topologic/files/patch-CMakeLists.txt @@ -0,0 +1,7 @@ +--- CMakeLists.txt.orig 2024-05-05 07:06:42 UTC ++++ CMakeLists.txt +@@ -12,4 +12,3 @@ add_subdirectory(TopologicCore) + + # Sub-projects + add_subdirectory(TopologicCore) +-add_subdirectory(TopologicPythonBindings) diff --git a/math/topologic/files/patch-TopologicCore_CMakeLists.txt b/math/topologic/files/patch-TopologicCore_CMakeLists.txt deleted file mode 100644 index 5f694111c83a..000000000000 --- a/math/topologic/files/patch-TopologicCore_CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ ---- TopologicCore/CMakeLists.txt.orig 2022-01-30 22:24:17 UTC -+++ TopologicCore/CMakeLists.txt -@@ -378,6 +378,7 @@ endif() - ################################################################################ - # Post build events - ################################################################################ -+if (FALSE) - if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Any CPU") - add_custom_command_if( - TARGET ${PROJECT_NAME} -@@ -414,6 +415,7 @@ elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x86") - COMMANDS - COMMAND $ copy "$references\\opencascade-7.4.0\\win32\\vc14\\bin\\*.dll" "$output\\${CMAKE_VS_PLATFORM_NAME}\\$" - ) -+endif() - endif() - - ################################################################################ diff --git a/math/topologic/pkg-plist b/math/topologic/pkg-plist index dbdec39b1e79..01157daff640 100644 --- a/math/topologic/pkg-plist +++ b/math/topologic/pkg-plist @@ -20,7 +20,6 @@ include/TopologicCore/EdgeFactory.h include/TopologicCore/Face.h include/TopologicCore/FaceFactory.h include/TopologicCore/Geometry.h -include/TopologicCore/GlobalCluster.h include/TopologicCore/Graph.h include/TopologicCore/InstanceGUIDManager.h include/TopologicCore/IntAttribute.h @@ -42,6 +41,7 @@ include/TopologicCore/Utilities/CellUtility.h include/TopologicCore/Utilities/Direction.h include/TopologicCore/Utilities/EdgeUtility.h include/TopologicCore/Utilities/FaceUtility.h +include/TopologicCore/Utilities/Guid.h include/TopologicCore/Utilities/ShellUtility.h include/TopologicCore/Utilities/TopologyUtility.h include/TopologicCore/Utilities/TransformationMatrix2D.h @@ -52,6 +52,6 @@ include/TopologicCore/Vertex.h include/TopologicCore/VertexFactory.h include/TopologicCore/Wire.h include/TopologicCore/WireFactory.h -lib/libTopologicCore.so -lib/libTopologicCore.so.0 -lib/libTopologicCore.so.0.0.0 +lib/TopologicCore/libTopologicCore.so +lib/TopologicCore/libTopologicCore.so.6 +lib/TopologicCore/libTopologicCore.so.6.0.0