Mercurial > mxe-octave

changeset 6190:d7c8660c55c4 release

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-signal: update to v1.4.2 * src/of-signal.mk: update version, checksum * src/of-signal-1-deprecated-warnings.patch: removed * src/of-signal-2-error_state.patch: removed * dist-files.mk: update for removed files (grafted from 4fcf129648a7b2ab0f6874a028f63cab4d0e2a0e)
author John Donoghue <john.donoghue@ieee.org>
date Sat, 23 Apr 2022 10:08:21 -0400
parents 1d3ec84b2a49
children 8b23f76955c6
files dist-files.mk src/of-signal-1-deprecated-warnings.patch src/of-signal-2-error_state.patch src/of-signal.mk
diffstat 4 files changed, 2 insertions(+), 157 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Sat Apr 23 15:42:36 2022 +0200
+++ b/dist-files.mk	Sat Apr 23 10:08:21 2022 -0400
@@ -533,8 +533,6 @@
   of-quaternion.mk \
   of-queueing-1-octave7.patch \
   of-queueing.mk \
-  of-signal-1-deprecated-warnings.patch \
-  of-signal-2-error_state.patch \
   of-signal.mk \
   of-sockets.mk \
   of-sparsersb-1-no-internal-mex-fcns.patch \
--- a/src/of-signal-1-deprecated-warnings.patch	Sat Apr 23 15:42:36 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-diff -uNr a/src/Makefile b/src/Makefile
---- a/src/Makefile	2019-02-08 17:00:37.000000000 -0500
-+++ b/src/Makefile	2021-08-20 01:01:13.437770211 -0400
-@@ -19,7 +19,7 @@
- MKOCTFILE ?= mkoctfile
- SED       ?= sed
- 
--PKG_CXXFLAGS := -Wall -Wno-deprecated-declarations $(PKG_CXXFLAGS_APPEND)
-+PKG_CXXFLAGS := -Wall $(PKG_CXXFLAGS_APPEND)
- 
- OCT_FILES = \
-   __fwht__.oct \
--- a/src/of-signal-2-error_state.patch	Sat Apr 23 15:42:36 2022 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-# HG changeset patch
-# User Markus Mützel <markus.muetzel@gmx.de>
-# Date 1637941971 -3600
-#      Fri Nov 26 16:52:51 2021 +0100
-# Node ID 8d0372aeaf46d24f1d1b22ffc1bbfa32e7623250
-# Parent  7f535130c1912a5cc5021b5a761be02509219738
-Fix compilation with Octave 8 (bug #61564).
-
-* src/cl2bp.cc (Fcl2bp), src/sosfilt.cc (Fsosfilt), src/upfirdn.cc (Fupfirdn):
-Remove usage of `error_state`. It was unconditionally set to 0 since about 6
-years ago and will finally be removed in Octave 8.
-
-diff -r 7f535130c191 -r 8d0372aeaf46 src/cl2bp.cc
---- a/src/cl2bp.cc	Thu Jun 17 00:46:56 2021 +0200
-+++ b/src/cl2bp.cc	Fri Nov 26 16:52:51 2021 +0100
-@@ -89,30 +89,10 @@
-   }
- 
-   const int m = args(0).int_value(true);
--  if (error_state) {
--    err_wrong_type_arg ("cl2bp", args(0));
--    return retval;
--  }
-   const double w1 = args(1).double_value();
--  if (error_state) {
--    err_wrong_type_arg ("cl2bp", args(1));
--    return retval;
--  }
-   const double w2 = args(2).double_value();
--  if (error_state) {
--    err_wrong_type_arg ("cl2bp", args(2));
--    return retval;
--  }
-   const ColumnVector up_vector(args(3).vector_value());
--  if (error_state) {
--    err_wrong_type_arg ("cl2bp", args(3));
--    return retval;
--  }
-   const ColumnVector lo_vector(args(4).vector_value());
--  if (error_state) {
--    err_wrong_type_arg ("cl2bp", args(4));
--    return retval;
--  }
-   if (up_vector.numel() != 3 || lo_vector.numel() != 3) {
-     error("cl2bp: The up and lo vectors must contain 3 values");
-     return retval;
-@@ -126,10 +106,6 @@
-   }
- 
-   const int L = args(5).int_value(true);
--  if (error_state) {
--    err_wrong_type_arg ("cl2bp", args(5));
--    return retval;
--  }
-   if (L > 1000000) {
-     error("cl2bp: The \"gridsize\" parameter cannot exceed 1000000");
-     return retval;
-diff -r 7f535130c191 -r 8d0372aeaf46 src/sosfilt.cc
---- a/src/sosfilt.cc	Thu Jun 17 00:46:56 2021 +0200
-+++ b/src/sosfilt.cc	Fri Nov 26 16:52:51 2021 +0100
-@@ -55,12 +55,6 @@
- 
-   Matrix sos( args(0).matrix_value() );
- 
--  if (error_state)
--    {
--      err_wrong_type_arg ("sosfilt", args(0));
--      return retval;
--    }
--
-   if (sos.columns() != 6)
-     {
-       error("Second-order section matrix must be a non-empty Lx6 matrix");
-@@ -69,12 +63,6 @@
- 
-   Matrix x( args(1).matrix_value() );
- 
--  if (error_state)
--    {
--      err_wrong_type_arg ("sosfilt", args(1));
--      return retval;
--    }
--
-   int n=x.rows();
-   int m=x.columns();
- 
-diff -r 7f535130c191 -r 8d0372aeaf46 src/upfirdn.cc
---- a/src/upfirdn.cc	Thu Jun 17 00:46:56 2021 +0200
-+++ b/src/upfirdn.cc	Fri Nov 26 16:52:51 2021 +0100
-@@ -107,51 +107,19 @@
-     }
- 
-   ColumnVector h (args (1).vector_value ());
--
--  if (error_state)
--    {
--      err_wrong_type_arg ("upfirdn", args(1));
--      return retval;
--    }
--
-   octave_idx_type p = args (2).idx_type_value ();
--
--  if (error_state)
--    {
--      err_wrong_type_arg ("upfirdn", args(2));
--      return retval;
--    }
--
-   octave_idx_type q = args (3).idx_type_value ();
- 
--  if (error_state)
--    {
--      err_wrong_type_arg ("upfirdn", args(3));
--      return retval;
--    }
--
-   // Do the dispatching
-   if (octave::signal::isreal (args (0)))
-     {
-       Matrix x = args (0).matrix_value ();
--      if (error_state)
--        {
--          err_wrong_type_arg ("upfirdn", args(0));
--          return retval;
--        }
--
-       Matrix y = upfirdn (x, h, p, q);
-       retval (0) = y;
-     }
-   else if (octave::signal::iscomplex (args (0)))
-     {
-       ComplexMatrix x = args (0).complex_matrix_value ();
--      if (error_state)
--        {
--          err_wrong_type_arg ("upfirdn", args(0));
--          return retval;
--        }
--
-       ComplexMatrix y = upfirdn (x, h, p, q);
-       retval (0) = y;
-     }
--- a/src/of-signal.mk	Sat Apr 23 15:42:36 2022 +0200
+++ b/src/of-signal.mk	Sat Apr 23 10:08:21 2022 -0400
@@ -3,8 +3,8 @@
 
 PKG             := of-signal
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.4.1
-$(PKG)_CHECKSUM := 67519c28868659a54363420d5bfc2621c31f8fdb
+$(PKG)_VERSION  := 1.4.2
+$(PKG)_CHECKSUM := 39dc1c4f1060c004c063ed8ea57fc46884745a99
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := signal-$($(PKG)_VERSION)
 $(PKG)_FILE     := signal-$($(PKG)_VERSION).tar.gz