Date: Tue, 6 Apr 2021 20:32:02 GMT From: Stephen Montgomery-Smith <stephen@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0c1fbf8037c5 - main - math/octave-forge-nurbs: update to 1.4.3. Message-ID: <202104062032.136KW2x1004300@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=0c1fbf8037c5dbd8d68c7ab2bdf6fd25f35dae54 commit 0c1fbf8037c5dbd8d68c7ab2bdf6fd25f35dae54 Author: Stephen Montgomery-Smith <stephen@FreeBSD.org> AuthorDate: 2021-04-06 20:25:42 +0000 Commit: Stephen Montgomery-Smith <stephen@FreeBSD.org> CommitDate: 2021-04-06 20:25:42 +0000 math/octave-forge-nurbs: update to 1.4.3. --- math/octave-forge-nurbs/Makefile | 3 +- math/octave-forge-nurbs/distinfo | 6 ++-- math/octave-forge-nurbs/files/patch-bspeval.cc | 11 ------- .../files/patch-nrb__srf__basisfun____.cc | 20 ------------- .../files/patch-nrb__srf__basisfun__der____.cc | 34 ---------------------- math/octave-forge-nurbs/files/patch-tbasisfun.cc | 11 ------- 6 files changed, 4 insertions(+), 81 deletions(-) diff --git a/math/octave-forge-nurbs/Makefile b/math/octave-forge-nurbs/Makefile index 3d9f8fa2b91c..8b3fc3747d1b 100644 --- a/math/octave-forge-nurbs/Makefile +++ b/math/octave-forge-nurbs/Makefile @@ -1,8 +1,7 @@ # Created by: Stephen Montgomery-Smith <stephen@math.missouri.edu> PORTNAME= octave-forge-nurbs -PORTVERSION= 1.3.13 -PORTREVISION= 11 +PORTVERSION= 1.4.3 CATEGORIES= math MAINTAINER= stephen@FreeBSD.org diff --git a/math/octave-forge-nurbs/distinfo b/math/octave-forge-nurbs/distinfo index fe3d19829e28..6a044f4af536 100644 --- a/math/octave-forge-nurbs/distinfo +++ b/math/octave-forge-nurbs/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1497927521 -SHA256 (octave-forge/nurbs-1.3.13.tar.gz) = dbbfe7072750330e61040e3a9cf6967733229c3272fb4115bb83dd616aa37e7e -SIZE (octave-forge/nurbs-1.3.13.tar.gz) = 108549 +TIMESTAMP = 1617740720 +SHA256 (octave-forge/nurbs-1.4.3.tar.gz) = a74666a1e204b9feda22c9792b87939239221fd816383bc39f75db72b62a209b +SIZE (octave-forge/nurbs-1.4.3.tar.gz) = 124419 diff --git a/math/octave-forge-nurbs/files/patch-bspeval.cc b/math/octave-forge-nurbs/files/patch-bspeval.cc deleted file mode 100644 index fa41bda956b3..000000000000 --- a/math/octave-forge-nurbs/files/patch-bspeval.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- bspeval.cc.orig 2021-02-21 22:35:52 UTC -+++ bspeval.cc -@@ -113,7 +113,7 @@ static bool bspeval_bad_arguments (const octave_value_ - error("bspeval: the knot vector should be a real vector."); - return true; - } -- if (!args(3).is_real_type()) -+ if (!args(3).isreal()) - { - error("bspeval: the set of parametric points should be an array of doubles."); - return true; diff --git a/math/octave-forge-nurbs/files/patch-nrb__srf__basisfun____.cc b/math/octave-forge-nurbs/files/patch-nrb__srf__basisfun____.cc deleted file mode 100644 index 45e29de24161..000000000000 --- a/math/octave-forge-nurbs/files/patch-nrb__srf__basisfun____.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- nrb_srf_basisfun__.cc.orig 2021-02-21 22:34:12 UTC -+++ nrb_srf_basisfun__.cc -@@ -66,7 +66,7 @@ DEFUN_DLD(nrb_srf_basisfun__, args, nargout,"\ - } // spu = findspan (m, p, u, U); - - newargs(3) = U; newargs(2) = p; newargs(1) = u; newargs(0) = spu; -- Matrix Ik = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U); -+ Matrix Ik = octave::feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U); - - RowVector spv(v); - for (octave_idx_type ii(0); ii < v.numel (); ii++) -@@ -75,7 +75,7 @@ DEFUN_DLD(nrb_srf_basisfun__, args, nargout,"\ - } // spv = findspan (n, q, v, V); - - newargs(3) = V; newargs(2) = q; newargs(1) = v; newargs(0) = spv; -- Matrix Jk = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Jk = numbasisfun (spv, v, q, V); -+ Matrix Jk = octave::feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Jk = numbasisfun (spv, v, q, V); - - Matrix NuIkuk(npt, p+1, 0.0); - for (octave_idx_type ii(0); ii < npt; ii++) diff --git a/math/octave-forge-nurbs/files/patch-nrb__srf__basisfun__der____.cc b/math/octave-forge-nurbs/files/patch-nrb__srf__basisfun__der____.cc deleted file mode 100644 index 64fce6926177..000000000000 --- a/math/octave-forge-nurbs/files/patch-nrb__srf__basisfun__der____.cc +++ /dev/null @@ -1,34 +0,0 @@ ---- nrb_srf_basisfun_der__.cc.orig 2021-02-21 22:32:34 UTC -+++ nrb_srf_basisfun_der__.cc -@@ -73,7 +73,7 @@ DEFUN_DLD(nrb_srf_basisfun_der__, args, nargout,"\ - } // spu = findspan (m, p, u, U); - - newargs(3) = U; newargs(2) = p; newargs(1) = u; newargs(0) = spu; -- Matrix Ik = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U); -+ Matrix Ik = octave::feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U); - - RowVector spv(v); - for (octave_idx_type ii(0); ii < v.numel (); ii++) -@@ -82,7 +82,7 @@ DEFUN_DLD(nrb_srf_basisfun_der__, args, nargout,"\ - } // spv = findspan (n, q, v, V); - - newargs(3) = V; newargs(2) = q; newargs(1) = v; newargs(0) = spv; -- Matrix Jk = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Jk = numbasisfun (spv, v, q, V); -+ Matrix Jk = octave::feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Jk = numbasisfun (spv, v, q, V); - - Matrix NuIkuk(npt, p+1, 0.0); - for (octave_idx_type ii(0); ii < npt; ii++) -@@ -100,11 +100,11 @@ DEFUN_DLD(nrb_srf_basisfun_der__, args, nargout,"\ - - - newargs(4) = 1; newargs(3) = U; newargs(2) = u; newargs(1) = p; newargs(0) = spu; -- NDArray NuIkukprime = feval (std::string("basisfunder"), newargs, 1)(0).array_value (); // NuIkukprime = basisfunder (spu, p, u, U, 1); -+ NDArray NuIkukprime = octave::feval (std::string("basisfunder"), newargs, 1)(0).array_value (); // NuIkukprime = basisfunder (spu, p, u, U, 1); - // NuIkukprime = squeeze(NuJkukprime(:,2,:)); - - newargs(4) = 1; newargs(3) = V; newargs(2) = v; newargs(1) = q; newargs(0) = spv; -- NDArray NvJkvkprime = feval (std::string("basisfunder"), newargs, 1)(0).array_value (); // NvJkvkprime = basisfunder (spv, q, v, V, 1); -+ NDArray NvJkvkprime = octave::feval (std::string("basisfunder"), newargs, 1)(0).array_value (); // NvJkvkprime = basisfunder (spv, q, v, V, 1); - // NvJkvkprime = squeeze(NvJkvkprime(:,2,:)); - - for (octave_idx_type k(0); k < npt; k++) diff --git a/math/octave-forge-nurbs/files/patch-tbasisfun.cc b/math/octave-forge-nurbs/files/patch-tbasisfun.cc deleted file mode 100644 index ff2d644f502c..000000000000 --- a/math/octave-forge-nurbs/files/patch-tbasisfun.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- tbasisfun.cc.orig 2021-02-21 22:37:09 UTC -+++ tbasisfun.cc -@@ -156,7 +156,7 @@ TBASISFUN: Compute a B- or T-Spline basis function, an - RowVector N(u.cols ()); - double *Nptr = N.fortran_vec (); - -- if (! args(2).is_cell ()) -+ if (! args(2).iscell ()) - { - - double p = args(1).idx_type_value ();
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104062032.136KW2x1004300>