Mercurial > mxe-octave
changeset 3414:3d24cec05900
Add octave forge fits package
* Makefile.in: Add of-fits.
* build_packages.m: Add install of fits-1.0.3.tar.gz
* dist-files: Add of-fits.mk, of-fits-1-fixes.patch.
* index.html: Added of-fits-package.
* src/of-fits.mk: New file.
* src/of-fits-1-fixes.patch: New file.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sun, 12 Jan 2014 01:05:00 -0500 |
parents | 81b16a4eb550 |
children | a70e260220fc 0182ffc974a1 |
files | Makefile.in build_packages.m dist-files.mk index.html src/of-fits-1-fixes.patch src/of-fits.mk |
diffstat | 6 files changed, 50 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in Sun Jan 12 00:18:42 2014 -0500 +++ b/Makefile.in Sun Jan 12 01:05:00 2014 -0500 @@ -350,7 +350,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) +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) MAKE_SHARED_FROM_STATIC := \ $(TOP_DIR)/tools/make-shared-from-static $(MAKE_SHARED_FROM_STATIC_OPTIONS)
--- a/build_packages.m Sun Jan 12 00:18:42 2014 -0500 +++ b/build_packages.m Sun Jan 12 01:05:00 2014 -0500 @@ -21,4 +21,5 @@ pkg install data-smoothing-1.3.0.tar.gz pkg install fuzzy-logic-toolkit-0.4.2.tar.gz pkg install quaternion-2.2.0.tar.gz +pkg install fits-1.0.3.tar.gz
--- a/dist-files.mk Sun Jan 12 00:18:42 2014 -0500 +++ b/dist-files.mk Sun Jan 12 01:05:00 2014 -0500 @@ -384,6 +384,8 @@ of-communications.mk \ of-control.mk \ of-data-smoothing.mk \ + of-fits.mk \ + of-fits-1-fixes.patch \ of-fuzzy-logic-toolkit.mk \ of-general.mk \ of-geometry.mk \
--- a/index.html Sun Jan 12 00:18:42 2014 -0500 +++ b/index.html Sun Jan 12 01:05:00 2014 -0500 @@ -1963,6 +1963,11 @@ <td id="of-data-smoothing-website"><a href="http://octave.sf.net/">Octave Forge data-smoothing package</a></td> </tr> <tr> + <td id="of-fits-package">of-fits</td> + <td id="of-fits-version">1.0.3</td> + <td id="of-fits-website"><a href="http://octave.sf.net/">Octave Forge fits package</a></td> + </tr> + <tr> <td id="of-fuzzy-logic-toolkit-package">of-fuzzy-logic-toolkit</td> <td id="of-fuzzy-logic-toolkit-version">0.4.2</td> <td id="of-fuzzy-logic-toolkit-website"><a href="http://octave.sf.net/">Octave Forge fuzzy-logic-toolkit package</a></td>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-fits-1-fixes.patch Sun Jan 12 01:05:00 2014 -0500 @@ -0,0 +1,21 @@ +diff -ur fits.orig/src/Makefile fits/src/Makefile +--- fits.orig/src/Makefile 2014-01-12 00:19:31.000000000 -0500 ++++ fits/src/Makefile 2014-01-12 00:52:57.000000000 -0500 +@@ -1,4 +1,4 @@ +-MKOCT_FLAGS = $(shell pkg-config --libs cfitsio) ++MKOCT_FLAGS = $(shell pkg-config --libs --cflags cfitsio) + + all: read_fits_image.oct save_fits_image.oct save_fits_image_multi_ext.oct + +diff -ur fits.orig/src/read_fits_image.cc fits/src/read_fits_image.cc +--- fits.orig/src/read_fits_image.cc 2014-01-12 00:19:31.000000000 -0500 ++++ fits/src/read_fits_image.cc 2014-01-12 00:51:26.000000000 -0500 +@@ -136,7 +136,7 @@ + } + //std::cerr << "read_sz: " << read_sz << std::endl; + +- #if OCTAVE_API_VERSION_NUMBER >= 45 ++ #if ! defined OCTAVE_API_VERSION_NUMBER || OCTAVE_API_VERSION_NUMBER >= 45 + MArray<double> image_data( dims ); // a octace double-type array + #else + MArrayN<double> image_data( dims ); // a octave double-type array
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-fits.mk Sun Jan 12 01:05:00 2014 -0500 @@ -0,0 +1,20 @@ +# This file is part of MXE. +# See index.html for further information. + +PKG := of-fits +$(PKG)_IGNORE := +$(PKG)_CHECKSUM := 6aecd4611879acaae1918025148cc09e197e0e82 +$(PKG)_REMOTE_SUBDIR := +$(PKG)_SUBDIR := fits +$(PKG)_FILE := fits-$($(PKG)_VERSION).tar.gz +$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/octave/$($(PKG)_FILE)?download +$(PKG)_DEPS := pkg-config cfitsio + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package $(PKG).' >&2; + echo $($(PKG)_VERSION) +endef + +define $(PKG)_BUILD + $(OCTAVE_FORGE_PKG_BUILD) +endef