Mercurial > mxe-octave
changeset 3899:1778bfc775d2
Add nurbs package
* src/of-nurbs.mk: new file
* src/of-nurbs-1-fixes.patch: new file
* Makefile.in: add nurbs
* index.html: add nurbs package
* dist-files.mk: add of-nurbs.mk, of-nurbs-1-fixes.patch
| author | John Donoghue <john.donoghue@ieee.org> |
|---|---|
| date | Mon, 13 Apr 2015 06:40:23 -0400 |
| parents | abf9c5216a21 |
| children | b68c2c052a28 |
| files | Makefile.in dist-files.mk index.html src/of-nurbs-1-fixes.patch src/of-nurbs.mk |
| diffstat | 5 files changed, 50 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Sun Apr 12 19:02:40 2015 -0400 +++ b/Makefile.in Mon Apr 13 06:40:23 2015 -0400 @@ -419,7 +419,7 @@ endif OCTAVE_FORGE_BASE_URL := 'http://sourceforge.net/projects/octave/files/Octave Forge Packages/Individual Package Releases' -OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control geometry windows odepkg linear-algebra sockets zenity actuarial data-smoothing fuzzy-logic-toolkit quaternion fits fl-core tsa dicom netcdf ltfat database instrument-control generate_html) +OCTAVE_FORGE_PACKAGES := $(addprefix of-,miscellaneous struct optim specfun general signal communications image io statistics control geometry windows odepkg linear-algebra sockets zenity actuarial data-smoothing fuzzy-logic-toolkit quaternion fits fl-core tsa dicom netcdf ltfat database instrument-control generate_html nurbs) # get ALL deps for all of- packages, regardless of whethe building the actual forge package in the installer OCTAVE_FORGE_DEPS:= $(sort $(foreach p,$(wildcard $(TOP_DIR)/src/of-*.mk),$(shell $(SED) -n 's/.*_DEPS.*:=\(.*\)/\1/p' $p)))
--- a/dist-files.mk Sun Apr 12 19:02:40 2015 -0400 +++ b/dist-files.mk Mon Apr 13 06:40:23 2015 -0400 @@ -469,6 +469,8 @@ of-miscellaneous.mk \ of-netcdf-1-cross-fixes.patch \ of-netcdf.mk \ + of-nurbs-1-fixes.patch \ + of-nurbs.mk \ of-odepkg.mk \ of-optim.mk \ of-quaternion.mk \
--- a/index.html Sun Apr 12 19:02:40 2015 -0400 +++ b/index.html Mon Apr 13 06:40:23 2015 -0400 @@ -1906,6 +1906,10 @@ <td class="website"><a href="http://octave.sf.net/">Octave Forge netcdf package</a></td> </tr> <tr> + <td class="package">of-nurbs</td> + <td class="website"><a href="http://octave.sf.net/">Octave Forge nurbs package</a></td> + </tr> + <tr> <td class="package">of-odepkg</td> <td class="website"><a href="http://octave.sf.net/">Octave Forge odepkg package</a></td> </tr>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-nurbs-1-fixes.patch Mon Apr 13 06:40:23 2015 -0400 @@ -0,0 +1,21 @@ +diff -ur nurbs.orig/src/nrbsurfderiveval.cc nurbs/src/nrbsurfderiveval.cc +--- nurbs.orig/src/nrbsurfderiveval.cc 2015-04-13 06:35:14.000000000 -0400 ++++ nurbs/src/nrbsurfderiveval.cc 2015-04-13 06:36:26.000000000 -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++)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-nurbs.mk Mon Apr 13 06:40:23 2015 -0400 @@ -0,0 +1,22 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-nurbs +$(PKG)_IGNORE := +$(PKG)_VERSION := 1.3.9 +$(PKG)_CHECKSUM := 4727f2e38486bdc8452d7657094fbdb7a3980ba5 +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := nurbs +$(PKG)_FILE := nurbs-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download' +$(PKG)_DEPS := + +define $(PKG)_UPDATE + $(WGET) -q -O- 'http://$(SOURCEFORGE_MIRROR)/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/' | \ + $(SED) -n 's,.*title="nurbs-\([0-9][^"]*\).tar.gz".*,\1,p' | \ + head -1 +endef + +define $(PKG)_BUILD + $(OCTAVE_FORGE_PKG_BUILD) +endef