From 31399521db0d65222475b5847d143479be9bd382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 30 Mar 2022 08:57:55 -0300 Subject: [PATCH 1/4] SuiteSparse: update to 5.12.0. --- .../patches/skip-demo-on-build.patch | 22 +++++++++++++++++++ srcpkgs/SuiteSparse/template | 7 +++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch diff --git a/srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch b/srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch new file mode 100644 index 000000000000..9ec775229ed6 --- /dev/null +++ b/srcpkgs/SuiteSparse/patches/skip-demo-on-build.patch @@ -0,0 +1,22 @@ +This is to avoid running demos on `make install`, which break cross compile + +--- a/Makefile ++++ b/Makefile +@@ -294,7 +294,7 @@ endif + # just compile GraphBLAS + gb: + echo $(CMAKE_OPTIONS) +- ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) ++ ( cd GraphBLAS && $(MAKE) JOBS=$(JOBS) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) + + # compile and install GraphBLAS libgraphblas_renamed, for MATLAB + gbrenamed: +@@ -309,7 +309,7 @@ gbrenamed: + + # just compile Mongoose + mon: +- ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' ) ++ ( cd Mongoose && $(MAKE) CMAKE_OPTIONS='$(CMAKE_OPTIONS)' library ) + + # compile and install Mongoose + moninstall: mon diff --git a/srcpkgs/SuiteSparse/template b/srcpkgs/SuiteSparse/template index ab5c829e3ab7..b304dfc8f786 100644 --- a/srcpkgs/SuiteSparse/template +++ b/srcpkgs/SuiteSparse/template @@ -1,7 +1,7 @@ # Template file for 'SuiteSparse' pkgname=SuiteSparse -version=5.10.1 -revision=2 +version=5.12.0 +revision=1 # XXX: re-enable TBB=-ltbb -DSPQR_CONFIG=-DHAVE_TBB when updating, if possible make_build_args="BLAS=-lblas LAPACK=-llapack" hostmakedepends="cmake chrpath" @@ -10,8 +10,9 @@ short_desc="Suite of sparse matrix software" maintainer="Gonzalo Tornaría " license="custom:multiple" homepage="https://people.engr.tamu.edu/davis/suitesparse.html" +changelog="https://raw.githubusercontent.com/DrTimothyAldenDavis/SuiteSparse/master/ChangeLog" distfiles="https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/refs/tags/v${version}.tar.gz" -checksum=acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee +checksum=5fb0064a3398111976f30c5908a8c0b40df44c6dd8f0cc4bfa7b9e45d8c647de do_build() { make config library $make_build_args JOBS=$XBPS_MAKEJOBS From 449f42ac5cd2abe38739fe79b5985dbf0ca5dbdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 30 Mar 2022 09:25:55 -0300 Subject: [PATCH 2/4] igraph: update to 0.9.8. --- srcpkgs/igraph/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/igraph/template b/srcpkgs/igraph/template index f131886aae63..983de0006d3b 100644 --- a/srcpkgs/igraph/template +++ b/srcpkgs/igraph/template @@ -1,6 +1,6 @@ # Template file for 'igraph' pkgname=igraph -version=0.9.6 +version=0.9.8 revision=1 build_style=cmake configure_args="-DIGRAPH_ENABLE_TLS=on -DIGRAPH_ENABLE_LTO=on -DBUILD_SHARED_LIBS=ON" @@ -12,7 +12,7 @@ license="GPL-2.0-or-later" homepage="https://igraph.org/c/" changelog="https://raw.githubusercontent.com/igraph/igraph/master/CHANGELOG.md" distfiles="https://github.com/igraph/igraph/releases/download/${version}/igraph-${version}.tar.gz" -checksum=7c299ec54eecfe413758c332a42c4cb71d02d2951b2ac232584d317c5792f387 +checksum=f9a83473cea3e037b605b79b336be656b00dcf3037b233b4b250bd9270f36397 igraph-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From aa25f7706335fb11d883a7c0384fb3d4826994ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 30 Mar 2022 09:39:35 -0300 Subject: [PATCH 3/4] planarity: update to 3.0.2.0. --- srcpkgs/planarity/template | 4 ++-- srcpkgs/planarity/update | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/srcpkgs/planarity/template b/srcpkgs/planarity/template index aab5ce4a08fc..fe5d9e08c9f9 100644 --- a/srcpkgs/planarity/template +++ b/srcpkgs/planarity/template @@ -1,6 +1,6 @@ # Template file for 'planarity' pkgname=planarity -version=3.0.1.1 +version=3.0.2.0 revision=1 build_style=gnu-configure short_desc="Graph algorithms for planar embedding and related algorithms" @@ -8,7 +8,7 @@ maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://github.com/graph-algorithms/edge-addition-planarity-suite/" distfiles="https://github.com/graph-algorithms/edge-addition-planarity-suite/releases/download/Version_${version}/planarity-${version}.tar.gz" -checksum=50b686fce6e67ba3a4d0634632c16566539a95d7e51afd066f6b1d5ae0eab284 +checksum=b4897df8f323e660197242e0aa273a542a59782cad783d7334111a9ad49b9e08 post_install() { vlicense LICENSE.TXT diff --git a/srcpkgs/planarity/update b/srcpkgs/planarity/update index 315139e84f6e..3dffcc02a424 100644 --- a/srcpkgs/planarity/update +++ b/srcpkgs/planarity/update @@ -1 +1,2 @@ site=https://github.com/graph-algorithms/edge-addition-planarity-suite/releases +ignore=*.WindowsExe From d41f93c3883078620a1c10dbc8cda7f0ff62e79f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 30 Mar 2022 09:41:43 -0300 Subject: [PATCH 4/4] python3-cvxopt: update to 1.3.0. Also: - fix support for gsl - enable support for fftw --- srcpkgs/python3-cvxopt/patches/fix-gsl.patch | 11 +++++++++++ srcpkgs/python3-cvxopt/template | 8 +++++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/python3-cvxopt/patches/fix-gsl.patch diff --git a/srcpkgs/python3-cvxopt/patches/fix-gsl.patch b/srcpkgs/python3-cvxopt/patches/fix-gsl.patch new file mode 100644 index 000000000000..e32dc2fbf1e1 --- /dev/null +++ b/srcpkgs/python3-cvxopt/patches/fix-gsl.patch @@ -0,0 +1,11 @@ +--- a/setup.py 2022-03-07 18:58:58.000000000 -0300 ++++ b/setup.py 2022-04-14 22:25:18.860887901 -0300 +@@ -129,7 +129,7 @@ + # optional modules + + if BUILD_GSL: +- gsl = Extension('gsl', libraries = M_LIB + ['gsl'] + BLAS_LIB, ++ gsl = Extension('gsl', libraries = M_LIB + ['gsl', 'gslcblas'], + include_dirs = [ GSL_INC_DIR ], + library_dirs = [ GSL_LIB_DIR, BLAS_LIB_DIR ], + define_macros = GSL_MACROS, diff --git a/srcpkgs/python3-cvxopt/template b/srcpkgs/python3-cvxopt/template index 0fb769b294e0..d89abbcafa5f 100644 --- a/srcpkgs/python3-cvxopt/template +++ b/srcpkgs/python3-cvxopt/template @@ -1,20 +1,22 @@ # Template file for 'python3-cvxopt' pkgname=python3-cvxopt -version=1.2.7 +version=1.3.0 revision=1 wrksrc="cvxopt-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -makedepends="python3-devel blas-devel lapack-devel SuiteSparse-devel gsl-devel glpk-devel" +makedepends="python3-devel blas-devel lapack-devel SuiteSparse-devel gsl-devel + glpk-devel fftw-devel" checkdepends="python3-pytest" short_desc="Python software for convex optimization" maintainer="Gonzalo Tornaría " license="GPL-3.0-or-later" homepage="http://cvxopt.org/" distfiles="${PYPI_SITE}/c/cvxopt/cvxopt-${version}.tar.gz" -checksum=3f9db1f4d4e820aaea81d6fc21054c89dc6327c84f935dd5a1eda1af11e1d504 +checksum=00b1b232f9d1f902d578a9d75814b67fa020758d5ae422e28ca8cef6269fa5c6 pre_build() { export CVXOPT_BUILD_GSL=1 export CVXOPT_BUILD_GLPK=1 + export CVXOPT_BUILD_FFTW=1 }