Compare commits

...

206 Commits

Author SHA1 Message Date
Orion Poplawski c32f37ff6c Drop use of %buildarch in macros.octave (bugz#1733898) 2019-07-31 07:40:27 -06:00
Fedora Release Engineering ce1b1e3f1c - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 23:06:32 +00:00
Orion Poplawski ca67dd2418 Merge branch '5.1'
Conflicts:
	octave-eof.patch
	octave.spec
2019-06-16 20:39:15 -06:00
Orion Poplawski 6d9787ef24 Backport upstream patch for proper EOF handling (bugz#1705129)
Conflicts:
	octave.spec
2019-05-06 22:00:25 -06:00
Orion Poplawski be280a1c77 Backport upstream patch for proper EOF handling (bugz#1705129) 2019-05-06 21:47:37 -06:00
Orion Poplawski 4d71e9d666 Upload docs 2019-04-26 22:24:25 -06:00
Björn Esser ac98714773
rebuilt (sundials) 2019-04-23 14:46:57 +02:00
Orion Poplawski f46e7e224d Rebuild for hdf5 1.10.5 2019-03-16 08:56:10 -06:00
Orion Poplawski 40604e5e23 Update to 5.1.0 2019-03-10 13:01:37 -06:00
Tim Landscheidt 41506049ba Remove obsolete requirements for post/preun scriptlets 2019-03-07 04:29:59 +00:00
Igor Gnatenko a4a6e500dc Rebuild for readline 8.0 2019-02-17 09:30:52 +01:00
Björn Esser f2776ae5a4
rebuilt (qscintilla) 2019-02-16 11:53:27 +01:00
Björn Esser 898001d61a
rebuilt (qscintilla), fix pre-release tag 2019-02-12 20:29:15 +01:00
Fedora Release Engineering 3c8786cf4c - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 17:02:58 +00:00
Igor Gnatenko dde1598fa6 Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:23 +01:00
Igor Gnatenko 34cca03626
Remove obsolete scriptlets
References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-01-27 19:39:37 +01:00
Orion Poplawski 281df3b846 Update to 4.4.1 2018-11-11 17:34:07 -07:00
Fedora Release Engineering 65d166658d - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 14:51:43 +00:00
Colin B. Macdonald e487e99ed8 macros: support other names for appdata .metainfo.xml files 2018-07-01 23:23:18 -07:00
Colin B. Macdonald eb697c174d macros: support dependencies in octave_pkg_check 2018-06-28 20:47:29 -07:00
Orion Poplawski 4ca05c4c51 Add patch to fix crash with Ctrl-D (bug #1589460) 2018-06-21 22:22:57 -06:00
Orion Poplawski c1e8f566e9 Add requires hicolor-icon-theme
Use make macros
2018-06-17 19:53:21 -06:00
Jerry James 215f4cd777 Add -qbuttongroup patch to fix FTBFS. 2018-06-02 14:51:14 -06:00
Jerry James f3e519677e Rebuild for glpk 4.65. Use ldconfig macros. 2018-06-02 11:11:05 -06:00
Orion Poplawski 8b252cc278 Update to 4.2.2
Fail build again if make check fails
2018-03-14 14:32:37 -06:00
Orion Poplawski 87988a9b98 Add BR gcc-c++ 2018-02-21 22:11:52 -07:00
Jitka Plesnikova ba7b24b360 Rebuild for hdf5 1.8.20 2018-02-08 08:35:55 +01:00
Jitka Plesnikova 6fd19dd7db Rebuild for new gfortran 2018-02-05 10:44:49 +01:00
Igor Gnatenko a8eabca1f1 Remove obsolete scriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-01-06 00:16:10 +01:00
Susi Lehtola 4968a9bfca Fix typo in changelog date. 2017-10-31 16:42:09 +01:00
Orion Poplawski ece309dafa Make octave-devel require libappstream-glib 2017-08-13 19:26:04 -06:00
Orion Poplawski ba0a203672 Run appstream-util validate-relax on metainfo.xml files 2017-08-12 09:12:44 -06:00
Orion Poplawski 59b6110649 Use openblas on Fedora 27+ 2017-08-11 20:08:42 -06:00
Orion Poplawski 62c24c83f6 Fix date 2017-08-10 22:34:28 -06:00
Orion Poplawski 86c9c906ba Install metainfo.xml files in %octave_pkg_install 2017-08-10 22:33:13 -06:00
Fedora Release Engineering 10e6ae1fcf - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 04:22:18 +00:00
Fedora Release Engineering 5496bad895 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 01:34:04 +00:00
Orion Poplawski 30520dbd34 Use Qt5 on Fedora 26+ 2017-06-13 17:11:11 -06:00
Jerry James c0a84372b0 Rebuild for glpk 4.61 2017-04-05 15:56:22 -06:00
Orion Poplawski 435717d94e Update to 4.2.1 2017-02-24 20:59:28 -07:00
Rex Dieter 295daff22e rebuild (qscintilla) 2017-02-20 13:05:15 -06:00
Orion Poplawski ed607fc8fe Have %octave_pkg_check re-strip shared objects 2017-02-08 11:02:56 -07:00
Orion Poplawski 6e13652dc2 Rebuild with fixed pkgconf (bug #1419685) 2017-02-07 17:01:11 -07:00
Björn Esser 752dd439a7 Rebuilt for GCC-7 2017-01-28 10:03:53 +01:00
Igor Gnatenko e3f25b5d98 Rebuild for readline 7.x
Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
2017-01-12 17:30:35 +01:00
Kalev Lember d752630df2 Fix license in appdata file (bug #1293561) 2016-12-29 14:58:13 +01:00
Orion Poplawski 5c42e75d55 Handle noarch package tarball names 2016-12-09 14:40:15 -07:00
Orion Poplawski a9fb7eb79e Patch gzip from upstream bug report 2016-12-09 08:43:38 -07:00
Orion Poplawski efad2fcffe Try to get more info from gzip failure 2016-12-09 07:56:31 -07:00
Orion Poplawski 9924aa8c95 Disable more segfaulting tests 2016-12-08 17:02:36 -07:00
Orion Poplawski 29021ae262 Add patch to prevent gzip from deleting target file, instead emit warning
Drop debug code
Disable segfaulting osmesa_print and pltopt tests
2016-12-08 14:28:22 -07:00
Orion Poplawski 4db3872ff9 Fix version option 2016-12-08 07:06:04 -07:00
Orion Poplawski 8fd8b50df3 A desparate attempt to debug octave package building 2016-12-07 20:53:25 -07:00
Orion Poplawski 7a5c2dba41 Build in a build sub-directory 2016-12-07 14:36:17 -07:00
Orion Poplawski af0420f223 Use 'octave-config -p CANONICAL_HOST_TYPE' in macros 2016-12-07 11:01:23 -07:00
Orion Poplawski 22d0d4e8c1 Use %_host in macros 2016-12-07 07:37:25 -07:00
Orion Poplawski 171daaaa9d Rework pkg build/install macros 2016-12-06 22:44:18 -07:00
Orion Poplawski 6780ddd891 Drop old _licensedir hack 2016-12-06 14:43:16 -07:00
Orion Poplawski 77e3a20210 Fix typo in implicit patch 2016-12-06 14:39:50 -07:00
Orion Poplawski 4282ff55b7 Update to 4.2.0
- Drop texinfo5 patch
- Use autoreconf -i
- Add requires for latex packages
- Add implicit patch
2016-12-06 14:23:11 -07:00
Orion Poplawski 3e0830ac09 Rebuild for hdf5 1.8.18 2016-12-06 11:50:32 -07:00
Orion Poplawski 5d21b4dde3 Add upstream patch to fix build with texinfo 5 on <=EL7 2016-09-09 13:30:27 -06:00
Orion Poplawski 771edb2197 Update to 4.0.3 2016-07-03 18:48:43 -06:00
Orion Poplawski ae32e98ac3 Rebuild for hdf5 1.8.17 2016-06-29 12:19:49 -06:00
Ralf Corsépius ac0b0ffd76 Rebuild for qhull-2015.2-1. 2016-04-29 16:13:42 +02:00
Orion Poplawski e59f23e101 Update to 4.0.2 2016-04-21 21:51:38 -06:00
Orion Poplawski 6bcde251c2 Add upstream patch to fix setting TERM variable (bug #1325548) 2016-04-10 08:41:41 -06:00
Orion Poplawski e5f557f57e Arm tests appear to be running okay now (bug #1149953) 2016-04-04 14:27:26 -06:00
Orion Poplawski 8e983362f7 Swap quoting in octave macros to make set -x output a little cleaner
- Stop trying to turn octave warnings off in macros
2016-03-24 17:21:20 -06:00
Orion Poplawski e2ff30f6ae Update requirements for EL7 2016-03-23 22:20:57 -06:00
Orion Poplawski 99d8de70d2 Update signbit patch from gnulib upstream to work with older compilers
- Only munge headers for gnulib on Fedora 24+
2016-03-23 19:37:55 -06:00
Orion Poplawski fe93f47194 libappstream-glib is not in EL6 2016-03-22 16:55:12 -06:00
Orion Poplawski 759128ade8 Fix changelog date 2016-03-22 10:05:54 -06:00
Orion Poplawski a4990edc1a Update to 4.0.1
- Drop upstream texinfo patch
2016-03-22 10:04:28 -06:00
Orion Poplawski f8eb2026e1 Rebuild for glpk 4.59 2016-03-11 12:44:17 -07:00
Orion Poplawski f932eb0a76 Fix build with gcc 6 2016-02-21 09:57:14 -07:00
Orion Poplawski 64a641d9d1 Rebuild for glpk 4.58 2016-02-18 11:27:16 -07:00
Fedora Release Engineering eab9923c9a - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-04 11:13:24 +00:00
Orion Poplawski f49b342e6b Rebuild for poppler-0.40.0 2016-01-22 09:03:47 -07:00
Orion Poplawski b4951bcb7a Rebuild for hdf5 1.8.16 2016-01-21 12:16:31 -07:00
Orion Poplawski 39d78f96a8 Bump release 2015-12-30 16:23:51 -07:00
Orion Poplawski 7b50839be2 Validate and fix appdata file (bug #1293561) 2015-12-30 16:21:33 -07:00
Orion Poplawski eeba023183 Add BR libsndfile-devel and portaudio-devel for audio support (bug #1279924) 2015-11-11 09:50:38 -07:00
Orion Poplawski c284f8407b Remove unused fftpack code, note bundled libraries 2015-10-06 08:55:42 -06:00
Rex Dieter af1955fe66 rebuild (GraphicsMagick) 2015-10-04 20:01:28 -05:00
Orion Poplawski b605586312 Keep on_uninstall.m around so rpm does not complain on removal 2015-07-31 11:04:19 -06:00
Orion Poplawski 5ebd21d577 Add octave_pkg_check rpm macro, other macro cleanup 2015-07-31 08:17:24 -06:00
Orion Poplawski 9bf4ad0090 Handle rpm macros dir for EL6 2015-07-29 16:38:32 -06:00
Orion Poplawski c74f2dac08 Fix builds on older versions:
- texlive-collection-fontsrecommended doesn't exist on EL6
- Add BR zip for tests.
- Do not patch docs if we aren't building them
- Add %license conditional
2015-07-29 15:19:36 -06:00
Orion Poplawski 626ba12bb6 Add patch to fix build with texinfo 6.0 2015-07-14 13:26:11 -06:00
Dan Horák 21dae87daf - build without the dummy Xorg driver on s390(x) 2015-07-13 09:40:05 -04:00
Dan Horák 6f1ea798f7 add ppc64le into 64-bit arches 2015-07-13 07:20:23 -04:00
Orion Poplawski 867ed9249b Update to 4.0.0
- Rebase pkgbuilddir patch
- Drop suitesparse patch
- Run X server for tests
2015-07-06 14:37:14 -06:00
Dennis Gilmore 40d01e441e - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-17 23:39:22 +00:00
Nils Philippsen be9e4d6375 rebuild for suitesparse-4.4.4 2015-06-11 23:26:19 +02:00
Orion Poplawski 8c3c9ac2fc Fix doc install (bug #799662) 2015-05-28 14:54:32 -06:00
Orion Poplawski 2b25bd0b11 Rebuild for hdf5 1.8.15 2015-05-17 16:23:20 -06:00
Rex Dieter c725d03dbd rebuild (qscintilla) 2015-04-20 22:15:32 -05:00
Richard Hughes f37d8228d5 Add an AppData file for the software center 2015-03-26 16:39:40 +00:00
Orion Poplawski 65f15f3bff Build with --enable-float-truncate (https://savannah.gnu.org/bugs/?40560)
- Re-enable parallel builds
2015-03-10 21:59:10 -06:00
Rex Dieter de6c316c2c fix changelog style 2015-03-10 18:23:37 -05:00
Rex Dieter d7cf4c5489 rebuild (GraphicsMagick) 2015-03-09 07:59:37 -05:00
Orion Poplawski 647ec3eb2d Rebuild for rebuilt swig 2015-02-20 10:11:02 -07:00
Orion Poplawski fd473f28f1 Rebuild for fltk 1.3.3 2015-02-18 10:23:20 -07:00
Orion Poplawski ce2cac73ef Rebuild for gcc 5 C++11 ABI 2015-02-17 10:34:55 -07:00
Orion Poplawski 087e8477a8 Use a generic location for libjvm.so, require java-headless (bug #1190523) 2015-02-08 19:35:24 -07:00
Orion Poplawski dc21003374 Rebuild for hdf5 1.8.14 2015-01-07 14:09:09 -07:00
Orion Poplawski ccd7a1b418 Disable test failure on arm for now (bug #1149953) 2014-10-06 21:42:36 -06:00
Orion Poplawski d35fb0b3bb Fix suitesparse patch 2014-09-16 16:43:44 -06:00
Orion Poplawski 864212af38 Add patch for suitesparse 4.3.1 support 2014-09-15 17:43:40 -06:00
Orion Poplawski c6df50bec9 Rebuild for libcholmod soname bump 2014-09-12 14:06:26 -06:00
Orion Poplawski f154d8918d No info scripts when not building docs 2014-08-23 12:48:21 -06:00
Orion Poplawski acb81ba207 Install macros.texi by hand if not building docs 2014-08-22 15:38:16 -06:00
Peter Robinson f8bbaaf0ca - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-17 13:18:03 +00:00
Orion Poplawski d336bc6072 Disable doc building on EL7 for now 2014-08-15 16:25:41 -06:00
Orion Poplawski c2bac1837e Update to 3.8.2 final 2014-08-14 11:37:51 -06:00
Susi Lehtola d847d029ac Update to 3.8.2 rc2. 2014-07-03 19:21:04 +02:00
Susi Lehtola 4b94ef1f76 Update to 3.8.2-rc1, which seems to fix the FTBFS. 2014-06-10 08:04:06 +03:00
Dennis Gilmore ffa5cf4141 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 10:58:26 -05:00
Susi Lehtola 7d14c30d96 Update to 3.8.1. 2014-03-07 17:32:57 +02:00
Orion Poplawski 51fc18c4f3 Use new atlas for RHEL7 2014-02-12 07:16:18 -07:00
Peter Robinson 25b25042b7 Add PPC64 and aarch64 to the 64 bit architectures 2014-02-08 11:07:17 +00:00
Orion Poplawski 0636ce0a66 Fix rpm macro install location 2014-02-01 12:22:03 -07:00
Orion Poplawski 26a4442558 Also fix base-list.h include 2014-01-14 17:04:15 -07:00
Orion Poplawski a3e449d179 Really fix config.h include 2014-01-09 13:39:49 -07:00
Orion Poplawski a7fc062a47 Fix config.h include 2014-01-08 14:13:17 -07:00
Orion Poplawski ba5b114ec5 Update to 3.8.0 final 2013-12-28 23:02:10 -07:00
Orion Poplawski c1d8aeaac9 Drop old patches 2013-12-28 16:34:14 -07:00
Orion Poplawski c146c589df Add -nodeps to %octave_pkg_build macro 2013-12-28 16:33:27 -07:00
Orion Poplawski 1d2756f340 Rebase pkgbuilddir patch 2013-12-28 16:22:05 -07:00
Orion Poplawski 728dc359a5 Rebuild for hdf5 1.8.12 2013-12-27 15:58:35 -07:00
Susi Lehtola 3f64382f50 Update to 3.8.0-rc2. Disable JIT as it segfaults on ARM. 2013-12-24 01:22:16 +02:00
Orion Poplawski b3bb96f3e8 Add BR java-devel, llvm-devel 2013-12-07 10:20:08 -07:00
Orion Poplawski d3308c2639 Drop OctaveFaq 2013-12-07 08:40:24 -07:00
Orion Poplawski c882fe1a29 Add BR qscintilla-devel; drop tabs 2013-12-07 00:04:59 -07:00
Orion Poplawski 002415fbbc Bump octave_api; new location for version.h 2013-12-07 00:01:49 -07:00
Orion Poplawski 16790e8ae2 - Update to 3.8.0-rc1
- Drop patches
- Add BR gl2ps-devel
2013-12-06 23:56:57 -07:00
Nils Philippsen 2ec9c49158 rebuild (suitesparse) 2013-12-06 10:36:56 +01:00
Orion Poplawski af1c21dde0 Bump release 2013-10-03 16:44:02 -06:00
Orion Poplawski ce5a101def - Re-enable atlas on arm 2013-10-03 16:27:43 -06:00
Orion Poplawski 73d63f43e9 Add BR blas-devel, lapack-devel on arm 2013-09-25 22:00:26 -06:00
Orion Poplawski 93775a2aac Disable atlas on arm 2013-09-25 21:36:35 -06:00
Björn Esser 28ca6912c0 fix-up bogus dates 2013-09-23 13:01:34 +02:00
Orion Poplawski 75de6772a0 Handle new atlas library names - use threaded library 2013-09-21 22:25:09 -06:00
Orion Poplawski 12e522a899 Rebuild for atlas 3.10 2013-09-21 20:26:18 -06:00
Dan Horák e4a59759e5 - Rebuilt to resolve broken deps on s390(x) 2013-09-12 19:55:26 +02:00
Orion Poplawski 61a37b4192 Drop %defattr 2013-08-08 12:12:08 -06:00
Orion Poplawski 697f0921e3 Drop BR tetex, not needed 2013-08-08 12:11:09 -06:00
Orion Poplawski 1083a4ac1d Rebuild for glpk 4.52.1 2013-07-30 13:32:46 -06:00
Orion Poplawski 780d24ed1c Rebuild for hdf5 1.8.11 2013-05-16 12:33:15 -06:00
Jaromir Capik a897d03bd2 - aarch64 support (#926264) 2013-03-28 13:01:43 +01:00
Ralf Corsépius 4d988ce50d Remove %config from %{_sysconfdir}/rpm/macros.*
(https://fedorahosted.org/fpc/ticket/259).
2013-03-08 08:11:58 +01:00
Orion Poplawski 9b6b623cd9 Update to 3.6.4 final 2013-02-23 18:50:29 -07:00
Orion Poplawski 89d96cf4ca Fix name for desktop file 2013-02-12 11:20:44 -07:00
Orion Poplawski b52feb73ca Update to 3.6.4-rc2 2013-02-12 09:50:56 -07:00
Orion Poplawski 5a531d84fb Drop vendor from desktop file 2013-02-12 09:35:22 -07:00
Kevin Fenzi 57fe3b2a73 Rebuild for broken deps in rawhide 2013-02-03 13:02:00 -07:00
Orion Poplawski bd1ae277fe Update to 3.6.4-rc1
Drop gets patch
2013-01-05 07:59:21 -07:00
Orion Poplawski 77aff487ff Add patch to ignore deps when building packages for now (bug 733615) 2012-12-21 21:11:43 -07:00
Orion Poplawski 61b8aad6dc Restore gets patch
Rebuild for hdf5 1.8.10
2012-12-05 10:50:22 -07:00
Orion Poplawski 71fb6f0e2d Update to 3.6.4-rc0
Drop sparse patch applied upstream
2012-10-17 22:17:12 -06:00
Orion Poplawski a33f0eddc8 Add upstream patch to fix sparse matrix test crash 2012-09-06 11:46:59 -06:00
Orion Poplawski c7cdff71c3 Update to 3.6.3
- Drop gets patch fixed upstream
2012-09-05 16:53:55 -06:00
Dennis Gilmore e2087521e0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-20 01:18:47 -05:00
Jussi Lehtola 7c56677293 Build against OpenGL libraries. 2012-07-05 05:45:31 +03:00
Orion Poplawski 4723bbe907 Update to 3.6.2 final 2012-06-04 14:36:23 -06:00
Orion Poplawski 07d25f45de Update to 3.6.2-rc2
Add patch to update gnulib to handle gets removal
2012-05-24 20:55:12 -06:00
Orion Poplawski 862a4ce761 Rebuild with hdf5 1.8.9 2012-05-15 15:56:23 -06:00
Orion Poplawski 5a4de1ebda Add Provides bundled(gnulib) (bug 821781) 2012-05-15 11:43:28 -06:00
Orion Poplawski 032ca8c25d Add macros for handling release candidates 2012-05-14 11:11:55 -06:00
Orion Poplawski 30ccb76841 Update to 3.6.2-rc0. 2012-05-12 20:43:13 -06:00
Dennis Gilmore 13e9b5a14d - Rebuilt for c++ ABI breakage 2012-02-28 13:24:47 -06:00
Orion Poplawski f4a1a1c2b6 Update to 3.6.1. 2012-02-22 20:16:26 -07:00
Orion Poplawski b03c7174c6 Rebuild with pcre 8.30 2012-02-09 16:36:40 -07:00
Jussi Lehtola 1ef7abfa87 Disable SMP build. 2012-01-16 10:27:45 +02:00
Jussi Lehtola caa77f94c5 Update to 3.6.0. 2012-01-16 10:12:46 +02:00
Jussi Lehtola 342625de91 Update to 3.6.0. 2012-01-16 10:09:26 +02:00
Dennis Gilmore 74d838797a - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-13 05:27:21 -06:00
Jussi Lehtola 834892e5b5 Get rid of spurious } in octave_api macro. 2011-12-16 01:42:54 +02:00
Orion Poplawski 1e0f3d98c0 Rebuild for hdf5 1.8.8 2011-11-18 14:44:20 -07:00
Orion Poplawski a4a8bae8e3 Update to 3.4.3
Drop upstreamed patches
2011-10-24 21:45:12 -06:00
Jussi Lehtola b108d3146b Place macros in -devel. 2011-08-24 19:54:24 +03:00
Orion Poplawski 1605c403eb Drop smp build - seems to be failing
Add patch to fix tar argument handling
Add patch to fix xzip
2011-08-11 15:18:49 -06:00
Jussi Lehtola 2eb0eabb3a Patch to get package to build in rawhide. 2011-08-06 12:07:29 +03:00
Jussi Lehtola e00ea4db3d Fix typo. 2011-08-06 11:24:44 +03:00
Jussi Lehtola 6617c32387 Update to 3.4.2. 2011-08-06 11:18:27 +03:00
Jussi Lehtola 8aedd34a03 Update to 3.4.2. 2011-08-06 10:46:53 +03:00
Jussi Lehtola 7d9020ec1b Update to 3.4.2. 2011-08-06 10:44:15 +03:00
Orion Poplawski c9d48722b5 Make that tex(dvips) 2011-05-27 08:51:13 -06:00
Orion Poplawski 2180c3afad Add patch to fix Fl_File_Chooser.H location
Add BR dvips
2011-05-27 08:05:10 -06:00
Orion Poplawski 3d0821b1a7 Rebuild for fltk 1.3.0 2011-05-26 13:25:02 -06:00
Orion Poplawski e82abefcda Rebuild for hdf5 1.8.7 2011-05-17 21:53:17 -06:00
Orion Poplawski 265a73c346 Use libdir instead of libexecdir
Rename octave_pkg_preun macro
Fix multilib installs
Re-enable prelinking, seems to work
Add patch to enable building packages from directories
2011-03-30 11:09:06 -06:00
Orion Poplawski 6948e3e45a Fix %octpkgdir 2011-02-23 10:56:38 -07:00
Orion Poplawski b62f115556 Update rpm macros per FPC comments 2011-02-23 10:40:13 -07:00
Orion Poplawski c8ee627a0e Merge from f15 2011-02-23 10:24:48 -07:00
Orion Poplawski 3fb3124a02 Disable parallel builds 2011-02-14 15:34:34 -07:00
Orion Poplawski cf6b5f2a23 Add rpm macros
Rebuild should pick up fixed suitesparse
2011-02-14 14:51:21 -07:00
Orion Poplawski 582974b374 Add note about bundled libs: arpack, gl2ps, others? 2011-02-13 08:33:16 -07:00
Orion Poplawski 4c96691d18 Add note about bundled libs: arpack, gl2ps, others? 2011-02-13 08:32:34 -07:00
Dennis Gilmore c1ffcc58a2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-08 20:21:08 -06:00
Orion Poplawski ce945d9459 - Update to 3.4.0
- Drop run-octave patch fixed upstream
- Add patch to support gcc 4.6
2011-02-08 10:55:39 -07:00
Orion Poplawski c427094f21 - Update to 3.3.54
- Add patch to prevent run-octave from getting installed
- Drop -DH5_USE_16_API
- Enable parallel builds
- Cleanup doc instal
2010-12-21 10:41:07 -07:00
Fedora Release Engineering 83a398c8ec dist-git conversion 2010-07-29 04:49:51 +00:00
alexlan 4d202ad752 - Temporarily disable %%check to enable build to complete and ensure
upgrade path works. This works around a crash in the imread.m image
    test script, this may be the same problem as described by upstream
    here:
    https://www-old.cae.wisc.edu/pipermail/octave-maintainers/2010-January/
    014891.html
2010-03-01 00:08:53 +00:00
alexlan 25798c44ce - Fix the prelink workaround to work with any version.
- Use _sysconfdir macro instead of /etc.
2010-02-28 23:08:24 +00:00
11 changed files with 1650 additions and 140 deletions

View File

@ -1 +0,0 @@
octave-3.2.4.tar.bz2

34
.gitignore vendored Normal file
View File

@ -0,0 +1,34 @@
octave-3.2.4.tar.bz2
/octave-3.3.54.tar.bz2
/octave-3.4.0.tar.bz2
/octave-3.4.2.tar.bz2
/octave-3.4.3.tar.bz2
/octave-3.6.0.tar.bz2
/octave-3.6.1.tar.bz2
/octave-3.6.2-rc0.tar.bz2
/octave-3.6.2-rc2.tar.bz2
/octave-3.6.2.tar.bz2
/octave-3.6.3.tar.bz2
/octave-3.6.4-rc0.tar.bz2
/octave-3.6.4-rc1.tar.gz
/octave-3.6.4-rc2.tar.gz
/octave-3.6.4.tar.bz2
/octave-3.8.0-rc1.tar.gz
/octave-3.8.0-rc2.tar.gz
/octave-3.8.0.tar.bz2
/octave-3.8.1.tar.bz2
/octave-3.8.2-rc1.tar.gz
/octave-3.8.2-rc2.tar.gz
/octave-3.8.2.tar.bz2
/octave-4.0.0.tar.xz
/octave-4.0.1.tar.xz
/octave-4.0.2.tar.xz
/octave-4.0.3.tar.xz
/octave-4.2.0-rc1.tar.xz
/octave-4.2.0.tar.lz
/octave-4.2.1.tar.lz
/octave-4.2.2.tar.lz
/octave-4.4.1.tar.lz
/octave-4.4.1-docs.tar.gz
/octave-5.1.0.tar.lz
/octave-5.1.0-docs.tar.lz

View File

@ -1,21 +0,0 @@
# Makefile for source rpm: octave
# $Id$
NAME := octave
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)

View File

@ -1,5 +0,0 @@
octave-3_0_2-2_fc10:HEAD:octave-3.0.2-2.fc10.src.rpm:1224776342
octave-3_0_5-1_fc11:HEAD:octave-3.0.5-1.fc11.src.rpm:1239552316
octave-3_2_0-1_fc11:HEAD:octave-3.2.0-1.fc11.src.rpm:1247313567
octave-3_2_2-1_fc11:HEAD:octave-3.2.2-1.fc11.src.rpm:1249027014
octave-3_2_2-5_fc12:HEAD:octave-3.2.2-5.fc12.src.rpm:1253686658

83
macros.octave Normal file
View File

@ -0,0 +1,83 @@
# Octave packaging macros
# Octave binary API provided
%octave_api %(octave-config -p API_VERSION || echo 0)
# Octave Package Directories
%octshareprefix %{_datadir}/octave
%octprefix %{octshareprefix}/packages
%octarchprefix %{_libdir}/octave/packages
%octpkgdir %{octprefix}/%{octpkg}-%{version}
%octpkglibdir %{octarchprefix}/%{octpkg}-%{version}
# Run an octave command - quietly with no startup files
%octave_cmd() octave -H -q --no-window-system --no-site-file --eval '%*';
# For compiled tarfile name
%octave_host %(octave-config -p CANONICAL_HOST_TYPE || echo 0)
# Build unpacked source directory into a package tar file in a temporary location
# Pass -T to use source tarball
%octave_pkg_build(T) %{lua:
if (rpm.expand("%{-T}") == "-T") then
octpkg_tarfile = rpm.expand("%{SOURCE0}")
else
octpkg_tarfile = rpm .expand("%{_tmppath}/%{octpkg}-%{version}.tar.gz")
print("tar czf "..octpkg_tarfile.." -C "..rpm.expand("%{_builddir} %{buildsubdir}").."\\n")
end
-- Avoid a warning from pkg build about making the build directory
-- and use a clean directory as octave pkg build will delete contents
print(rpm.expand("mkdir -p %{_builddir}/%{buildsubdir}/build\\n"))
-- This fails to keep the arguments to %octave_cmd for some reason
-- print(rpm.expand("%octave_cmd pkg build -verbose -nodeps %{_builddir}/%{buildsubdir} "..octpkg_tarfile).."\\n")
print(rpm.expand("octave -H -q --no-window-system --no-site-file --eval 'pkg build -verbose -nodeps %{_builddir}/%{buildsubdir}/build "..octpkg_tarfile).."'\\n")
-- Extract the source tarball for debuginfo generation
print(rpm.expand("tar xf "..octpkg_tarfile.." -C %{_builddir}/%{buildsubdir}/build\\n"))
}
# Install a package. We use the octave pkg install command to install the
# built package into the buildroot. We also put a note to prevent the root
# user from removing the package with the octave pkg uninstall command
# We call unlink to remove the 'octave_packages' file which contains the
# buildroot string and needs to be generated at package install time.
%octave_pkg_install \
mkdir -p %{buildroot}%{octprefix} \
mkdir -p %{buildroot}%{octarchprefix} \
%octave_cmd pkg("prefix","%{buildroot}%{octprefix}","%{buildroot}%{octarchprefix}");pkg("global_list",fullfile("%{buildroot}%{octshareprefix}","octave_packages"));pkg("local_list",fullfile("%{buildroot}%{octshareprefix}","octave_packages"));pkg("install","-nodeps","-verbose",glob("%{_builddir}/%{buildsubdir}/build/%{octpkg}-%{version}-*.tar.gz"){1,1});unlink(pkg("local_list"));unlink(pkg("global_list")); \
if [ -e %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m ] \
then \
mv %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m.orig \
fi \
echo "function on_uninstall (desc)" > %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m \
echo " error ('Can not uninstall %s installed by the redhat package manager', desc.name);" >> %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m \
echo "endfunction" >> %{buildroot}%{octpkgdir}/packinfo/on_uninstall.m \
if [ -e %{_builddir}/%{buildsubdir}/build/%{octpkg}-%{version}/*.metainfo.xml ] \
then \
echo "Found .metainfo.xml appdata file" \
mkdir -p %{buildroot}/%{_metainfodir} \
cp -p %{_builddir}/%{buildsubdir}/build/%{octpkg}-%{version}/*.metainfo.xml %{buildroot}/%{_metainfodir}/ \
appstream-util validate-relax --nonet %{buildroot}/%{_metainfodir}/*.metainfo.xml \
else \
echo "Did not find a .metainfo.xml appdata file" \
fi \
%{nil}
# Run pkg tests - We need to reinstall to recreate 'octave_packages' so that
# octave can find the package, then remove 'octave_packages' again, and re-strip
# any shared objects.
%octave_pkg_check \
%octave_cmd pkg("prefix","%{buildroot}%{octprefix}","%{buildroot}%{octarchprefix}");pkg("local_list",fullfile("%{buildroot}%{octshareprefix}","octave_packages"));pkg("list");pkg("install","-verbose",glob("%{_builddir}/%{buildsubdir}/build/%{octpkg}-%{version}-*.tar.gz"){1,1});pkg("load","%{octpkg}");pkg("list");runtests("%{buildroot}%{octpkgdir}");unlink(pkg("local_list")); \
/usr/lib/rpm/brp-strip-shared %{__strip} \
%{nil}
# preun script - we need to remove our uninstall protection and perhaps
# run the package's own uninstall script.
%octave_pkg_preun \
if [ -e %{octpkgdir}/packinfo/on_uninstall.m.orig ]; then \
mv %{octpkgdir}/packinfo/on_uninstall.m.orig %{octpkgdir}/packinfo/on_uninstall.m \
cd %{octpkgdir}/packinfo \
%octave_cmd l=pkg("list");on_uninstall(l{cellfun(@(x)strcmp(x.name,"%{octpkg}"),l)}); \
else \
echo > %{octpkgdir}/packinfo/on_uninstall.m \
fi \
%{nil}

12
octave-crash.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up octave-4.4.1/libinterp/corefcn/input.cc.crash octave-4.4.1/libinterp/corefcn/input.cc
--- octave-4.4.1/libinterp/corefcn/input.cc.crash 2018-11-11 17:27:39.588037444 -0700
+++ octave-4.4.1/libinterp/corefcn/input.cc 2018-11-11 17:30:42.344208272 -0700
@@ -255,7 +255,7 @@ namespace octave
octave_diary << retval;
- if (retval.back () != '\n')
+ if (!retval.empty () && retval.back () != '\n')
octave_diary << "\n";
}
else

28
octave-eof.patch Normal file
View File

@ -0,0 +1,28 @@
# HG changeset patch
# User Mike Miller <mtmiller@octave.org>
# Date 1554238576 25200
# Node ID c3716220d5b93c49e1c7cc8ebe0b76dd961f4ec7
# Parent fc73dafece570f201c18a4eb4a8729a654cfcfbb
fix pause and kbhit with glibc 2.28 end-of-file state behavior (bug #55029)
* sysdep.cc (octave::kbhit): Call "clearerr (stdin)" on end-of-file condition
in addition to "std::cin.clear ()". In glibc 2.28, end-of-file is persistent
and must be cleared by the application.
diff --git a/libinterp/corefcn/sysdep.cc b/libinterp/corefcn/sysdep.cc
--- a/libinterp/corefcn/sysdep.cc
+++ b/libinterp/corefcn/sysdep.cc
@@ -566,7 +566,10 @@
int c = std::cin.get ();
if (std::cin.fail () || std::cin.eof ())
- std::cin.clear ();
+ {
+ std::cin.clear ();
+ clearerr (stdin);
+ }
// Restore it, enabling system call restarts (if possible).
octave::set_interrupt_handler (saved_interrupt_handler, true);

504
octave-sundials3.patch Normal file
View File

@ -0,0 +1,504 @@
diff -up octave-5.0.91/configure.ac.sundials3 octave-5.0.91/configure.ac
--- octave-5.0.91/configure.ac.sundials3 2019-02-04 10:50:20.000000000 -0700
+++ octave-5.0.91/configure.ac 2019-02-05 22:05:44.096260529 -0700
@@ -2220,15 +2220,15 @@ OCTAVE_CHECK_LIB(sundials_ida, [SUNDIALS
[], [don't use SUNDIALS IDA library, solvers ode15i and ode15s will be disabled],
[warn_sundials_ida=
OCTAVE_CHECK_SUNDIALS_SIZEOF_REALTYPE
- OCTAVE_CHECK_SUNDIALS_IDA_DENSE
- OCTAVE_CHECK_SUNDIALS_IDAKLU])
+ OCTAVE_CHECK_SUNDIALS_SUNLINSOL_DENSE
+ OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU])
LIBS="$save_LIBS"
dnl Define this way instead of with an #if in oct-conf-post.h so that
dnl the build features script will get the correct value.
if test -n "$SUNDIALS_IDA_LIBS" \
&& test -n "$SUNDIALS_NVECSERIAL_LIBS" \
- && test $octave_cv_sundials_ida_dense = yes \
+ && test $octave_cv_sundials_sunlinsol_dense = yes \
&& test $octave_cv_sundials_realtype_is_double = yes; then
AC_DEFINE(HAVE_SUNDIALS, 1, [Define to 1 if SUNDIALS is available.])
fi
diff -up octave-5.0.91/libinterp/dldfcn/__ode15__.cc.sundials3 octave-5.0.91/libinterp/dldfcn/__ode15__.cc
--- octave-5.0.91/libinterp/dldfcn/__ode15__.cc.sundials3 2019-02-04 10:50:20.000000000 -0700
+++ octave-5.0.91/libinterp/dldfcn/__ode15__.cc 2019-02-05 22:06:48.074012827 -0700
@@ -1,6 +1,7 @@
/*
Copyright (C) 2016-2019 Francesco Faccio <francesco.faccio@mail.polimi.it>
+Copyright (C) 2018 William Greene <w.h.greene@gmail.com>
This file is part of Octave.
@@ -44,15 +45,34 @@ along with Octave; see the file COPYING.
# include <ida/ida.h>
# endif
-# if defined (HAVE_IDA_IDA_DENSE_H)
-# include <ida/ida_dense.h>
+# if defined (HAVE_SUNDIALS_SUNDIALS_MATRIX_H)
+# include <sundials/sundials_matrix.h>
# endif
-# if defined (HAVE_IDA_IDA_KLU_H)
-# include <ida/ida_klu.h>
+# if defined (HAVE_SUNDIALS_SUNDIALS_LINEARSOLVER_H)
+# include <sundials/sundials_linearsolver.h>
+# endif
+
+# if defined (HAVE_SUNLINSOL_SUNLINSOL_DENSE_H)
+# include <sunlinsol/sunlinsol_dense.h>
+# endif
+
+# if defined (HAVE_IDA_IDA_DIRECT_H)
+# include <ida/ida_direct.h>
+# endif
+
+# if defined (HAVE_SUNDIALS_SUNDIALS_SPARSE_H)
# include <sundials/sundials_sparse.h>
# endif
+# if defined (HAVE_SUNLINSOL_SUNLINSOL_KLU_H)
+# include <sunlinsol/sunlinsol_klu.h>
+# endif
+
+# if defined (HAVE_SUNMATRIX_SUNMATRIX_SPARSE_H)
+# include <sunmatrix/sunmatrix_sparse.h>
+# endif
+
# if defined (HAVE_NVECTOR_NVECTOR_SERIAL_H)
# include <nvector/nvector_serial.h>
# endif
@@ -112,7 +132,8 @@ namespace octave
havejacsparse (false), mem (nullptr), num (), ida_fun (nullptr),
ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
spdfdyp (nullptr), fun (nullptr), jacfun (nullptr), jacspfun (nullptr),
- jacdcell (nullptr), jacspcell (nullptr)
+ jacdcell (nullptr), jacspcell (nullptr),
+ sunJacMatrix (nullptr), sunLinearSolver (nullptr)
{ }
@@ -122,11 +143,17 @@ namespace octave
havejacsparse (false), mem (nullptr), num (), ida_fun (ida_fcn),
ida_jac (nullptr), dfdy (nullptr), dfdyp (nullptr), spdfdy (nullptr),
spdfdyp (nullptr), fun (daefun), jacfun (nullptr), jacspfun (nullptr),
- jacdcell (nullptr), jacspcell (nullptr)
+ jacdcell (nullptr), jacspcell (nullptr),
+ sunJacMatrix (nullptr), sunLinearSolver (nullptr)
{ }
- ~IDA (void) { IDAFree (&mem); }
+ ~IDA (void)
+ {
+ IDAFree (&mem);
+ SUNLinSolFree(sunLinearSolver);
+ SUNMatDestroy(sunJacMatrix);
+ }
IDA&
set_jacobian (octave_function *jac, DAEJacFuncDense j)
@@ -184,7 +211,7 @@ namespace octave
static N_Vector ColToNVec (const ColumnVector& data, long int n);
void
- set_up (void);
+ set_up (const ColumnVector& y);
void
set_tolerance (ColumnVector& abstol, realtype reltol);
@@ -199,25 +226,24 @@ namespace octave
void
resfun_impl (realtype t, N_Vector& yy,
N_Vector& yyp, N_Vector& rr);
-
static int
- jacdense (long int Neq, realtype t, realtype cj, N_Vector yy,
- N_Vector yyp, N_Vector, DlsMat JJ, void *user_data,
+ jacdense (realtype t, realtype cj, N_Vector yy,
+ N_Vector yyp, N_Vector, SUNMatrix JJ, void *user_data,
N_Vector, N_Vector, N_Vector)
{
IDA *self = static_cast <IDA *> (user_data);
- self->jacdense_impl (Neq, t, cj, yy, yyp, JJ);
+ self->jacdense_impl (t, cj, yy, yyp, JJ);
return 0;
}
void
- jacdense_impl (long int Neq, realtype t, realtype cj,
- N_Vector& yy, N_Vector& yyp, DlsMat& JJ);
+ jacdense_impl (realtype t, realtype cj,
+ N_Vector& yy, N_Vector& yyp, SUNMatrix& JJ);
-# if defined (HAVE_SUNDIALS_IDAKLU)
+# if defined (HAVE_SUNDIALS_SUNLINSOL_KLU)
static int
jacsparse (realtype t, realtype cj, N_Vector yy, N_Vector yyp,
- N_Vector, SlsMat Jac, void *user_data, N_Vector,
+ N_Vector, SUNMatrix Jac, void *user_data, N_Vector,
N_Vector, N_Vector)
{
IDA *self = static_cast <IDA *> (user_data);
@@ -227,7 +253,7 @@ namespace octave
void
jacsparse_impl (realtype t, realtype cj, N_Vector& yy,
- N_Vector& yyp, SlsMat& Jac);
+ N_Vector& yyp, SUNMatrix& Jac);
#endif
void set_maxstep (realtype maxstep);
@@ -291,6 +317,8 @@ namespace octave
DAEJacFuncSparse jacspfun;
DAEJacCellDense jacdcell;
DAEJacCellSparse jacspcell;
+ SUNMatrix sunJacMatrix;
+ SUNLinearSolver sunLinearSolver;
};
int
@@ -323,36 +351,61 @@ namespace octave
}
void
- IDA::set_up (void)
+ IDA::set_up (const ColumnVector& y)
{
+ N_Vector yy = ColToNVec(y, num);
+
if (havejacsparse)
{
-# if defined (HAVE_SUNDIALS_IDAKLU)
- if (IDAKLU (mem, num, num*num, CSC_MAT) != 0)
- error ("IDAKLU solver not initialized");
+#if defined (HAVE_SUNDIALS_SUNLINSOL_KLU)
+
+ sunJacMatrix = SUNSparseMatrix (num, num, num*num, CSC_MAT);
+ if (! sunJacMatrix)
+ error ("Unable to create sparse Jacobian for Sundials");
+
+ sunLinearSolver = SUNKLU (yy, sunJacMatrix);
+ if (! sunLinearSolver)
+ error ("Unable to create KLU sparse solver");
+
+ if (IDADlsSetLinearSolver (mem, sunLinearSolver, sunJacMatrix))
+ error ("Unable to set sparse linear solver");
+
+ IDADlsSetJacFn(mem, IDA::jacsparse);
- IDASlsSetSparseJacFn (mem, IDA::jacsparse);
# else
- error ("IDAKLU is not available in this version of Octave");
+ error ("SUNDIALS SUNLINSOL KLU is not available in this version of Octave");
# endif
+
}
else
{
- if (IDADense (mem, num) != 0)
- error ("IDADense solver not initialized");
- if (havejac && IDADlsSetDenseJacFn (mem, IDA::jacdense) != 0)
- error ("Dense Jacobian not set");
+ sunJacMatrix = SUNDenseMatrix (num, num);
+ if (! sunJacMatrix)
+ error ("Unable to create dense Jacobian for Sundials");
+
+ sunLinearSolver = SUNDenseLinearSolver(yy, sunJacMatrix);
+ if (! sunLinearSolver)
+ error ("Unable to create dense linear solver");
+
+ if (IDADlsSetLinearSolver (mem, sunLinearSolver, sunJacMatrix))
+ error ("Unable to set dense linear solver");
+
+ if (havejac && IDADlsSetJacFn (mem, IDA::jacdense) != 0)
+ error("Unable to set dense Jacobian function");
+
}
}
void
- IDA::jacdense_impl (long int Neq, realtype t, realtype cj,
- N_Vector& yy, N_Vector& yyp, DlsMat& JJ)
+ IDA::jacdense_impl (realtype t, realtype cj,
+ N_Vector& yy, N_Vector& yyp, SUNMatrix& JJ)
{
BEGIN_INTERRUPT_WITH_EXCEPTIONS;
+ long int Neq = NV_LENGTH_S(yy);
+
ColumnVector y = NVecToCol (yy, Neq);
ColumnVector yp = NVecToCol (yyp, Neq);
@@ -366,15 +419,15 @@ namespace octave
std::copy (jac.fortran_vec (),
jac.fortran_vec () + jac.numel (),
- JJ->data);
+ SUNDenseMatrix_Data(JJ));
END_INTERRUPT_WITH_EXCEPTIONS;
}
-# if defined (HAVE_SUNDIALS_IDAKLU)
+# if defined (HAVE_SUNDIALS_SUNLINSOL_KLU)
void
IDA::jacsparse_impl (realtype t, realtype cj, N_Vector& yy, N_Vector& yyp,
- SlsMat& Jac)
+ SUNMatrix& Jac)
{
BEGIN_INTERRUPT_WITH_EXCEPTIONS;
@@ -390,17 +443,18 @@ namespace octave
else
jac = (*jacspcell) (spdfdy, spdfdyp, cj);
- SparseSetMatToZero (Jac);
- int *colptrs = *(Jac->colptrs);
- int *rowvals = *(Jac->rowvals);
+ SUNMatZero_Sparse (Jac);
+ sunindextype *colptrs = SUNSparseMatrix_IndexPointers (Jac);
+ sunindextype *rowvals = SUNSparseMatrix_IndexValues (Jac);
for (int i = 0; i < num + 1; i++)
colptrs[i] = jac.cidx(i);
+ double *d = SUNSparseMatrix_Data (Jac);
for (int i = 0; i < jac.nnz (); i++)
{
rowvals[i] = jac.ridx(i);
- Jac->data[i] = jac.data(i);
+ d[i] = jac.data(i);
}
END_INTERRUPT_WITH_EXCEPTIONS;
@@ -567,7 +621,7 @@ namespace octave
//main loop
while (((posdirection == 1 && tsol < tend)
- || (posdirection == 0 && tsol > tend))
+ || (posdirection == 0 && tsol > tend))
&& status == 0)
{
if (IDASolve (mem, tend, &tsol, yy, yyp, IDA_ONE_STEP) != 0)
@@ -692,7 +746,7 @@ namespace octave
// Linear interpolation
ie(0) = index(0);
te(0) = tsol - val (index(0)) * (tsol - told)
- / (val (index(0)) - oldval (index(0)));
+ / (val (index(0)) - oldval (index(0)));
ColumnVector ytemp
= y - ((tsol - te(0)) * (y - yold) / (tsol - told));
@@ -717,7 +771,7 @@ namespace octave
// Linear interpolation
ie(temp+i) = index(i);
te(temp+i) = tsol - val(index(i)) * (tsol - told)
- / (val(index(i)) - oldval(index(i)));
+ / (val(index(i)) - oldval(index(i)));
ColumnVector ytemp
= y - (tsol - te (temp + i)) * (y - yold) / (tsol - told);
@@ -1096,7 +1150,7 @@ namespace octave
event_fcn = options.getfield("Events").function_value ();
// Set up linear solver
- dae.set_up ();
+ dae.set_up (y0);
// Integrate
retval = dae.integrate (numt, tspan, y0, yp0, refine,
diff -up octave-5.0.91/m4/acinclude.m4.sundials3 octave-5.0.91/m4/acinclude.m4
--- octave-5.0.91/m4/acinclude.m4.sundials3 2019-02-04 10:50:20.000000000 -0700
+++ octave-5.0.91/m4/acinclude.m4 2019-02-05 22:05:44.100260576 -0700
@@ -2210,14 +2210,11 @@ dnl Check whether SUNDIALS IDA library i
dnl precision realtype.
dnl
AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SIZEOF_REALTYPE], [
- AC_CHECK_HEADERS([ida/ida.h ida.h])
AC_CACHE_CHECK([whether SUNDIALS IDA is configured with double precision realtype],
[octave_cv_sundials_realtype_is_double],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#if defined (HAVE_IDA_IDA_H)
#include <ida/ida.h>
- #else
- #include <ida.h>
#endif
#include <assert.h>
]], [[
@@ -2233,61 +2230,72 @@ AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SIZEOF_R
fi
])
dnl
-dnl Check whether SUNDIALS IDA library is configured with IDAKLU
+dnl Check whether SUNDIALS IDA library is configured with SUNLINSOL_KLU
dnl enabled.
dnl
-AC_DEFUN([OCTAVE_CHECK_SUNDIALS_IDAKLU], [
- AC_CHECK_HEADERS([ida/ida_klu.h ida_klu.h])
- AC_CACHE_CHECK([whether SUNDIALS IDA is configured with IDAKLU enabled],
- [octave_cv_sundials_idaklu],
+AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU], [
+ AC_CHECK_HEADERS([sundials/sundials_sparse.h sunlinsol/sunlinsol_klu.h sunmatrix/sunmatrix_sparse.h])
+ AC_CACHE_CHECK([whether SUNDIALS IDA is configured with SUNLINSOL_KLU enabled],
+ [octave_cv_sundials_sunlinsol_klu],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #if defined (HAVE_IDA_IDA_KLU_H)
- #include <ida/ida_klu.h>
- #else
- #include <ida_klu.h>
+ #if defined (HAVE_IDA_IDA_H)
+ #include <ida/ida.h>
+ #endif
+ #if defined (HAVE_SUNDIALS_SUNDIALS_SPARSE_H)
+ #include <sundials/sundials_sparse.h>
+ #endif
+ #if defined (HAVE_SUNLINSOL_SUNLINSOL_KLU_H)
+ #include <sunlinsol/sunlinsol_klu.h>
#endif
]], [[
- IDAKLU (0, 0, 0, 0);
+ SUNKLU (0, 0);
]])],
- octave_cv_sundials_idaklu=yes,
- octave_cv_sundials_idaklu=no)
+ octave_cv_sundials_sunlinsol_klu=yes,
+ octave_cv_sundials_sunlinsol_klu=no)
])
- if test $octave_cv_sundials_idaklu = yes; then
- AC_DEFINE(HAVE_SUNDIALS_IDAKLU, 1,
- [Define to 1 if SUNDIALS IDA is configured with IDAKLU enabled.])
+ if test $octave_cv_sundials_sunlinsol_klu = yes; then
+ AC_DEFINE(HAVE_SUNDIALS_SUNLINSOL_KLU, 1,
+ [Define to 1 if SUNDIALS IDA is configured with SUNLINSOL_KLU enabled.])
else
- warn_sundials_idaklu="SUNDIALS IDA library not configured with IDAKLU, ode15i and ode15s will not support the sparse Jacobian feature"
- OCTAVE_CONFIGURE_WARNING([warn_sundials_idaklu])
+ warn_sundials_idaklu="SUNDIALS IDA library not configured with SUNLINSOL_KLU, ode15i and ode15s will not support the sparse Jacobian feature"
+ OCTAVE_CONFIGURE_WARNING([warn_sundials_sunlinsol_klu])
fi
])
dnl
-dnl Check whether SUNDIALS IDA library has the IDADENSE linear solver.
+dnl Check whether SUNDIALS IDA library has the SUNLINSOL_DENSE linear solver.
dnl The IDADENSE API was removed in SUNDIALS version 3.0.0.
dnl
-AC_DEFUN([OCTAVE_CHECK_SUNDIALS_IDA_DENSE], [
- AC_CHECK_HEADERS([ida/ida_dense.h ida_dense.h])
- AC_CACHE_CHECK([whether SUNDIALS IDA includes the IDADENSE linear solver],
- [octave_cv_sundials_ida_dense],
+AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SUNLINSOL_DENSE], [
+ AC_CHECK_HEADERS([sunlinsol/sunlinsol_dense.h sundials/sundials_matrix.h sundials/sundials_linearsolver.h ida/ida_direct.h])
+ AC_CACHE_CHECK([whether SUNDIALS IDA includes the SUNLINSOL_DENSE linear solver],
+ [octave_cv_sundials_sunlinsol_dense],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #if defined (HAVE_IDA_IDA_DENSE_H)
- #include <ida/ida_dense.h>
- #else
- #include <ida_dense.h>
+ #if defined (HAVE_IDA_IDA_H)
+ #include <ida/ida.h>
+ #endif
+ #if defined (HAVE_SUNDIALS_SUNDIALS_MATRIX_H)
+ #include <sundials/sundials_matrix.h>
+ #endif
+ #if defined (HAVE_SUNDIALS_SUNDIALS_LINEARSOLVER_H)
+ #include <sundials/sundials_linearsolver.h>
#endif
+ #if defined (HAVE_IDA_IDA_DIRECT_H)
+ #include <ida/ida_direct.h>
+ #endif
]], [[
void *mem = 0;
long int num = 0;
IDADense (mem, num);
]])],
- octave_cv_sundials_ida_dense=yes,
- octave_cv_sundials_ida_dense=no)
+ octave_cv_sundials_sunlinsol_dense=yes,
+ octave_cv_sundials_sunlinsol_dense=no)
])
- if test $octave_cv_sundials_ida_dense = yes; then
- AC_DEFINE(HAVE_SUNDIALS_IDADENSE, 1,
- [Define to 1 if SUNDIALS IDA includes the IDADENSE linear solver.])
+ if test $octave_cv_sundials_sunlinsol_dense = yes; then
+ AC_DEFINE(HAVE_SUNDIALS_SUNLINSOL_DENSE, 1,
+ [Define to 1 if SUNDIALS IDA includes the SUNLINSOL_DENSE linear solver.])
else
- warn_sundials_ida_dense="SUNDIALS IDA library does not include the IDADENSE linear solver, ode15i and ode15s will be disabled"
- OCTAVE_CONFIGURE_WARNING([warn_sundials_ida_dense])
+ warn_sundials_ida_dense="SUNDIALS IDA library does not include the SUNLINSOL_DENSE linear solver, ode15i and ode15s will be disabled"
+ OCTAVE_CONFIGURE_WARNING([warn_sundials_sunlinsol_dense])
fi
])
dnl
diff -up octave-5.0.91/scripts/ode/ode15i.m.sundials3 octave-5.0.91/scripts/ode/ode15i.m
--- octave-5.0.91/scripts/ode/ode15i.m.sundials3 2019-02-04 10:50:20.000000000 -0700
+++ octave-5.0.91/scripts/ode/ode15i.m 2019-02-05 22:05:44.101260588 -0700
@@ -452,7 +452,7 @@ endfunction
%! assert ([t(end), y(end,:)], fref, 1e-3);
## Jacobian fun sparse
-%!testif HAVE_SUNDIALS_IDAKLU
+%!testif HAVE_SUNDIALS_SUNLINSOL_KLU
%! opt = odeset ("Jacobian", @jacfunsparse, "AbsTol", 1e-7, "RelTol", 1e-7);
%! [t, y] = ode15i (@rob, [0, 100], [1; 0; 0], [-1e-4; 1e-4; 0], opt);
%! assert ([t(end), y(end,:)], fref, 1e-3);
@@ -545,7 +545,7 @@ endfunction
%! "invalid value assigned to field 'Jacobian'");
## Jacobian cell sparse wrong dimension
-%!testif HAVE_SUNDIALS_IDAKLU
+%!testif HAVE_SUNDIALS_SUNLINSOL_KLU
%! DFDY = sparse ([-0.04, 1;
%! 0.04, 1]);
%! DFDYP = sparse ([-1, 0, 0;
diff -up octave-5.0.91/scripts/ode/ode15s.m.sundials3 octave-5.0.91/scripts/ode/ode15s.m
--- octave-5.0.91/scripts/ode/ode15s.m.sundials3 2019-02-04 10:50:20.000000000 -0700
+++ octave-5.0.91/scripts/ode/ode15s.m 2019-02-05 22:05:44.102260599 -0700
@@ -545,21 +545,21 @@ endfunction
%! [t, y] = ode15s (@rob, [0, 100], [1; 0; 0], opt);
%! assert ([t(end), y(end,:)], frefrob, 1e-3);
-%!testif HAVE_SUNDIALS_IDAKLU
+%!testif HAVE_SUNDIALS_SUNLINSOL_KLU
%! opt = odeset ("MStateDependence", "none",
%! "Mass", [1, 0, 0; 0, 1, 0; 0, 0, 0],
%! "Jacobian", @jacfunsparse);
%! [t, y] = ode15s (@rob, [0, 100], [1; 0; 0], opt);
%! assert ([t(end), y(end,:)], frefrob, 1e-3);
-%!testif HAVE_SUNDIALS_IDAKLU
+%!testif HAVE_SUNDIALS_SUNLINSOL_KLU
%! opt = odeset ("MStateDependence", "none",
%! "Mass", sparse ([1, 0, 0; 0, 1, 0; 0, 0, 0]),
%! "Jacobian", @jacfunsparse);
%! [t, y] = ode15s (@rob, [0, 100], [1; 0; 0], opt);
%! assert ([t(end), y(end,:)], frefrob, 1e-3);
-%!testif HAVE_SUNDIALS_IDAKLU
+%!testif HAVE_SUNDIALS_SUNLINSOL_KLU
%! warning ("off", "ode15s:mass_state_dependent_provided", "local");
%! opt = odeset ("MStateDependence", "none",
%! "Mass", @massdensefunstate,
@@ -575,14 +575,14 @@ endfunction
%! [t, y] = ode15s (@rob, [0, 100], [1; 0; 0], opt);
%! assert ([t(end), y(end,:)], frefrob, 1e-3);
-%!testif HAVE_SUNDIALS_IDAKLU
+%!testif HAVE_SUNDIALS_SUNLINSOL_KLU
%! opt = odeset ("MStateDependence", "none",
%! "Mass", @massdensefuntime,
%! "Jacobian", @jacfunsparse);
%! [t, y] = ode15s (@rob, [0, 100], [1; 0; 0], opt);
%! assert ([t(end), y(end,:)], frefrob, 1e-3);
-%!testif HAVE_SUNDIALS_IDAKLU
+%!testif HAVE_SUNDIALS_SUNLINSOL_KLU
%! opt = odeset ("MStateDependence", "none",
%! "Mass", @masssparsefuntime,
%! "Jacobian", @jacfunsparse);

File diff suppressed because it is too large Load Diff

View File

@ -1 +1,2 @@
608196657f4fa010420227b77333bb71 octave-3.2.4.tar.bz2
SHA512 (octave-5.1.0.tar.lz) = 34facc20ffceaead05e62e16cc70bd603919c7e52c7489faa17b5c969a160c655f50c4aeb41ecee2e2d0a6245cc3364cf9009ddd3cecb17b9e06bbdacaa0a516
SHA512 (octave-5.1.0-docs.tar.lz) = 6bf24ed95d5d2957271abb8902a156edc588962b95218b05936858fafe8205f4295f072388f7331ad5700946fbae701bd0c3f2a59c258f390ea92c85eb87fdd2

137
xorg.conf Normal file
View File

@ -0,0 +1,137 @@
# This xorg configuration file is meant to be used by xpra
# to start a dummy X11 server.
# For details, please see:
# https://xpra.org/Xdummy.html
Section "ServerFlags"
Option "DontVTSwitch" "true"
Option "AllowMouseOpenFail" "true"
Option "PciForceNone" "true"
Option "AutoEnableDevices" "false"
Option "AutoAddDevices" "false"
EndSection
Section "InputDevice"
Identifier "dummy_mouse"
Option "CorePointer" "true"
Driver "void"
EndSection
Section "InputDevice"
Identifier "dummy_keyboard"
Option "CoreKeyboard" "true"
Driver "void"
EndSection
Section "Device"
Identifier "dummy_videocard"
Driver "dummy"
Option "ConstantDPI" "true"
#VideoRam 4096000
#VideoRam 256000
VideoRam 192000
EndSection
Section "Monitor"
Identifier "dummy_monitor"
HorizSync 5.0 - 1000.0
VertRefresh 5.0 - 200.0
#This can be used to get a specific DPI, but only for the default resolution:
#DisplaySize 508 317
#NOTE: the highest modes will not work without increasing the VideoRam
# for the dummy video card.
Modeline "32768x32768" 15226.50 32768 35800 39488 46208 32768 32771 32781 32953
Modeline "32768x16384" 7516.25 32768 35544 39192 45616 16384 16387 16397 16478
Modeline "16384x8192" 2101.93 16384 16416 24400 24432 8192 8390 8403 8602
Modeline "8192x4096" 424.46 8192 8224 9832 9864 4096 4195 4202 4301
Modeline "5496x1200" 199.13 5496 5528 6280 6312 1200 1228 1233 1261
Modeline "5280x1080" 169.96 5280 5312 5952 5984 1080 1105 1110 1135
Modeline "5280x1200" 191.40 5280 5312 6032 6064 1200 1228 1233 1261
Modeline "5120x3200" 199.75 5120 5152 5904 5936 3200 3277 3283 3361
Modeline "4800x1200" 64.42 4800 4832 5072 5104 1200 1229 1231 1261
Modeline "3840x2880" 133.43 3840 3872 4376 4408 2880 2950 2955 3025
Modeline "3840x2560" 116.93 3840 3872 4312 4344 2560 2622 2627 2689
Modeline "3840x2048" 91.45 3840 3872 4216 4248 2048 2097 2101 2151
Modeline "3840x1080" 100.38 3840 3848 4216 4592 1080 1081 1084 1093
Modeline "3600x1200" 106.06 3600 3632 3984 4368 1200 1201 1204 1214
Modeline "3288x1080" 39.76 3288 3320 3464 3496 1080 1106 1108 1135
Modeline "2048x2048" 49.47 2048 2080 2264 2296 2048 2097 2101 2151
Modeline "2048x1536" 80.06 2048 2104 2312 2576 1536 1537 1540 1554
Modeline "2560x1600" 47.12 2560 2592 2768 2800 1600 1639 1642 1681
Modeline "2560x1440" 42.12 2560 2592 2752 2784 1440 1475 1478 1513
Modeline "1920x1440" 69.47 1920 1960 2152 2384 1440 1441 1444 1457
Modeline "1920x1200" 26.28 1920 1952 2048 2080 1200 1229 1231 1261
Modeline "1920x1080" 23.53 1920 1952 2040 2072 1080 1106 1108 1135
Modeline "1680x1050" 20.08 1680 1712 1784 1816 1050 1075 1077 1103
Modeline "1600x1200" 22.04 1600 1632 1712 1744 1200 1229 1231 1261
Modeline "1600x900" 33.92 1600 1632 1760 1792 900 921 924 946
Modeline "1440x900" 30.66 1440 1472 1584 1616 900 921 924 946
ModeLine "1366x768" 72.00 1366 1414 1446 1494 768 771 777 803
Modeline "1280x1024" 31.50 1280 1312 1424 1456 1024 1048 1052 1076
Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841
Modeline "1280x768" 23.11 1280 1312 1392 1424 768 786 789 807
Modeline "1360x768" 24.49 1360 1392 1480 1512 768 786 789 807
Modeline "1024x768" 18.71 1024 1056 1120 1152 768 786 789 807
Modeline "768x1024" 19.50 768 800 872 904 1024 1048 1052 1076
#common resolutions for android devices (both orientations):
Modeline "800x1280" 25.89 800 832 928 960 1280 1310 1315 1345
Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841
Modeline "720x1280" 30.22 720 752 864 896 1280 1309 1315 1345
Modeline "1280x720" 27.41 1280 1312 1416 1448 720 737 740 757
Modeline "768x1024" 24.93 768 800 888 920 1024 1047 1052 1076
Modeline "1024x768" 23.77 1024 1056 1144 1176 768 785 789 807
Modeline "600x1024" 19.90 600 632 704 736 1024 1047 1052 1076
Modeline "1024x600" 18.26 1024 1056 1120 1152 600 614 617 631
Modeline "536x960" 16.74 536 568 624 656 960 982 986 1009
Modeline "960x536" 15.23 960 992 1048 1080 536 548 551 563
Modeline "600x800" 15.17 600 632 688 720 800 818 822 841
Modeline "800x600" 14.50 800 832 880 912 600 614 617 631
Modeline "480x854" 13.34 480 512 560 592 854 873 877 897
Modeline "848x480" 12.09 848 880 920 952 480 491 493 505
Modeline "480x800" 12.43 480 512 552 584 800 818 822 841
Modeline "800x480" 11.46 800 832 872 904 480 491 493 505
#resolutions for android devices (both orientations)
#minus the status bar
#38px status bar (and width rounded up)
Modeline "800x1242" 25.03 800 832 920 952 1242 1271 1275 1305
Modeline "1280x762" 22.93 1280 1312 1392 1424 762 780 783 801
Modeline "720x1242" 29.20 720 752 856 888 1242 1271 1276 1305
Modeline "1280x682" 25.85 1280 1312 1408 1440 682 698 701 717
Modeline "768x986" 23.90 768 800 888 920 986 1009 1013 1036
Modeline "1024x730" 22.50 1024 1056 1136 1168 730 747 750 767
Modeline "600x986" 19.07 600 632 704 736 986 1009 1013 1036
Modeline "1024x562" 17.03 1024 1056 1120 1152 562 575 578 591
Modeline "536x922" 16.01 536 568 624 656 922 943 947 969
Modeline "960x498" 14.09 960 992 1040 1072 498 509 511 523
Modeline "600x762" 14.39 600 632 680 712 762 779 783 801
Modeline "800x562" 13.52 800 832 880 912 562 575 578 591
Modeline "480x810" 12.59 480 512 552 584 810 828 832 851
Modeline "848x442" 11.09 848 880 920 952 442 452 454 465
Modeline "480x762" 11.79 480 512 552 584 762 779 783 801
EndSection
Section "Screen"
Identifier "dummy_screen"
Device "dummy_videocard"
Monitor "dummy_monitor"
DefaultDepth 24
SubSectionSub "Display"
Viewport 0 0
Depth 24
#Modes "32768x32768" "32768x16384" "16384x8192" "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"
Modes "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768" "1024x600" "800x600" "320x200"
#Virtual 32000 32000
#Virtual 16384 8192
Virtual 8192 4096
#Virtual 5120 3200
EndSubSection
EndSection
Section "ServerLayout"
Identifier "dummy_layout"
Screen "dummy_screen"
InputDevice "dummy_mouse"
InputDevice "dummy_keyboard"
EndSection