diff --git a/math/py-scs/Makefile b/math/py-scs/Makefile index 87d60dd90608..e1fc8c128ec0 100644 --- a/math/py-scs/Makefile +++ b/math/py-scs/Makefile @@ -1,31 +1,32 @@ PORTNAME= scs -DISTVERSION= 3.2.7 -PORTREVISION= 1 +DISTVERSION= 3.2.9 CATEGORIES= math python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= yuri@FreeBSD.org COMMENT= Splitting conic solver for Python WWW= https://github.com/cvxgrp/scs LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}meson-python>0:devel/meson-python@${PY_FLAVOR} \ ${PYNUMPY} LIB_DEPENDS= libopenblas.so:math/openblas RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.13.2:science/py-scipy@${PY_FLAVOR} USES= python blaslapack:openblas fortran localbase:ldflags pkgconfig # fortran is for openblas USE_PYTHON= pep517 autoplist pytest # 2 tests fail, see https://github.com/cvxgrp/scs/issues/273 CONFIGURE_ENV= BLAS_LAPACK_LIBS="openblas" MAKE_ENV= ${CONFIGURE_ENV} TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} post-install: - @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_scs_*.so + @${STRIP_CMD} \ + ${STAGEDIR}${PYTHON_SITELIBDIR}/scs/_scs_direct${PYTHON_TAG}.so \ + ${STAGEDIR}${PYTHON_SITELIBDIR}/scs/_scs_indirect${PYTHON_TAG}.so .include diff --git a/math/py-scs/distinfo b/math/py-scs/distinfo index 48effb4dbcba..bcb0f972262b 100644 --- a/math/py-scs/distinfo +++ b/math/py-scs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731044167 -SHA256 (scs-3.2.7.tar.gz) = e89d81752ef241d7e408f21d0b69cde9bb6ce196241482e17f763cba5a7d9497 -SIZE (scs-3.2.7.tar.gz) = 1600253 +TIMESTAMP = 1760338342 +SHA256 (scs-3.2.9.tar.gz) = df9542d435d21938ed09494a6c525a9772779902b61300961e16890a2df7f572 +SIZE (scs-3.2.9.tar.gz) = 1690742 diff --git a/math/py-scs/files/patch-pyproject.toml b/math/py-scs/files/patch-pyproject.toml index 7b7980d3fad4..d62e3f0d491b 100644 --- a/math/py-scs/files/patch-pyproject.toml +++ b/math/py-scs/files/patch-pyproject.toml @@ -1,11 +1,11 @@ ---- pyproject.toml.orig 2024-06-20 23:14:01 UTC +--- pyproject.toml.orig 2025-10-12 18:49:35 UTC +++ pyproject.toml @@ -1,7 +1,7 @@ requires = [ [build-system] build-backend = 'mesonpy' requires = [ -- "numpy >= 2.0.0; python_version > '3.8'", -+ "numpy; python_version > '3.8'", - "oldest-supported-numpy; python_version <= '3.8'", +- "numpy >= 2.0.0", ++ "numpy", "meson-python" ] + diff --git a/math/scs/Makefile b/math/scs/Makefile index c2f4c37ecdde..de83a5f6f588 100644 --- a/math/scs/Makefile +++ b/math/scs/Makefile @@ -1,32 +1,31 @@ PORTNAME= scs -DISTVERSION= 3.2.7 -PORTREVISION= 1 +DISTVERSION= 3.2.9 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= Solver of convex cone problems via operator splitting WWW= https://github.com/cvxgrp/scs LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt USES= gmake blaslapack:openblas fortran # fortran is for openblas USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= cvxgrp MAKE_ARGS= BLASLDFLAGS="-lopenblas" ALL_TARGET= default post-install: @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so do-test: cd ${WRKSRC} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} out/demo_socp_indirect && \ out/demo_socp_indirect 50 0.3 0.3 50 && \ ${ECHO} "Test succeeded" .include diff --git a/math/scs/distinfo b/math/scs/distinfo index fcabe78f8b4e..c8b95aa28b52 100644 --- a/math/scs/distinfo +++ b/math/scs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1724601953 -SHA256 (cvxgrp-scs-3.2.7_GH0.tar.gz) = bc8211cfd213f3117676ceb7842f4ed8a3bc7ed9625c4238cc7d83f666e22cc9 -SIZE (cvxgrp-scs-3.2.7_GH0.tar.gz) = 1235001 +TIMESTAMP = 1760338156 +SHA256 (cvxgrp-scs-3.2.9_GH0.tar.gz) = f3d9095fb01fd634d12ccbe6f79ed2acbb7101ad57b723157d44a49cbe187669 +SIZE (cvxgrp-scs-3.2.9_GH0.tar.gz) = 1274849 diff --git a/math/scs/pkg-plist b/math/scs/pkg-plist index 30015425e42e..ef26c0f0a2f2 100644 --- a/math/scs/pkg-plist +++ b/math/scs/pkg-plist @@ -1,17 +1,18 @@ include/scs/aa.h include/scs/cones.h include/scs/ctrlc.h include/scs/glbopts.h include/scs/linalg.h include/scs/linsys.h include/scs/normalize.h include/scs/rw.h include/scs/scs.h include/scs/scs_blas.h include/scs/scs_types.h include/scs/scs_work.h include/scs/util.h +include/scs/util_spectral_cones.h lib/libscsdir.a lib/libscsdir.so lib/libscsindir.a lib/libscsindir.so