From 87b447fadad9f863f34d916af11738320e2e6910 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 2 Mar 2020 10:06:56 +0100 Subject: [PATCH] gmsh: update to 4.5.4. Fixes #17086 --- srcpkgs/gmsh/template | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/srcpkgs/gmsh/template b/srcpkgs/gmsh/template index 656fba1b62..5d36aaf6eb 100644 --- a/srcpkgs/gmsh/template +++ b/srcpkgs/gmsh/template @@ -1,31 +1,36 @@ # Template file for 'gmsh' pkgname=gmsh -version=4.4.1 -revision=2 +version=4.5.4 +revision=1 wrksrc="${pkgname}-${version}-source" build_style=cmake -configure_args="-DENABLE_NUMPY=$(vopt_if numpy ON OFF) - -DENABLE_ZIPPER=$(vopt_if zipper ON OFF) -DENABLE_HXT=$(vopt_if hxt ON OFF)" -hostmakedepends="blas-devel lapack-devel SDL2-devel - $(vopt_if mesh 'hdf5-devel fltk-devel') gmp-devel" -depends="python blas-devel lapack-devel SDL2-devel - $(vopt_if mesh 'hdf5-devel fltk-devel') gmp-devel" +configure_args="-DENABLE_SYSTEM_CONTRIB=ON + -DENABLE_HXT=$(vopt_if hxt ON OFF) + -DENABLE_ZIPPER=$(vopt_if zipper ON OFF) + -DENABLE_NUMPY=$(vopt_if numpy ON OFF)" +makedepends="freetype-devel glu-devel gmp-devel + $(vopt_if fltk fltk-devel) blas-devel lapack-devel" short_desc="Three-dimensional finite element mesh generator" maintainer="Nathan Owens " license="GPL-2.0-or-later" homepage="https://gmsh.info" changelog="http://gmsh.info/CHANGELOG.txt" distfiles="https://gmsh.info/src/gmsh-${version}-source.tgz" -checksum=853c6438fc4e4b765206e66a514b09182c56377bb4b73f1d0d26eda7eb8af0dc +checksum=ccf8c74f43cbe3c371abe79862025d41642b3538a0148f018949494e3b3e2ecd -build_options="hxt mesh numpy zipper" -# HXT and MESH only available on x86 -case "${XBPS_TARGET_MACHINE}" in - i686|x86_64) build_options_default="hxt mesh";; +if [ -z "$CROSS_BUILD" ]; then + makedepends+=" hdf5-devel" +fi + +build_options="fltk hxt numpy zipper" +build_options_default="hxt" + +case "$XBPS_TARGET_MACHINE" in + aarch64*|i686*|x86_64*|ppc64*) build_options_default+=" fltk";; esac desc_option_hxt="Enable HXT library" -desc_option_mesh="Enable mesh support (Required for GUI)" +desc_option_fltk="Enable FLTK GUI support" desc_option_numpy="Enable fullMatrix and numpy array conversion" desc_option_zipper="Enable zip file compression/decompression"