# HG changeset patch
# User John D
# Date 1441648005 14400
# Node ID e9bc89b9805442f9fc69927b1d78761b103ff6a0
# Parent  d29eed069efd9c1b5780e5e6c38b4e5450dd990d
of-nurbs: update to 1.3.10

* build_packages.m: update nurbs version

* src/of-nurbbs.mk: update version, checksum

* dist-files.mk: remove ref to of-nurbs-1-fixes.patch

* src/of-nurbs-1-fixes.patch: removed file

diff -r d29eed069efd -r e9bc89b98054 build_packages.m
--- a/build_packages.m	Mon Sep 07 13:41:07 2015 -0400
+++ b/build_packages.m	Mon Sep 07 13:46:45 2015 -0400
@@ -55,7 +55,7 @@
 try_install dataframe-1.1.0.tar.gz
 try_install lssa-0.1.2.tar.gz
 try_install queueing-1.2.3.tar.gz
-try_install nurbs-1.3.9.tar.gz
+try_install nurbs-1.3.10.tar.gz
 try_install octcdf-1.1.8.tar.gz
 try_install strings-1.2.0.tar.gz
 try_install ga-0.10.0.tar.gz
diff -r d29eed069efd -r e9bc89b98054 dist-files.mk
--- a/dist-files.mk	Mon Sep 07 13:41:07 2015 -0400
+++ b/dist-files.mk	Mon Sep 07 13:46:45 2015 -0400
@@ -482,7 +482,6 @@
   of-nan-1-cross-fixes.patch \
   of-nan.mk \
   of-netcdf.mk \
-  of-nurbs-1-fixes.patch \
   of-nurbs.mk \
   of-ocs-1-cross-fixes.patch \
   of-ocs.mk \
diff -r d29eed069efd -r e9bc89b98054 src/of-nurbs-1-fixes.patch
--- a/src/of-nurbs-1-fixes.patch	Mon Sep 07 13:41:07 2015 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-diff -ur nurbs.orig/src/Makefile nurbs/src/Makefile
---- nurbs.orig/src/Makefile	2015-04-14 13:19:10.283611864 -0400
-+++ nurbs/src/Makefile	2015-04-14 13:21:10.137011941 -0400
-@@ -2,13 +2,15 @@
- curvederivcpts.oct nrb_srf_basisfun_der__.oct surfderiveval.oct bspderiv.oct \
- nrbsurfderiveval.oct tbasisfun.oct
- 
-+MKOCTFILE ?= mkoctfile
-+
- all: $(OCTFILES)
- 
- low_level_functions.o: low_level_functions.cc
--	mkoctfile -c $<
-+	$(MKOCTFILE) -c $<
- 
- %.oct:  %.cc low_level_functions.o
--	mkoctfile $< low_level_functions.o
-+	$(MKOCTFILE) $< low_level_functions.o
- 
- clean:
- 	-rm -f *.o core octave-core *.oct *~
-diff -ur nurbs.orig/src/nrbsurfderiveval.cc nurbs/src/nrbsurfderiveval.cc
---- nurbs.orig/src/nrbsurfderiveval.cc	2015-04-14 13:19:10.283611864 -0400
-+++ nurbs/src/nrbsurfderiveval.cc	2015-04-14 13:19:47.273352588 -0400
-@@ -120,7 +120,7 @@
-       
-       Array<idx_vector> idx(dim_vector (3, 1), idx_vector(':'));	 
-       idx (0) = idx_vector (3);
--      Matrix weights (NDArray (coefs.index (idx).squeeze ()).matrix_value ());
-+      Matrix weights (NDArray (coefs.index (idx).squeeze ()));
- 
-       for (octave_idx_type iu(0); iu<uv.cols (); iu++)
- 	{
-@@ -132,7 +132,7 @@
- 	    {
- 
- 	      Matrix Aders; idx(0) = idx_vector (idim);
--	      Matrix P (NDArray (coefs.index (idx).squeeze ()).matrix_value ());
-+	      Matrix P (NDArray (coefs.index (idx).squeeze ()));
- 	      surfderiveval (n, p, knotsu, m, q, knotsv, P, uv(0,iu), uv(1,iu), d, Aders);;      
- 	      
- 	      for (octave_idx_type k(0); k<=d; k++)
diff -r d29eed069efd -r e9bc89b98054 src/of-nurbs.mk
--- a/src/of-nurbs.mk	Mon Sep 07 13:41:07 2015 -0400
+++ b/src/of-nurbs.mk	Mon Sep 07 13:46:45 2015 -0400
@@ -3,8 +3,8 @@
 
 PKG             := of-nurbs
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.3.9
-$(PKG)_CHECKSUM := 4727f2e38486bdc8452d7657094fbdb7a3980ba5
+$(PKG)_VERSION  := 1.3.10
+$(PKG)_CHECKSUM := 92ae4351cbd61df0246822c5464968267712576e
 $(PKG)_REMOTE_SUBDIR := 
 $(PKG)_SUBDIR   := nurbs
 $(PKG)_FILE     := nurbs-$($(PKG)_VERSION).tar.gz