Mercurial > mxe-octave
changeset 6131:b663289c541d
maint: Merge release to default.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sat, 19 Mar 2022 19:29:08 +0100 |
| parents | 257395bf0d31 (current diff) ed702ff01c8e (diff) |
| children | 59871eac3409 |
| files | dist-files.mk |
| diffstat | 5 files changed, 20 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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 \
--- 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
--- 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)
--- /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
--- 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)