From owner-dev-commits-ports-all@freebsd.org Sun May 30 23:33:08 2021 Return-Path: Delivered-To: dev-commits-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 035816396DD; Sun, 30 May 2021 23:33:08 +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 4FtZVC6QMSz4jkZ; Sun, 30 May 2021 23:33:07 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C3EB62566C; Sun, 30 May 2021 23:33:07 +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 14UNX795060258; Sun, 30 May 2021 23:33:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14UNX7Tt060257; Sun, 30 May 2021 23:33:07 GMT (envelope-from git) Date: Sun, 30 May 2021 23:33:07 GMT Message-Id: <202105302333.14UNX7Tt060257@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: 3c89e1ef8f2f - main - science/opensph: Add options, backport relevant fixes 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: 3c89e1ef8f2f315aaf525bc8eb6dac578d801e56 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 May 2021 23:33:08 -0000 The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c89e1ef8f2f315aaf525bc8eb6dac578d801e56 commit 3c89e1ef8f2f315aaf525bc8eb6dac578d801e56 Author: Yuri Victorovich AuthorDate: 2021-05-30 23:31:45 +0000 Commit: Yuri Victorovich CommitDate: 2021-05-30 23:33:05 +0000 science/opensph: Add options, backport relevant fixes --- science/opensph/Makefile | 40 +++++++++++++++++++++++++++++----------- science/opensph/distinfo | 6 +++--- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/science/opensph/Makefile b/science/opensph/Makefile index 489551ead559..eff09363400d 100644 --- a/science/opensph/Makefile +++ b/science/opensph/Makefile @@ -1,5 +1,6 @@ PORTNAME= OpenSPH DISTVERSION= 0.3.4 +PORTREVISION= 1 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org @@ -8,21 +9,19 @@ COMMENT= Library and graphical tools for running SPH and N-body simulations LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libtbb.so:devel/tbb TEST_DEPENDS= catch>0:devel/catch -USES= compiler:c++14-lang eigen:3 qmake qt:5 +USES= compiler:c++14-lang qmake qt:5 USE_GITLAB= yes USE_WX= 3.1 GL_SITE= https://gitlab.com GL_ACCOUNT= sevecekp GL_PROJECT= sph -GL_COMMIT= 3939227cdcbf4e965cfb880b2e5fa3931878317d +GL_COMMIT= 203f460e1462d4323c014aa7d19849f30b769f0f # 0.3.4 + some relevant for port fixes QMAKE_SOURCE_PATH= ${WRKSRC}/sph.pro -QMAKE_ARGS= CONFIG+=release CONFIG+=use_tbb -#QMAKE_ARGS+= CONFIG+=use_vdb # broken, see https://gitlab.com/sevecekp/sph/-/issues/25 +QMAKE_ARGS= CONFIG+=release CXXFLAGS+= -DSPH_CONFIG_SET @@ -32,12 +31,31 @@ BINARY_ALIAS= wx-config=${LOCALBASE}/bin/wxgtk3u-3.1-config PLIST_FILES= bin/opensph bin/opensph-cli bin/opensph-info -post-patch: - @${FIND} ${WRKSRC} -name "*.pro" | ${XARGS} ${REINPLACE_CMD} -e ' \ - s|^target\.path =.*|target\.path = $$$$PREFIX/bin|; \ - s|/usr/include|$$$$PREFIX/include|; \ - s|/usr/lib|$$$$PREFIX/lib| \ - ' +OPTIONS_DEFINE= CHAISCRIPT EIGEN HDF5 OPENMP TBB VDB +OPTIONS_DEFAULT= CHAISCRIPT EIGEN HDF5 OPENMP TBB VDB + +CHAISCRIPT_DESC= Be able to read and modify particle data from a script +CHAISCRIPT_QMAKE_ON= CONFIG+=use_chaiscript +CHAISCRIPT_BUILD_DEPENDS= ${LOCALBASE}/include/chaiscript/chaiscript.hpp:lang/chaiscript + +EIGEN_DESC= Eigen for additional methods to set up initial conditions +EIGEN_USES= eigen:3 + +HDF5_DESC= Be able to read files generated by miluphcuda code +HDF5_QMAKE_ON= CONFIG+=use_hdf5 +HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 + +OPENMP_QMAKE_ON= CONFIG+=use_openmp + +TBB_DESC= Parallelize with Intel Threading Building Blocks +TBB_QMAKE_ON= CONFIG+=use_tbb +TBB_LIB_DEPENDS= libtbb.so:devel/tbb + +VDB_DESC= Use OpenVDB for converting particles to volumetric data +VDB_QMAKE_ON= CONFIG+=use_vdb +VDB_LIB_DEPENDS= libImath.so:math/Imath \ + libopenvdb.so:misc/openvdb \ + libtbb.so:devel/tbb do-test: @${REINPLACE_CMD} -e 's|Path(.*|Path("${TEST_WRKSRC}");|' ${WRKSRC}/test/utils/Config.h diff --git a/science/opensph/distinfo b/science/opensph/distinfo index 973efc21d14f..b563f9836471 100644 --- a/science/opensph/distinfo +++ b/science/opensph/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1622327846 -SHA256 (sevecekp-sph-3939227cdcbf4e965cfb880b2e5fa3931878317d_GL0.tar.gz) = 2748cfdf7f4bf5679be47d0e3aa1c702dd47bc79260d2b877177309e9371a400 -SIZE (sevecekp-sph-3939227cdcbf4e965cfb880b2e5fa3931878317d_GL0.tar.gz) = 26537034 +TIMESTAMP = 1622416501 +SHA256 (sevecekp-sph-203f460e1462d4323c014aa7d19849f30b769f0f_GL0.tar.gz) = 45a596f87f3e5698ff649b18ef076a820a413aedacd0f3130c2a4983a24a1f2e +SIZE (sevecekp-sph-203f460e1462d4323c014aa7d19849f30b769f0f_GL0.tar.gz) = 26537010