community/octave: upgrade to 7.1.0

* use java-provides abstractions
2026-05-05 12:26:52 +02:00 · 2022-01-15 22:18:50 +00:00 · 2022-01-15 22:18:50 +00:00 · 97487c187f
commit 97487c187f
parent 8910fc111f
3 changed files with 37 additions and 49 deletions
--- a/community/octave/APKBUILD
+++ b/community/octave/APKBUILD
@ -2,34 +2,27 @@
 # Contributor: Daniel Sabogal <dsabogalcc@gmail.com>
 # Maintainer: Duncan Bellamy <dunk@denkimushi.com>
 pkgname=octave
-pkgver=6.4.0
-pkgrel=1
+pkgver=7.1.0
+pkgrel=0
 pkgdesc="A high-level language, primarily intended for numerical computations"
 url="https://www.gnu.org/software/octave/"
 # ppc64le, s390x missing texlive
-# missing openjdk8 on riscv64
+# missing openjdk on riscv64
 arch="all !s390x !riscv64 !ppc64le"
 license="GPL-3.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc"

-#openjdk8 needed for 32bit support
 case "$CARCH" in
 	x86)
 		#x86 libjava.so cannot find libjvm.so
-		options="!check"
-		_jdkver=8 ;;
-	armv7|armhf)
-		_jdkver=8 ;;
-	*)
-		_jdkver=11 ;;
+		options="!check" ;;
 esac

-_jhome=/usr/lib/jvm/java-1."$_jdkver"-openjdk
-makedepends="arpack-dev
+makedepends="
+	arpack-dev
 	autoconf
 	automake
 	bison
-	curl
 	curl-dev
 	fftw-dev
 	fltk-dev
@ -43,13 +36,13 @@ makedepends="arpack-dev
 	graphicsmagick-dev
 	hdf5-dev
 	imagemagick-dev
+	java-jdk
 	lcms2-dev
 	libltdl
 	libsm-dev
 	libsndfile-dev
 	libtool
 	openblas-dev
-	openjdk$_jdkver
 	pcre-dev
 	perl
 	pkgconf
@ -58,6 +51,7 @@ makedepends="arpack-dev
 	qrupdate-dev
 	qscintilla-dev
 	qt5-qttools-dev
+	rapidjson-dev
 	readline-dev
 	suitesparse-dev
 	texinfo
@ -68,7 +62,6 @@ makedepends="arpack-dev
 	zlib-dev
 	"
 source="https://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.xz
-	libinterp-deps.patch
 	abs.patch
 	test.patch
 	"
@ -79,7 +72,7 @@ prepare() {
 }

 build() {
-	export JAVA_HOME=$_jhome
+	export JAVA_HOME="/usr/lib/jvm/default-jvm"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@ -95,7 +88,7 @@ build() {
 }

 check() {
-	make check
+	LD_LIBRARY_PATH="/usr/lib/jvm/default-jvm/lib/server:$LD_LIBRARY_PATH" make check
 }

 package() {
@ -106,8 +99,7 @@ package() {
 }

 sha512sums="
-d239edde22877f0669314a66eb0d5ae787c387b1601a18e38d0b6971fe25b934801d1050679126974b716a6b7b27a3b51ecbfcff14a4ea529e51291f4028318b  octave-6.4.0.tar.xz
-f449d84ec0b9e18919473d9efc5b6628dc9eb62bbb4fe8160ef9c280546b7b2f07ea803992240063685ec4e8519b80002c752647060fc438e6dce8d464b98b6d  libinterp-deps.patch
+f315cfa4dfb1f8d8b0ff96ee636a330d833d9e8d308ec4dbe139b520086fe99b5ef12f3fa6cee770e2fbe468e27559ae7b14f0d77a64c970f5bf34be4ab6c213  octave-7.1.0.tar.xz
 f6cd1a52686a66d9914029b3c70eba88d2468700abfb16c3bdc5c0bae2a29cbf06143e15c2828be1112d45403247ff5713edf1b1261eaf132465ac05df6c7c7c  abs.patch
-30b5572aa082ebe8a53596dee83e25cfb956914c1e0105982527d76377a15a9904c023d2ee8a2e6f04258314de16fe1aa8ec9ccb0bdc2937cd6a21609785c14f  test.patch
+a2d67ead53701c74c5837cb79cf82e93a40eec58d41bf73b07d40ecf9655d8b358ae245745a613335abd42d4954b2c41309392bbb423fa2bdd61a848079cb173  test.patch
 "
--- a/community/octave/libinterp-deps.patch
+++ b/community/octave/libinterp-deps.patch
@ -1,12 +0,0 @@
-add LIBADD for compilation with alpine
-
--- a/libinterp/corefcn/module.mk
-+++ b/libinterp/corefcn/module.mk
-@@ -318,6 +318,7 @@
-   $(HDF5_CPPFLAGS) \
-   $(LLVM_CPPFLAGS) \
-   $(Z_CPPFLAGS)
-+libinterp_corefcn_libcorefcn_la_LIBADD = $(Z_LIBS)
- 
- libinterp_corefcn_libcorefcn_la_CFLAGS = $(AM_CFLAGS) $(WARN_CFLAGS)
- 
--- a/community/octave/test.patch
+++ b/community/octave/test.patch
@ -1,10 +1,9 @@
-
 patch out audio tests as segfault because no audio configured
 in ci

 --- a/libinterp/dldfcn/audiodevinfo.cc
 +++ b/libinterp/dldfcn/audiodevinfo.cc
-@@ -468,41 +468,6 @@
+@@ -471,48 +471,6 @@
 #endif
 }
 
@ -29,23 +28,30 @@ in ci
 -%!   assert (devinfo.output(i).Name, audiodevinfo (0, devinfo.output(i).ID));
 -%! endfor
 -%! for i=1:nin
-%!   assert (devinfo.input(i).Name, audiodevinfo (1, devinfo.input(i).ID));
+-%!   assert (devinfo.input (i).Name, audiodevinfo (1, devinfo.input (i).ID));
 -%! endfor
 -
 -%!testif HAVE_PORTAUDIO
 -%! devinfo = audiodevinfo;
 -%! nout = audiodevinfo (0);
 -%! nin = audiodevinfo (1);
-%! for i = 1:nout
-%!   assert (devinfo.output(i).ID, audiodevinfo (0, devinfo.output(i).Name));
+-%! ## There might be multiple devices with the same name (e.g. on Windows WDM-KS)
+-%! ## Check only the first of each unique device name.
+-%! [unq_out_name, idx_unique] = unique ({devinfo.output(:).Name});
+-%! unq_out_id = [devinfo.output(idx_unique).ID];
+-%! for i = 1:numel (unq_out_name)
+-%!   assert (audiodevinfo (0, unq_out_name{i}), unq_out_id(i));
 -%! endfor
-%! for i = 1:nin
-%!   assert (devinfo.input(i).ID, audiodevinfo (1, devinfo.input(i).Name));
+-%! [unq_in_name, idx_unique] = unique ({devinfo.input(:).Name});
+-%! unq_in_id = [devinfo.input(idx_unique).ID];
+-%! for i = 1:numel (unq_in_name)
+-%!   assert (audiodevinfo (1, unq_in_name{i}), unq_in_id(i));
 -%! endfor
 -*/
- 
+-
 #if defined (HAVE_PORTAUDIO)
 
+ enum audio_type { TYPE_INT8, TYPE_UINT8, TYPE_UINT16, TYPE_DOUBLE };
 --- a/scripts/audio/@audioplayer/audioplayer.m
 +++ b/scripts/audio/@audioplayer/audioplayer.m
@@ -130,58 +130,58 @@
@ -157,7 +163,7 @@ in ci
 #%!function [sound, status] = callback (samples)
 --- a/scripts/audio/@audiorecorder/audiorecorder.m
 +++ b/scripts/audio/@audiorecorder/audiorecorder.m
-@@ -76,42 +76,42 @@
+@@ -76,43 +76,43 @@
 
 ## Tests of audiorecorder must not actually record anything.
 
@ -183,20 +189,22 @@ in ci
 +#%! assert (size (data)(2), 2);
 
 -%!testif HAVE_PORTAUDIO; audiodevinfo (1) > 0
-%! recorder = audiorecorder;
-%! set (recorder, {"SampleRate", "Tag", "UserData"}, {8000, "tag", [1, 2; 3, 4]});
+-%! recorder = audiorecorder ();
+-%! set (recorder, {"SampleRate", "Tag", "UserData"},
+-%!                {8000, "tag", [1, 2; 3, 4]});
 -%! assert (recorder.SampleRate, 8000);
 -%! assert (recorder.Tag, "tag");
 -%! assert (recorder.UserData, [1, 2; 3, 4]);
 +#%!testif HAVE_PORTAUDIO; audiodevinfo (1) > 0
-+#%! recorder = audiorecorder;
-+#%! set (recorder, {"SampleRate", "Tag", "UserData"}, {8000, "tag", [1, 2; 3, 4]});
+#%! recorder = audiorecorder ();
+#%! set (recorder, {"SampleRate", "Tag", "UserData"},
+#%!                {8000, "tag", [1, 2; 3, 4]});
 +#%! assert (recorder.SampleRate, 8000);
 +#%! assert (recorder.Tag, "tag");
 +#%! assert (recorder.UserData, [1, 2; 3, 4]);
 
 -%!testif HAVE_PORTAUDIO; audiodevinfo (1) > 0
-%! recorder = audiorecorder;
+-%! recorder = audiorecorder ();
 -%! settable = set (recorder);
 -%! settable.SampleRate = 8000;
 -%! settable.Tag = "tag";
@ -206,7 +214,7 @@ in ci
 -%! assert (recorder.Tag, "tag");
 -%! assert (recorder.UserData, [1, 2; 3, 4]);
 +#%!testif HAVE_PORTAUDIO; audiodevinfo (1) > 0
-+#%! recorder = audiorecorder;
+#%! recorder = audiorecorder ();
 +#%! settable = set (recorder);
 +#%! settable.SampleRate = 8000;
 +#%! settable.Tag = "tag";
@ -217,14 +225,14 @@ in ci
 +#%! assert (recorder.UserData, [1, 2; 3, 4]);
 
 -%!testif HAVE_PORTAUDIO; audiodevinfo (1) > 0
-%! recorder = audiorecorder;
+-%! recorder = audiorecorder ();
 -%! recorder.SampleRate = 8000;
 -%! recorder.Tag = "tag";
 -%! recorder.UserData = [1, 2; 3, 4];
 -%! properties = get (recorder, {"SampleRate", "Tag", "UserData"});
 -%! assert (properties, {8000, "tag", [1, 2; 3, 4]});
 +#%!testif HAVE_PORTAUDIO; audiodevinfo (1) > 0
-+#%! recorder = audiorecorder;
+#%! recorder = audiorecorder ();
 +#%! recorder.SampleRate = 8000;
 +#%! recorder.Tag = "tag";
 +#%! recorder.UserData = [1, 2; 3, 4];