changeset 6664:e09548fd6932

of-control: update to v3.5.1 * src/of-control.mk: update to v3.5.1, use github * src/of-control-2-octave-9-compat.patch: update patch
author John Donoghue <john.donoghue@ieee.org>
date Sun, 26 Mar 2023 17:24:24 -0400
parents 9a9b220319b6
children 2394156e6b71
files src/of-control-2-octave-9-compat.patch src/of-control.mk
diffstat 2 files changed, 5 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/src/of-control-2-octave-9-compat.patch	Thu Mar 23 10:06:21 2023 -0400
+++ b/src/of-control-2-octave-9-compat.patch	Sun Mar 26 17:24:24 2023 -0400
@@ -17,26 +17,3 @@
                    nu, rank, dinfz,
                    nkror, nkrol, infz,
                    kronr, kronl,
-@@ -198,7 +198,7 @@
-         if (m == 1 && p == 1)
-         {
-             if (nu < n)
--                gain = c * xpow (a, double (n-1-nu)).matrix_value() * b;
-+                gain = c * octave::xpow (a, double (n-1-nu)).matrix_value () * b;
-             else
-                 gain = d;
-         }
-
---- control-3.4.0/src/lti_input_idx.cc.orig	2022-01-16 15:17:03.000000000 +0100
-+++ control-3.4.0/src/lti_input_idx.cc	2022-11-17 10:28:13.630086637 +0100
-@@ -93,8 +93,8 @@
-       offset = 1;
-     }
- 
--    Range mat_idx (1, idx-offset);
--    Range opt_idx (idx+1-offset, len);
-+    octave::range<double> mat_idx (1, idx-offset);
-+    octave::range<double> opt_idx (idx+1-offset, len);
- 
-     retval(2) = offset;     // abused as logical in the LTI constructors
-     retval(1) = opt_idx;
--- a/src/of-control.mk	Thu Mar 23 10:06:21 2023 -0400
+++ b/src/of-control.mk	Sun Mar 26 17:24:24 2023 -0400
@@ -3,12 +3,13 @@
 
 PKG             := of-control
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.5.0
-$(PKG)_CHECKSUM := a3bca75189c2d26a8883cd051d5857f3c35b3237
+$(PKG)_VERSION  := 3.5.1
+$(PKG)_CHECKSUM := 01d092e5a2ee3f66c9596380d5c5454c931f0f21
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := control-$($(PKG)_VERSION)
 $(PKG)_FILE     := control-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
+#$(PKG)_URL      := https://github.com/gnu-octave/pkg-control/archive/refs/tags/control-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := https://github.com/gnu-octave/pkg-control/releases/download/control-$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := 
 
 ifeq ($(ENABLE_BINARY_PACKAGES),yes)
@@ -16,7 +17,7 @@
 endif
 
 define $(PKG)_UPDATE
-    $(OCTAVE_FORGE_PKG_UPDATE)
+    $(call GITHUB_PKG_UPDATE,gnu-octave,pkg-control,control-)
 endef
 
 define $(PKG)_BUILD