Mercurial > mxe-octave

changeset 4086:a956f3b29f93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-netcdf: update to 1.0.8 * src/of-netcdf.mk: update version, checksum * src/of-netcdf-1-fixes.patch: removed * build_packages.m: update netcdf version * dist-files.mk: removed of-netcdf-1-fixes.patch
author John Donoghue
date Wed, 03 Feb 2016 08:38:10 -0500
parents c25eb2c88594
children c587088dbc4b
files build_packages.m dist-files.mk src/of-netcdf-1-fixes.patch src/of-netcdf.mk
diffstat 4 files changed, 3 insertions(+), 72 deletions(-) [+]
line wrap: on
line diff
--- a/build_packages.m	Wed Feb 03 08:38:06 2016 -0500
+++ b/build_packages.m	Wed Feb 03 08:38:10 2016 -0500
@@ -44,7 +44,7 @@
 try_install fl-core-1.0.0.tar.gz
 try_install tsa-4.3.2.tar.gz
 try_install dicom-0.1.1.tar.gz
-try_install netcdf-1.0.7.tar.gz
+try_install netcdf-1.0.8.tar.gz
 try_install ltfat-2.1.1.tar.gz
 try_install database-2.3.2.tar.gz
 try_install instrument-control-0.2.1.tar.gz
--- a/dist-files.mk	Wed Feb 03 08:38:06 2016 -0500
+++ b/dist-files.mk	Wed Feb 03 08:38:10 2016 -0500
@@ -482,7 +482,6 @@
   of-miscellaneous.mk \
   of-nan-1-cross-fixes.patch \
   of-nan.mk \
-  of-netcdf-1-fixes.patch \
   of-netcdf.mk \
   of-nurbs-1-fixes.patch \
   of-nurbs.mk \
--- a/src/of-netcdf-1-fixes.patch	Wed Feb 03 08:38:06 2016 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-diff -ur netcdf.orig/src/__netcdf__.cc netcdf/src/__netcdf__.cc
---- netcdf.orig/src/__netcdf__.cc	2015-09-26 07:53:37.710240236 -0400
-+++ netcdf/src/__netcdf__.cc	2015-09-26 13:58:27.115208120 -0400
-@@ -551,8 +551,14 @@
-   check_err(nc_inq_unlimdims(ncid, &nunlimdims, NULL));
-   Array<int> unlimdimids = Array<int>(dim_vector(1,nunlimdims));
-   check_err(nc_inq_unlimdims(ncid, &nunlimdims, unlimdimids.fortran_vec()));
-+
-+  Array<double> d_unlimdimids = Array<double>(dim_vector(1,nunlimdims));
-+  for (octave_idx_type idx=0;idx<d_unlimdimids.numel();idx++)
-+    {
-+      d_unlimdimids(idx) = unlimdimids(idx);
-+    }
-     
--  return octave_value(unlimdimids);
-+  return octave_value(d_unlimdimids);
- }
- 
- 
-@@ -1840,7 +1846,14 @@
-   Array<int> varids = Array<int>(dim_vector(1,nvars));
-   check_err(nc_inq_varids(ncid, &nvars, varids.fortran_vec()));
- 
--  return octave_value(varids);
-+  Array<double> d_varids = Array<double>(dim_vector(1,nvars));
-+  for (octave_idx_type idx=0;idx<d_varids.numel();idx++)
-+    {
-+      d_varids(idx) = varids(idx);
-+    }
-+ 
-+
-+  return octave_value(d_varids);
- }
- 
- DEFUN_DLD(netcdf_inqVar, args,, 
-@@ -1996,8 +2009,14 @@
-   check_err(nc_inq_ndims(ncid, &ndims));
-   Array<int> dimids = Array<int>(dim_vector(1,ndims));
-   check_err(nc_inq_dimids(ncid, &ndims, dimids.fortran_vec(),include_parents));
-+
-+  Array<double> d_dimids = Array<double>(dim_vector(1,ndims));
-+  for (octave_idx_type idx=0;idx<d_dimids.numel();idx++)
-+    {
-+      d_dimids(idx) = dimids(idx);
-+    }
-     
--  return octave_value(dimids);
-+  return octave_value(d_dimids);
- }
- 
- 
-@@ -2067,8 +2086,14 @@
- 
-   Array<int> ncids = Array<int>(dim_vector(1,numgrps));
-   check_err(nc_inq_grps(ncid, NULL, ncids.fortran_vec()));
--    
--  return octave_value(ncids);
-+
-+  Array<double> d_ncids = Array<double>(dim_vector(1,numgrps));
-+  for (octave_idx_type idx=0;idx<d_ncids.numel();idx++)
-+    {
-+      d_ncids(idx) = ncids(idx);
-+    }
-+  
-+  return octave_value(d_ncids);
- }
- 
- //int nc_inq_grpname(int ncid, char *name);
--- a/src/of-netcdf.mk	Wed Feb 03 08:38:06 2016 -0500
+++ b/src/of-netcdf.mk	Wed Feb 03 08:38:10 2016 -0500
@@ -3,8 +3,8 @@
 
 PKG             := of-netcdf
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.7
-$(PKG)_CHECKSUM := f6b701fbaf923f5203fe1faae60554d1581bed69
+$(PKG)_VERSION  := 1.0.8
+$(PKG)_CHECKSUM := e6a91c82c08ea54952df0d9eb59011f6f068db9b
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := netcdf
 $(PKG)_FILE     := netcdf-$($(PKG)_VERSION).tar.gz