# HG changeset patch
# User Markus Mützel <markus.muetzel@gmx.de>
# Date 1647714548 -3600
# Node ID b663289c541d50a66619bc1a0eaf6d9280349a9c
# Parent  257395bf0d31d98ce3579c0e5ec5b841779291d2# Parent  ed702ff01c8ef51e3998eee9800492a7384c9a6c
maint: Merge release to default.

diff -r 257395bf0d31 -r b663289c541d dist-files.mk
--- a/dist-files.mk	Fri Mar 18 09:58:07 2022 -0400
+++ b/dist-files.mk	Sat Mar 19 19:29:08 2022 +0100
@@ -574,6 +574,7 @@
   openscenegraph.mk \
   openssl-1-fixes.patch \
   openssl.mk \
+  opkg-biosig-1-skip-test.patch \
   opkg-biosig.mk \
   opus.mk \
   opusfile.mk \
diff -r 257395bf0d31 -r b663289c541d src/libbiosig-1-gcc11.patch
--- a/src/libbiosig-1-gcc11.patch	Fri Mar 18 09:58:07 2022 -0400
+++ b/src/libbiosig-1-gcc11.patch	Sat Mar 19 19:29:08 2022 +0100
@@ -28,7 +28,7 @@
  	LD      := xild
 -	AR      := xiar crs
 +	ARFLAGS ?= crs
-+	AR      := xiar
++	AR      ?= xiar
  else
  	PREFIX  := $(subst /bin/,/,$(dir $(shell which $(TARGET)-gcc)))
 -	CC      := $(TARGET)-gcc
@@ -41,9 +41,9 @@
 +	AR      ?= $(TARGET)-ar
 +	ARFLAGS ?= rcs
 +	PKGCONF ?= $(TARGET)-pkg-config
+ 	TARGETPLATFORM = windows
  	ifneq (,$(findstring mingw,$(TARGET)))
  		## add gnulib's getlogin
- 		SOURCES += win32/getlogin.c win32/getline.c win32/getdelim.c
 @@ -136,6 +142,8 @@ else
  	endif
  endif
diff -r 257395bf0d31 -r b663289c541d src/libbiosig.mk
--- a/src/libbiosig.mk	Fri Mar 18 09:58:07 2022 -0400
+++ b/src/libbiosig.mk	Sat Mar 19 19:29:08 2022 +0100
@@ -4,8 +4,8 @@
 PKG             := libbiosig
 $(PKG)_WEBSITE  := http://biosig.sf.net/
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.3.2
-$(PKG)_CHECKSUM := 51b20ea75e927966cc14cf5d88e6cc9aa7ab06ea
+$(PKG)_VERSION  := 2.4.0
+$(PKG)_CHECKSUM := 665b64d67382c3fc21b0751e0a09026cad71c5ad
 $(PKG)_SUBDIR   := biosig-$($(PKG)_VERSION)
 $(PKG)_FILE     := biosig-$($(PKG)_VERSION).src.tar.gz
 $(PKG)_URL      := https://sourceforge.net/projects/biosig/files/BioSig%20for%20C_C%2B%2B/src/$($(PKG)_FILE)
diff -r 257395bf0d31 -r b663289c541d src/opkg-biosig-1-skip-test.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/opkg-biosig-1-skip-test.patch	Sat Mar 19 19:29:08 2022 +0100
@@ -0,0 +1,13 @@
+Skip test if "nan" package isn't loaded
+
+--- biosig4octave-2.4.0/inst/t400_Classification/sumskipnan.m.orig	2022-03-19 12:21:44.000000000 +0100
++++ biosig4octave-2.4.0/inst/t400_Classification/sumskipnan.m	2022-03-19 19:13:19.308144348 +0100
+@@ -188,4 +188,7 @@
+ %!assert(sumskipnan([1,NaN],2),1)
+ %!assert(sumskipnan([1,NaN],2),1)
+ %!assert(sumskipnan([nan,1,4,5]),10)
+-%!assert(sumskipnan([nan,1,4,5]',1,[3;2;1;0]),6)
++%!test
++%! if (exist('sumskipnan_mex'))
++%!   assert(sumskipnan([nan,1,4,5]',1,[3;2;1;0]),6);
++%! end
diff -r 257395bf0d31 -r b663289c541d src/opkg-biosig.mk
--- a/src/opkg-biosig.mk	Fri Mar 18 09:58:07 2022 -0400
+++ b/src/opkg-biosig.mk	Sat Mar 19 19:29:08 2022 +0100
@@ -3,8 +3,8 @@
 
 PKG             := opkg-biosig
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.3.2
-$(PKG)_CHECKSUM := 184c28c0625caafc3c8fb1e820ed7336bb218473
+$(PKG)_VERSION  := 2.4.0
+$(PKG)_CHECKSUM := c743104205d09c0ad7de0e4d6718f90c29fa1c56
 $(PKG)_SUBDIR   := biosig4octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := $($(PKG)_SUBDIR).src.tar.gz
 $(PKG)_URL      := https://pub.ist.ac.at/~schloegl/biosig/prereleases/$($(PKG)_FILE)