git: c1b6219790ae - main - science/siconos: update 4.4.0 → 4.5.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Fri, 02 Aug 2024 05:10:03 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c1b6219790ae375f3a45184baac1d10909116f6e

commit c1b6219790ae375f3a45184baac1d10909116f6e
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-08-02 04:51:53 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-08-02 05:09:50 +0000

    science/siconos: update 4.4.0 → 4.5.0
    
    Reported by:    portscout
---
 science/siconos/Makefile                           | 11 ++--
 science/siconos/distinfo                           |  6 +--
 .../siconos/files/patch-cmake_SiconosSetup.cmake   | 23 +++++---
 science/siconos/pkg-plist                          | 61 ++++++++++++++--------
 4 files changed, 64 insertions(+), 37 deletions(-)

diff --git a/science/siconos/Makefile b/science/siconos/Makefile
index 895b978ad3f4..e6e796cdbed3 100644
--- a/science/siconos/Makefile
+++ b/science/siconos/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	siconos
-DISTVERSION=	4.4.0
-PORTREVISION=	13
+DISTVERSION=	4.5.0
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -14,8 +13,10 @@ BROKEN_i386=		non-constant-expression cannot be narrowed from type 'unsigned int
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		help2man:misc/help2man
-LIB_DEPENDS=	libcxsparse.so:math/suitesparse-cxsparse \
+LIB_DEPENDS=	libBulletCollision.so:devel/bullet \
+		libcxsparse.so:math/suitesparse-cxsparse \
 		libgmp.so:math/gmp \
 		libldl.so:math/suitesparse-ldl \
 		libopenblas.so:math/openblas
@@ -26,6 +27,8 @@ USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DFREEBSD_PYTHON_VER=${PYTHON_VER}
+CMAKE_ON=	CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT SICONOS_SYSTEM_WIDE_INSTALL
+CMAKE_OFF=	WITH_GIT WITH_TESTING
 CMAKE_TESTING_ON=	WITH_TESTING # tests are broken, see https://github.com/siconos/siconos/issues/415
 
 CFLAGS+=	-DCLOCKTIME -DCLOCKS_PER_SEC=128 # workaround for 'Undefined symbol "ftime"', see https://github.com/siconos/siconos/issues/411
@@ -44,6 +47,6 @@ PYTHON_PY_DEPENDS=	${PYNUMPY} \
 PYTHON_BUILD_DEPENDS=	${PYTHON_PY_DEPENDS} \
 			swig:devel/swig
 PYTHON_RUN_DEPENDS=	${PYTHON_PY_DEPENDS}
-PYTHON_BROKEN=		Fails to import, see https://github.com/siconos/siconos/issues/420
+PYTHON_BROKEN=		compilation fails, see https://github.com/siconos/siconos/issues/501
 
 .include <bsd.port.mk>
diff --git a/science/siconos/distinfo b/science/siconos/distinfo
index 7433ee9bece9..cb8b5c008730 100644
--- a/science/siconos/distinfo
+++ b/science/siconos/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632541899
-SHA256 (siconos-siconos-4.4.0_GH0.tar.gz) = 363238d57a32347fce5dd4924d24a0862dbbe48e3887f4b5236aa93d0be0e3e5
-SIZE (siconos-siconos-4.4.0_GH0.tar.gz) = 23919206
+TIMESTAMP = 1722549144
+SHA256 (siconos-siconos-4.5.0_GH0.tar.gz) = 9519d5a73511c557e9e955f0b50b21ba9649d559c5219bf767ee55c3083258bc
+SIZE (siconos-siconos-4.5.0_GH0.tar.gz) = 27348571
diff --git a/science/siconos/files/patch-cmake_SiconosSetup.cmake b/science/siconos/files/patch-cmake_SiconosSetup.cmake
index 4a38d4d966c8..5df140524dc3 100644
--- a/science/siconos/files/patch-cmake_SiconosSetup.cmake
+++ b/science/siconos/files/patch-cmake_SiconosSetup.cmake
@@ -1,16 +1,25 @@
 - fix the python version to be same as in the port
 
---- cmake/SiconosSetup.cmake.orig	2021-04-13 09:54:11 UTC
+--- cmake/SiconosSetup.cmake.orig	2024-08-02 04:37:45 UTC
 +++ cmake/SiconosSetup.cmake
+@@ -21,7 +21,7 @@ include_directories($<BUILD_INTERFACE:${CMAKE_BINARY_D
+ 
+ # Add extra logs about git references(branch name, commit number...)
+ # Useful for documentation and continuous integration
+-find_package(Git)
++#find_package(Git)
+ if(Git_FOUND)
+   execute_process(COMMAND
+     ${GIT_EXECUTABLE} -C ${CMAKE_SOURCE_DIR} rev-parse
 @@ -61,9 +61,9 @@ endif()
  #  --> look for python framework when all other possibilities failed.
- set(Python3_FIND_FRAMEWORK LAST)
+ set(Python_FIND_FRAMEWORK LAST)
  if(WITH_PYTHON_WRAPPER)
--  find_package(Python3 COMPONENTS Development Interpreter NumPy REQUIRED)
-+  find_package(Python3 ${FREEBSD_PYTHON_VER} EXACT COMPONENTS Development Interpreter NumPy REQUIRED)
+-  find_package(Python COMPONENTS Development Interpreter NumPy REQUIRED)
++  find_package(Python ${FREEBSD_PYTHON_VER} EXACT COMPONENTS Development Interpreter NumPy REQUIRED)
  else()
--  find_package(Python3 COMPONENTS Interpreter REQUIRED)
-+  find_package(Python3 ${FREEBSD_PYTHON_VER} EXACT COMPONENTS Interpreter REQUIRED)
+-  find_package(Python COMPONENTS Interpreter REQUIRED)
++  find_package(Python ${FREEBSD_PYTHON_VER} EXACT COMPONENTS Interpreter REQUIRED)
  endif()
  # For backward compat ...
- set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
+ set(PYTHON_EXECUTABLE ${Python_EXECUTABLE})
diff --git a/science/siconos/pkg-plist b/science/siconos/pkg-plist
index a0d0da0a6291..6b74942152f4 100644
--- a/science/siconos/pkg-plist
+++ b/science/siconos/pkg-plist
@@ -73,6 +73,7 @@ include/siconos/kernel/FirstOrderR_helpers.hpp
 include/siconos/kernel/FirstOrderType1R.hpp
 include/siconos/kernel/FirstOrderType2R.hpp
 include/siconos/kernel/FixedBC.hpp
+include/siconos/kernel/FremondImpactFrictionNSL.hpp
 include/siconos/kernel/FrictionContact.hpp
 include/siconos/kernel/GenericMechanical.hpp
 include/siconos/kernel/GlobalFrictionContact.hpp
@@ -189,6 +190,15 @@ include/siconos/kernel/VisitorMaker.hpp
 include/siconos/kernel/ZeroOrderHoldOSI.hpp
 include/siconos/kernel/ioMatrix.hpp
 include/siconos/kernel/ioVector.hpp
+include/siconos/mechanics/BodyShapeRecord.hpp
+include/siconos/mechanics/Bullet1DR.hpp
+include/siconos/mechanics/Bullet2d3DR.hpp
+include/siconos/mechanics/Bullet2dR.hpp
+include/siconos/mechanics/Bullet5DR.hpp
+include/siconos/mechanics/BulletR.hpp
+include/siconos/mechanics/BulletSiconosCommon.hpp
+include/siconos/mechanics/BulletSiconosFwd.hpp
+include/siconos/mechanics/BulletUtils.hpp
 include/siconos/mechanics/Circle.hpp
 include/siconos/mechanics/CircleCircleR.hpp
 include/siconos/mechanics/CircularDS.hpp
@@ -215,6 +225,7 @@ include/siconos/mechanics/PrismaticJointR.hpp
 include/siconos/mechanics/RigidBody2dDS.hpp
 include/siconos/mechanics/RigidBodyDS.hpp
 include/siconos/mechanics/SiconosBodies.hpp
+include/siconos/mechanics/SiconosBulletCollisionManager.hpp
 include/siconos/mechanics/SiconosCollision.hpp
 include/siconos/mechanics/SiconosCollisionManager.hpp
 include/siconos/mechanics/SiconosCollisionQueryResult.hpp
@@ -229,6 +240,7 @@ include/siconos/mechanics/SphereLDSSphereLDSR.hpp
 include/siconos/mechanics/SphereNEDS.hpp
 include/siconos/mechanics/SphereNEDSPlanR.hpp
 include/siconos/mechanics/SphereNEDSSphereNEDSR.hpp
+include/siconos/mechanics/StaticBody.hpp
 include/siconos/numerics/AVI_Solvers.h
 include/siconos/numerics/AVI_cst.h
 include/siconos/numerics/AffineVariationalInequalities.h
@@ -312,8 +324,11 @@ include/siconos/numerics/gfc3d_Gams.h
 include/siconos/numerics/gfc3d_Solvers.h
 include/siconos/numerics/gfc3d_balancing.h
 include/siconos/numerics/gfc3d_compute_error.h
+include/siconos/numerics/gfc3d_ipm.h
 include/siconos/numerics/gfc3d_nonsmooth_Newton_AlartCurnier.h
-include/siconos/numerics/global_rolling_fc_Solvers.h
+include/siconos/numerics/grfc3d_Solvers.h
+include/siconos/numerics/grfc3d_compute_error.h
+include/siconos/numerics/grfc3d_ipm.h
 include/siconos/numerics/hdf5_logger.h
 include/siconos/numerics/io_tools.h
 include/siconos/numerics/lcp_cst.h
@@ -357,34 +372,34 @@ include/siconos/numerics/siconos_debug.h
 include/siconos/numerics/sn_error_handling.h
 include/siconos/numerics/sn_logger.h
 include/siconos/numerics/vertex_extraction.h
-lib/cmake/siconos-4.4.0/BlasLapackUtils.cmake
-lib/cmake/siconos-4.4.0/FindBLASDEV.cmake
-lib/cmake/siconos-4.4.0/FindLAPACKDEV.cmake
-lib/cmake/siconos-4.4.0/FindPythonModule.cmake
-lib/cmake/siconos-4.4.0/SiconosTools.cmake
-lib/cmake/siconos-4.4.0/siconos-config-version.cmake
-lib/cmake/siconos-4.4.0/siconos-config.cmake
-lib/cmake/siconos-4.4.0/siconosTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/siconos-4.4.0/siconosTargets.cmake
-lib/cmake/siconos-4.4.0/valgrind.supp
+lib/cmake/siconos-4.5.0/BlasLapackUtils.cmake
+lib/cmake/siconos-4.5.0/FindBLASDEV.cmake
+lib/cmake/siconos-4.5.0/FindLAPACKDEV.cmake
+lib/cmake/siconos-4.5.0/FindPythonModule.cmake
+lib/cmake/siconos-4.5.0/SiconosTools.cmake
+lib/cmake/siconos-4.5.0/siconos-config-version.cmake
+lib/cmake/siconos-4.5.0/siconos-config.cmake
+lib/cmake/siconos-4.5.0/siconosTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/siconos-4.5.0/siconosTargets.cmake
+lib/cmake/siconos-4.5.0/valgrind.supp
 lib/libsiconos_control.so
-lib/libsiconos_control.so.6
-lib/libsiconos_control.so.6.0.0
+lib/libsiconos_control.so.7
+lib/libsiconos_control.so.7.0.0
 lib/libsiconos_externals.so
-lib/libsiconos_externals.so.6
-lib/libsiconos_externals.so.6.0.0
+lib/libsiconos_externals.so.7
+lib/libsiconos_externals.so.7.0.0
 lib/libsiconos_io.so
-lib/libsiconos_io.so.6
-lib/libsiconos_io.so.6.0.0
+lib/libsiconos_io.so.7
+lib/libsiconos_io.so.7.0.0
 lib/libsiconos_kernel.so
-lib/libsiconos_kernel.so.6
-lib/libsiconos_kernel.so.6.0.0
+lib/libsiconos_kernel.so.7
+lib/libsiconos_kernel.so.7.0.0
 lib/libsiconos_mechanics.so
-lib/libsiconos_mechanics.so.6
-lib/libsiconos_mechanics.so.6.0.0
+lib/libsiconos_mechanics.so.7
+lib/libsiconos_mechanics.so.7.0.0
 lib/libsiconos_numerics.so
-lib/libsiconos_numerics.so.6
-lib/libsiconos_numerics.so.6.0.0
+lib/libsiconos_numerics.so.7
+lib/libsiconos_numerics.so.7.0.0
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/siconos/_kernel.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/siconos/_numerics.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/siconos/control/_controller.so