[arch-commits] Commit in octave/trunk (PKGBUILD octave-sundials4.patch)
Date: Thursday, December 17, 2020 @ 08:08:16
Author: arojas
Revision: 777102
Update to 6.1.0
Modified:
octave/trunk/PKGBUILD
Deleted:
octave/trunk/octave-sundials4.patch
+
PKGBUILD | 23 -
octave-sundials4.patch | 599 ---
2 files changed, 7 insertions(+), 615 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-12-17 07:40:44 UTC (rev 777101)
+++ PKGBUILD2020-12-17 08:08:16 UTC (rev 777102)
@@ -3,8 +3,8 @@
# Contributor : cyberdune
pkgname=octave
-pkgver=5.2.0
-pkgrel=7
+pkgver=6.1.0
+pkgrel=1
pkgdesc="A high-level language, primarily intended for numerical computations."
arch=('x86_64')
url="https://www.gnu.org/software/octave/;
@@ -17,32 +17,23 @@
'portaudio: audio support'
'java-runtime: java support'
'fltk: FLTK GUI')
-source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
-octave-sundials4.patch)
+source=(https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
options=('!emptydirs')
validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton
-sha512sums=('fa2076fb22415e0797964c66cfb8d24643f178f45eb9c14ebb4c082767e0a53509fde550f579fa4a816348bd0f7cbc74f24144f9a30a5b9c09ebe1b3949db498'
-'SKIP'
-
'4b743602e8ca91e8be8dab69e09d3e476e9edd867b2eb0b9816fbe4ca344a16bff7a413c2e89b0c9fb769f4a815a696c4d67b70282b7e4fe8c24598bcce90d34')
+sha512sums=('34abe6fa489aea94bfeb08027653cd83a73611c6032c8b3ddc4b59223f316ee275f74490048a45aebf178858494f6920593565e612f6e77351102494cb9f49f7'
+'SKIP')
-prepare() {
- cd $pkgname-$pkgver
- patch -p1 -i ../octave-sundials4.patch # Fix sundials support
https://savannah.gnu.org/bugs/?52475
- autoreconf -vif
-}
-
build() {
cd ${pkgname}-${pkgver}
./configure --prefix=/usr --libexecdir=/usr/lib \
--enable-shared --disable-static \
---with-quantum-depth=16 \
---with-sundials_ida="-lsundials_ida -lsundials_sunlinsolklu"
+--with-quantum-depth=16
make
}
package(){
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
Deleted: octave-sundials4.patch
===
--- octave-sundials4.patch 2020-12-17 07:40:44 UTC (rev 777101)
+++ octave-sundials4.patch 2020-12-17 08:08:16 UTC (rev 777102)
@@ -1,599 +0,0 @@
-# HG changeset patch
-# User Bill Greene
-# Date 1550229868 -3600
-# Fri Feb 15 12:24:28 2019 +0100
-# Node ID 4bf27c090f5695bcf545fc4af15e2a61a3941d46
-# Parent f034b29320ad5034ad5c66480f64411e9d773440
-Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
-
-* libinterp/dldfcn/__ode15__.cc : use SUNDIALS API version 3.x
-
-diff --git a/libinterp/dldfcn/__ode15__.cc b/libinterp/dldfcn/__ode15__.cc
a/libinterp/dldfcn/__ode15__.cc
-+++ b/libinterp/dldfcn/__ode15__.cc
-@@ -1,6 +1,7 @@
- /*
-
- Copyright (C) 2016-2019 Francesco Faccio
-+Copyright (C) 2019 William Greene
-
- This file is part of Octave.
-
-@@ -112,7 +113,8 @@
- havejacsparse (false), mem (nullptr), num (), ida_fun (nullptr),
- ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
- spdfdyp (nullptr), fun (nullptr), jacfun (nullptr), jacspfun
(nullptr),
--jacdcell (nullptr), jacspcell (nullptr)
-+jacdcell (nullptr), jacspcell (nullptr),
-+sunJacMatrix (nullptr), sunLinearSolver (nullptr)
- { }
-
-
-@@ -122,11 +124,17 @@
- havejacsparse (false), mem (nullptr), num (), ida_fun (ida_fcn),
- ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
- spdfdyp (nullptr), fun (daefun), jacfun (nullptr), jacspfun (nullptr),
--jacdcell (nullptr), jacspcell (nullptr)
-+jacdcell (nullptr), jacspcell (nullptr),
-+sunJacMatrix (nullptr), sunLinearSolver (nullptr)
- { }
-
-
--~IDA (void) { IDAFree (); }
-+~IDA (void)
-+{
-+ IDAFree ();
-+ SUNLinSolFree(sunLinearSolver);
-+ SUNMatDestroy(sunJacMatrix);
-+}
-
- IDA&
- set_jacobian (octave_function *jac, DAEJacFuncDense j)
-@@ -184,7 +192,7 @@
- static N_Vector ColToNVec (const ColumnVector& data, long int n);
-
- void
--set_up (void);
-+set_up (const ColumnVector& y);
-
- void
- set_tolerance (ColumnVector& abstol, realtype reltol);
-@@ -199,25 +207,24 @@
- void
- resfun_impl (realtype t, N_Vector& yy,
- N_Vector& yyp, N_Vector& rr);
--
- static int
--jacdense (long int Neq, realtype t, realtype cj, N_Vector yy,
-- N_Vector yyp, N_Vector, DlsMat JJ, void *user_data,
-+jacdense (realtype t, realtype cj, N_Vector yy,
-+ N_Vector yyp, N_Vector, SUNMatrix JJ, void *user_data,
- N_Vector, N_Vector, N_Vector)
- {
- IDA *self = static_cast
[arch-commits] Commit in octave/trunk (PKGBUILD octave-sundials4.patch)
Date: Saturday, March 16, 2019 @ 22:40:11
Author: arojas
Revision: 442251
netcdf 4.6.3 rebuild
Modified:
octave/trunk/PKGBUILD
octave/trunk/octave-sundials4.patch
+
PKGBUILD |9 -
octave-sundials4.patch |3 +--
2 files changed, 5 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-03-16 22:21:02 UTC (rev 442250)
+++ PKGBUILD2019-03-16 22:40:11 UTC (rev 442251)
@@ -4,7 +4,7 @@
pkgname=octave
pkgver=5.1.0
-pkgrel=2
+pkgrel=3
pkgdesc="A high-level language, primarily intended for numerical computations."
arch=('x86_64')
url="http://www.octave.org;
@@ -23,7 +23,7 @@
validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton
sha512sums=('a842fb50c13f25e9d425fe9a2c71d9433d7e125747d2175efe0c9b2a780c799d9ce1ee085b5a13fbfedb7990b0ba5d11079d880ddb3bdb66782efc321390eebb'
'SKIP'
-
'c05514859d661c8064973c4728ab68a91ca97910792b9ee6deee28748c79867b1204517775fe12f716e23576632f7b741bfe90c79ada288a1f57b58877b0fd76')
+
'4b743602e8ca91e8be8dab69e09d3e476e9edd867b2eb0b9816fbe4ca344a16bff7a413c2e89b0c9fb769f4a815a696c4d67b70282b7e4fe8c24598bcce90d34')
prepare() {
cd $pkgname-$pkgver
@@ -35,9 +35,8 @@
cd ${pkgname}-${pkgver}
./configure --prefix=/usr --libexecdir=/usr/lib \
- --enable-shared --disable-static \
- --with-quantum-depth=16 \
- --with-sundials_ida="-lsundials_ida -lsundials_sunlinsolklu"
+ --enable-shared --disable-static --enable-link-all-dependencies \
+ --with-quantum-depth=16
make
}
Modified: octave-sundials4.patch
===
--- octave-sundials4.patch 2019-03-16 22:21:02 UTC (rev 442250)
+++ octave-sundials4.patch 2019-03-16 22:40:11 UTC (rev 442251)
@@ -297,7 +297,7 @@
diff --git a/libinterp/dldfcn/__ode15__.cc b/libinterp/dldfcn/__ode15__.cc
--- a/libinterp/dldfcn/__ode15__.cc
+++ b/libinterp/dldfcn/__ode15__.cc
-@@ -45,15 +45,32 @@
+@@ -45,15 +45,31 @@
#include
# endif
@@ -323,7 +323,6 @@
+
+# if defined (HAVE_SUNDIALS_SUNDIALS_SPARSE_H)
#include
-+#include
# endif
+
[arch-commits] Commit in octave/trunk (PKGBUILD octave-sundials4.patch)
Date: Thursday, February 28, 2019 @ 13:28:31
Author: arojas
Revision: 437032
Fix sundials support (FS#61879)
Added:
octave/trunk/octave-sundials4.patch
Modified:
octave/trunk/PKGBUILD
+
PKGBUILD | 25 +
octave-sundials4.patch | 600 +++
2 files changed, 615 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-02-28 12:29:36 UTC (rev 437031)
+++ PKGBUILD2019-02-28 13:28:31 UTC (rev 437032)
@@ -4,37 +4,42 @@
pkgname=octave
pkgver=5.1.0
-pkgrel=1
+pkgrel=2
pkgdesc="A high-level language, primarily intended for numerical computations."
arch=('x86_64')
url="http://www.octave.org;
license=('GPL')
depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'arpack' 'glu'
'ghostscript'
- 'suitesparse' 'gl2ps' 'qscintilla-qt5' 'libsndfile' 'qt5-tools'
'qrupdate')
+ 'sundials' 'gl2ps' 'qscintilla-qt5' 'libsndfile' 'qt5-tools'
'qrupdate')
makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot'
'fltk' 'portaudio' 'jdk8-openjdk' 'sundials')
optdepends=('texinfo: for help-support in octave'
'gnuplot: alternative plotting'
'portaudio: audio support'
'java-runtime: java support'
-'sundials: ode15i and ode15s solvers'
'fltk: FLTK GUI')
-source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig})
+source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.gz{,.sig}
+octave-sundials4.patch)
options=('!emptydirs')
validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B') # John W. Eaton
sha512sums=('a842fb50c13f25e9d425fe9a2c71d9433d7e125747d2175efe0c9b2a780c799d9ce1ee085b5a13fbfedb7990b0ba5d11079d880ddb3bdb66782efc321390eebb'
-'SKIP')
+'SKIP'
+
'c05514859d661c8064973c4728ab68a91ca97910792b9ee6deee28748c79867b1204517775fe12f716e23576632f7b741bfe90c79ada288a1f57b58877b0fd76')
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p1 -i ../octave-sundials4.patch # Fix sundials support
https://savannah.gnu.org/bugs/?52475
+ autoreconf -vif
+}
+
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd ${pkgname}-${pkgver}
- export QCOLLECTIONGENERATOR=qhelpgenerator # Fix build with Qt 5.12
./configure --prefix=/usr --libexecdir=/usr/lib \
--enable-shared --disable-static \
--with-quantum-depth=16 \
- --with-umfpack="-lumfpack -lsuitesparseconfig"
-#
https://mailman.cae.wisc.edu/pipermail/help-octave/2012-September/053991.html
+ --with-sundials_ida="-lsundials_ida -lsundials_sunlinsolklu"
- LANG=C make
+ make
}
package(){
Added: octave-sundials4.patch
===
--- octave-sundials4.patch (rev 0)
+++ octave-sundials4.patch 2019-02-28 13:28:31 UTC (rev 437032)
@@ -0,0 +1,600 @@
+# HG changeset patch
+# User Bill Greene
+# Date 1550229868 -3600
+# Fri Feb 15 12:24:28 2019 +0100
+# Node ID 4bf27c090f5695bcf545fc4af15e2a61a3941d46
+# Parent f034b29320ad5034ad5c66480f64411e9d773440
+Update DAE/IDE solvers to work with SUNDIALS 3 (bug #52475).
+
+* libinterp/dldfcn/__ode15__.cc : use SUNDIALS API version 3.x
+
+diff --git a/libinterp/dldfcn/__ode15__.cc b/libinterp/dldfcn/__ode15__.cc
+--- a/libinterp/dldfcn/__ode15__.cc
b/libinterp/dldfcn/__ode15__.cc
+@@ -1,6 +1,7 @@
+ /*
+
+ Copyright (C) 2016-2019 Francesco Faccio
++Copyright (C) 2019 William Greene
+
+ This file is part of Octave.
+
+@@ -112,7 +113,8 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (nullptr),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (nullptr), jacfun (nullptr), jacspfun
(nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+
+
+@@ -122,11 +124,17 @@
+ havejacsparse (false), mem (nullptr), num (), ida_fun (ida_fcn),
+ ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
+ spdfdyp (nullptr), fun (daefun), jacfun (nullptr), jacspfun (nullptr),
+-jacdcell (nullptr), jacspcell (nullptr)
++jacdcell (nullptr), jacspcell (nullptr),
++sunJacMatrix (nullptr), sunLinearSolver (nullptr)
+ { }
+
+
+-~IDA (void) { IDAFree (); }
++~IDA (void)
++{
++ IDAFree ();
++ SUNLinSolFree(sunLinearSolver);
++ SUNMatDestroy(sunJacMatrix);
++}
+
+ IDA&
+ set_jacobian (octave_function *jac, DAEJacFuncDense j)
+@@ -184,7 +192,7 @@
+ static N_Vector ColToNVec (const ColumnVector& data, long int n);
+
+ void
+-set_up (void);
++set_up (const ColumnVector& y);
+
+ void
+ set_tolerance (ColumnVector& abstol, realtype reltol);
+@@ -199,25 +207,24 @@
+ void
+
