* [PR PATCH] [WIP] octave: update to 6.1.0.
@ 2021-01-08 23:21 olafmersmann
2021-02-15 4:00 ` ericonr
` (13 more replies)
0 siblings, 14 replies; 15+ messages in thread
From: olafmersmann @ 2021-01-08 23:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
There is a new pull request by olafmersmann against master on the void-packages repository
https://github.com/olafmersmann/void-packages octave
https://github.com/void-linux/void-packages/pull/27775
[WIP] octave: update to 6.1.0.
A patch file from https://github.com/void-linux/void-packages/pull/27775.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-octave-27775.patch --]
[-- Type: text/x-diff, Size: 1905 bytes --]
From f39d326885ca2864141ad05a0bb046f40cd04451 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Tue, 5 Jan 2021 00:16:17 +0100
Subject: [PATCH] octave: update to 6.1.0.
---
srcpkgs/octave/template | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index faac10a9818..4dc6335909e 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
# Template file for 'octave'
pkgname=octave
-version=5.2.0
-revision=2
+version=6.1.0
+revision=1
build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
hostmakedepends="perl gcc-fortran pkg-config gnuplot"
makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+ lcms2-devel glpk-devel texinfo"
depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="texlive-dvi tar zip unzip"
short_desc="High-level language, primarily intended for numerical computations"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-3.0-or-later"
homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=6ff34e401658622c44094ecb67e497672e4337ca2d36c0702d0403ecc60b0a57
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+ # List of supported architectures copied from openblas.
+ armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+ makedepends+=" openblas-devel"
+ configure_args=" --with-blas=openblas --with-lapack=openblas"
+ ;;
+ *)
+ makedepends+=" blas-devel lapack-devel"
+ ;;
+esac
# Package build options
# TODO: some options are still missing, such as
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [WIP] octave: update to 6.1.0.
2021-01-08 23:21 [PR PATCH] [WIP] octave: update to 6.1.0 olafmersmann
@ 2021-02-15 4:00 ` ericonr
2021-02-15 4:01 ` ericonr
` (12 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-02-15 4:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 470 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27775#issuecomment-778921835
Comment:
Error from test suite:
```
GEN doc/interpreter/octave_interpreter.qhc
QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '/tmp/runtime-root'
QSqlDatabase: QSQLITE driver not loaded
QSqlDatabase: available drivers:
Cannot open data base file /builddir/octave-6.1.0/doc/interpreter/octave_interpreter.qch.
```
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [WIP] octave: update to 6.1.0.
2021-01-08 23:21 [PR PATCH] [WIP] octave: update to 6.1.0 olafmersmann
2021-02-15 4:00 ` ericonr
@ 2021-02-15 4:01 ` ericonr
2021-02-24 8:47 ` [PR PATCH] [Updated] " olafmersmann
` (11 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-02-15 4:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 231 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27775#issuecomment-778922023
Comment:
I don't know if we need all of them passing cleanly, octave is rather big and complicated.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] octave: update to 6.1.0.
2021-01-08 23:21 [PR PATCH] [WIP] octave: update to 6.1.0 olafmersmann
2021-02-15 4:00 ` ericonr
2021-02-15 4:01 ` ericonr
@ 2021-02-24 8:47 ` olafmersmann
2021-03-28 18:22 ` [PR REVIEW] " Piraty
` (10 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: olafmersmann @ 2021-02-24 8:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 329 bytes --]
There is an updated pull request by olafmersmann against master on the void-packages repository
https://github.com/olafmersmann/void-packages octave
https://github.com/void-linux/void-packages/pull/27775
[WIP] octave: update to 6.1.0.
A patch file from https://github.com/void-linux/void-packages/pull/27775.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-octave-27775.patch --]
[-- Type: text/x-diff, Size: 2476 bytes --]
From 53b8a3e6293d73f49543ceac1923d8983abe9471 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Tue, 5 Jan 2021 00:16:17 +0100
Subject: [PATCH] octave: update to 6.2.0.
---
srcpkgs/octave/template | 28 +++++++++++++++++++++-------
1 file changed, 21 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index faac10a9818..39123d49767 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
# Template file for 'octave'
pkgname=octave
-version=5.2.0
-revision=2
+version=6.2.0
+revision=1
build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
lcms2-devel glpk-devel"
-depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+depends="$(vopt_if gui qt5-plugin-sqlite) texinfo texlive-dvi tar"
+checkdepends="texlive-dvi tar zip unzip"
short_desc="High-level language, primarily intended for numerical computations"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-3.0-or-later"
homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=457d1fda8634a839e2fd7cfc55b98bd56f36b6ae73d31bb9df43dde3012caa7c
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+ # List of supported architectures copied from openblas.
+ armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+ makedepends+=" openblas-devel"
+ configure_args=" --with-blas=openblas --with-lapack=openblas"
+ ;;
+ *)
+ makedepends+=" blas-devel lapack-devel"
+ ;;
+esac
# Package build options
# TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
$(vopt_if curl libcurl-devel)
$(vopt_if fftw3 fftw-devel)
$(vopt_if graphicsmagick libgraphicsmagick-devel)
- $(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+ $(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
$(vopt_if hdf5 hdf5-devel)
$(vopt_if imagemagick libmagick-devel)
$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] [WIP] octave: update to 6.1.0.
2021-01-08 23:21 [PR PATCH] [WIP] octave: update to 6.1.0 olafmersmann
` (2 preceding siblings ...)
2021-02-24 8:47 ` [PR PATCH] [Updated] " olafmersmann
@ 2021-03-28 18:22 ` Piraty
2021-03-28 18:22 ` Piraty
` (9 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Piraty @ 2021-03-28 18:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 338 bytes --]
New review comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/27775#discussion_r602912711
Comment:
what for is the runtime dependency on tar? I'm inclined to not add it to `depends` as tar is part of base-system already (no other package explicitly depends on tar, though many might need it)
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] [WIP] octave: update to 6.1.0.
2021-01-08 23:21 [PR PATCH] [WIP] octave: update to 6.1.0 olafmersmann
` (3 preceding siblings ...)
2021-03-28 18:22 ` [PR REVIEW] " Piraty
@ 2021-03-28 18:22 ` Piraty
2021-03-28 18:22 ` Piraty
` (8 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Piraty @ 2021-03-28 18:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 563 bytes --]
New review comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/27775#discussion_r602912560
Comment:
why add this list now?after taking a look at openblas/template, openblas is available for ppc and armv5 as well and they aren't listed (meaning: all archs Void provides binary packages for have openblas available).
you might as well be better off just marking `mips*)` to use regular blas to match this, as done in openblas/template.
may i ask which arch you had in mind in specific which caused any trouble here?
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [WIP] octave: update to 6.1.0.
2021-01-08 23:21 [PR PATCH] [WIP] octave: update to 6.1.0 olafmersmann
` (4 preceding siblings ...)
2021-03-28 18:22 ` Piraty
@ 2021-03-28 18:22 ` Piraty
2021-03-30 18:35 ` [PR REVIEW] " ericonr
` (7 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Piraty @ 2021-03-28 18:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 156 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/27775#issuecomment-808937056
Comment:
ping @diogoleal
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] [WIP] octave: update to 6.1.0.
2021-01-08 23:21 [PR PATCH] [WIP] octave: update to 6.1.0 olafmersmann
` (5 preceding siblings ...)
2021-03-28 18:22 ` Piraty
@ 2021-03-30 18:35 ` ericonr
2021-03-30 18:37 ` ericonr
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-03-30 18:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1047 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27775#discussion_r604341393
Comment:
openblas has:
```
case "${XBPS_TARGET_MACHINE}" in
armv5*) make_build_args+=" TARGET=ARMV5" ;;
armv6*) make_build_args+=" TARGET=ARMV6" ;;
armv7*) make_build_args+=" TARGET=ARMV7" ;;
aarch64*) make_build_args+=" TARGET=ARMV8 DYNAMIC_ARCH=1" ;;
i686*) make_build_args+=" BINARY=32 TARGET=GENERIC DYNAMIC_ARCH=1" ;;
x86_64*) make_build_args+=" BINARY=64 TARGET=GENERIC DYNAMIC_ARCH=1" ;;
ppc64le*) make_build_args+=" TARGET=POWER8 DYNAMIC_ARCH=1" ;;
ppc64*) make_build_args+=" TARGET=PPC970MP" ;; # dynamic arch broken for <power6
ppc*) make_build_args+=" TARGET=PPCG4" ;;
mips*) broken="Not supported" ;;
*) broken="Add your CPU" ;;
esac
```
which would mean that eventual `riscv` target would be broken by default, for example, and would block octave from being built instead of building it with `lapack`. I think listing where it's known to work is a bit more correct.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] [WIP] octave: update to 6.1.0.
2021-01-08 23:21 [PR PATCH] [WIP] octave: update to 6.1.0 olafmersmann
` (6 preceding siblings ...)
2021-03-30 18:35 ` [PR REVIEW] " ericonr
@ 2021-03-30 18:37 ` ericonr
2021-03-30 18:37 ` ericonr
` (5 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-03-30 18:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 295 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27775#discussion_r604342658
Comment:
Assuming it's necessary only for building packages, I don't think it's necessary. You still need `gcc-fortran` and other dependencies to build them.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] [WIP] octave: update to 6.1.0.
2021-01-08 23:21 [PR PATCH] [WIP] octave: update to 6.1.0 olafmersmann
` (7 preceding siblings ...)
2021-03-30 18:37 ` ericonr
@ 2021-03-30 18:37 ` ericonr
2021-03-30 18:37 ` ericonr
` (4 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-03-30 18:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27775#discussion_r604342658
Comment:
Assuming it's necessary only for building packages, I don't think it's necessary to have it in `depends.. You still need `gcc-fortran` and other dependencies to build them.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] [WIP] octave: update to 6.1.0.
2021-01-08 23:21 [PR PATCH] [WIP] octave: update to 6.1.0 olafmersmann
` (8 preceding siblings ...)
2021-03-30 18:37 ` ericonr
@ 2021-03-30 18:37 ` ericonr
2021-03-31 21:39 ` [PR REVIEW] [WIP] octave: update to 6.2.0 olafmersmann
` (3 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-03-30 18:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27775#discussion_r604342658
Comment:
Assuming it's necessary only for building packages, I don't think it's necessary to have it in `depends`. You still need `gcc-fortran` and other dependencies to build them.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR REVIEW] [WIP] octave: update to 6.2.0.
2021-01-08 23:21 [PR PATCH] [WIP] octave: update to 6.1.0 olafmersmann
` (9 preceding siblings ...)
2021-03-30 18:37 ` ericonr
@ 2021-03-31 21:39 ` olafmersmann
2021-08-11 2:29 ` [PR PATCH] [Updated] " ericonr
` (2 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: olafmersmann @ 2021-03-31 21:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 287 bytes --]
New review comment by olafmersmann on void-packages repository
https://github.com/void-linux/void-packages/pull/27775#discussion_r605237868
Comment:
Sorry for dropping the ball on this. I'm currently too busy to work further on this. Anyone else feel free to pick up where I left off.
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] octave: update to 6.2.0.
2021-01-08 23:21 [PR PATCH] [WIP] octave: update to 6.1.0 olafmersmann
` (10 preceding siblings ...)
2021-03-31 21:39 ` [PR REVIEW] [WIP] octave: update to 6.2.0 olafmersmann
@ 2021-08-11 2:29 ` ericonr
2021-08-11 2:44 ` ericonr
2021-08-11 2:59 ` [PR PATCH] [Merged]: " ericonr
13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-08-11 2:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/olafmersmann/void-packages octave
https://github.com/void-linux/void-packages/pull/27775
[WIP] octave: update to 6.2.0.
A patch file from https://github.com/void-linux/void-packages/pull/27775.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-octave-27775.patch --]
[-- Type: text/x-diff, Size: 2562 bytes --]
From 08c0c2989840892f18ed621c0a4616b4d7a98895 Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Tue, 5 Jan 2021 00:16:17 +0100
Subject: [PATCH] octave: update to 6.3.0.
- add support for targets without proper openblas support
---
srcpkgs/octave/template | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..a5187b4cb789 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
# Template file for 'octave'
pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="texlive-dvi tar zip unzip"
short_desc="High-level language, primarily intended for numerical computations"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-3.0-or-later"
homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+ # List of supported architectures copied from openblas.
+ armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+ makedepends+=" openblas-devel"
+ configure_args=" --with-blas=openblas --with-lapack=openblas"
+ ;;
+ *)
+ makedepends+=" blas-devel lapack-devel"
+ ;;
+esac
# Package build options
# TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
$(vopt_if curl libcurl-devel)
$(vopt_if fftw3 fftw-devel)
$(vopt_if graphicsmagick libgraphicsmagick-devel)
- $(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+ $(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
$(vopt_if hdf5 hdf5-devel)
$(vopt_if imagemagick libmagick-devel)
$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] octave: update to 6.2.0.
2021-01-08 23:21 [PR PATCH] [WIP] octave: update to 6.1.0 olafmersmann
` (11 preceding siblings ...)
2021-08-11 2:29 ` [PR PATCH] [Updated] " ericonr
@ 2021-08-11 2:44 ` ericonr
2021-08-11 2:59 ` [PR PATCH] [Merged]: " ericonr
13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-08-11 2:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/olafmersmann/void-packages octave
https://github.com/void-linux/void-packages/pull/27775
[WIP] octave: update to 6.2.0.
A patch file from https://github.com/void-linux/void-packages/pull/27775.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-octave-27775.patch --]
[-- Type: text/x-diff, Size: 2989 bytes --]
From 9ff4c5ea3185147db4450c83baa7da667a0759cb Mon Sep 17 00:00:00 2001
From: Olaf Mersmann <olafm@p-value.net>
Date: Tue, 5 Jan 2021 00:16:17 +0100
Subject: [PATCH] octave: update to 6.3.0.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- add support for targets without proper openblas support
- add changelog for the 6.x release series
- fix gui deps
- adding 'texlive-dvi' and 'tar' to depends to make building external
packages easier was considered, but ultimately dismissed; since they
aren't enough to actually build packages, they would increase
dependency count for little gain
Co-authored-by: Érico Nogueira <erico.erc@gmail.com>
---
srcpkgs/octave/template | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index 8a92ed68d532..08ba298b09dd 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,19 +1,33 @@
# Template file for 'octave'
pkgname=octave
-version=5.2.0
-revision=2
+version=6.3.0
+revision=1
build_style=gnu-configure
-configure_args=" --with-blas=openblas --with-lapack=openblas"
-hostmakedepends="perl gcc-fortran pkg-config gnuplot"
-makedepends="pcre-devel openblas-devel readline-devel libSM-devel libltdl-devel
- lcms2-devel glpk-devel"
+hostmakedepends="perl gcc-fortran pkg-config gnuplot texinfo texlive-dvi tar"
+makedepends="pcre-devel readline-devel libSM-devel libltdl-devel lcms2-devel
+ glpk-devel"
depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+checkdepends="zip unzip"
short_desc="High-level language, primarily intended for numerical computations"
maintainer="Diogo Leal <diogo@diogoleal.com>"
license="GPL-3.0-or-later"
homepage="https://gnu.org/software/octave/"
+changelog="https://www.gnu.org/software/octave/NEWS-6.1.html"
distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
-checksum=2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1
+checksum=232065f3a72fc3013fe9f17f429a3df69d672c1f6b6077029a31c8f3cd58a66e
+
+# Use OpenBLAS on platforms where it is available and fallback to regular BLAS
+# on all others.
+case "$XBPS_TARGET_MACHINE" in
+ # List of supported architectures copied from openblas.
+ armv[67]*|aarch64*|i686*|x86_64*|ppc64*)
+ makedepends+=" openblas-devel"
+ configure_args=" --with-blas=openblas --with-lapack=openblas"
+ ;;
+ *)
+ makedepends+=" blas-devel lapack-devel"
+ ;;
+esac
# Package build options
# TODO: some options are still missing, such as
@@ -65,7 +79,7 @@ makedepends+="
$(vopt_if curl libcurl-devel)
$(vopt_if fftw3 fftw-devel)
$(vopt_if graphicsmagick libgraphicsmagick-devel)
- $(vopt_if gui 'qt5-devel qscintilla-qt5-devel qt5-tools-devel')
+ $(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
$(vopt_if hdf5 hdf5-devel)
$(vopt_if imagemagick libmagick-devel)
$(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PR PATCH] [Merged]: [WIP] octave: update to 6.2.0.
2021-01-08 23:21 [PR PATCH] [WIP] octave: update to 6.1.0 olafmersmann
` (12 preceding siblings ...)
2021-08-11 2:44 ` ericonr
@ 2021-08-11 2:59 ` ericonr
13 siblings, 0 replies; 15+ messages in thread
From: ericonr @ 2021-08-11 2:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
There's a merged pull request on the void-packages repository
[WIP] octave: update to 6.2.0.
https://github.com/void-linux/void-packages/pull/27775
Description:
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2021-08-11 2:59 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-08 23:21 [PR PATCH] [WIP] octave: update to 6.1.0 olafmersmann
2021-02-15 4:00 ` ericonr
2021-02-15 4:01 ` ericonr
2021-02-24 8:47 ` [PR PATCH] [Updated] " olafmersmann
2021-03-28 18:22 ` [PR REVIEW] " Piraty
2021-03-28 18:22 ` Piraty
2021-03-28 18:22 ` Piraty
2021-03-30 18:35 ` [PR REVIEW] " ericonr
2021-03-30 18:37 ` ericonr
2021-03-30 18:37 ` ericonr
2021-03-30 18:37 ` ericonr
2021-03-31 21:39 ` [PR REVIEW] [WIP] octave: update to 6.2.0 olafmersmann
2021-08-11 2:29 ` [PR PATCH] [Updated] " ericonr
2021-08-11 2:44 ` ericonr
2021-08-11 2:59 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).