changeset 4096:414c464563c6

of-fits: update to v1.0.7 * build_packages.m: update fits version * src/of-fits-1-cross-fixes.patch: update patch for cross compile 1.0.7 * src/of-fits.mk update version, checksum
author John Donoghue
date Thu, 25 Feb 2016 13:14:54 -0500
parents 42b360982b2d
children 62e60aa89275
files build_packages.m src/of-fits-1-cross-fixes.patch src/of-fits.mk
diffstat 3 files changed, 9 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/build_packages.m	Thu Feb 25 13:04:24 2016 -0500
+++ b/build_packages.m	Thu Feb 25 13:14:54 2016 -0500
@@ -40,7 +40,7 @@
 try_install data-smoothing-1.3.0.tar.gz
 try_install fuzzy-logic-toolkit-0.4.5.tar.gz
 try_install quaternion-2.4.0.tar.gz
-try_install fits-1.0.5.tar.gz
+try_install fits-1.0.7.tar.gz
 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
--- a/src/of-fits-1-cross-fixes.patch	Thu Feb 25 13:04:24 2016 -0500
+++ b/src/of-fits-1-cross-fixes.patch	Thu Feb 25 13:14:54 2016 -0500
@@ -1,11 +1,11 @@
-diff -ur fits.orig/src/Makefile fits/src/Makefile
---- fits.orig/src/Makefile	2015-03-20 13:37:26.766478760 -0400
-+++ fits/src/Makefile	2015-03-20 13:39:14.198586323 -0400
+diff -ur fits-1.0.7.orig/src/Makefile fits-1.0.7/src/Makefile
+--- fits-1.0.7.orig/src/Makefile	2016-02-25 13:08:47.394452025 -0500
++++ fits-1.0.7/src/Makefile	2016-02-25 13:10:40.437730825 -0500
 @@ -1,4 +1,6 @@
--MKOCT_FLAGS = $(shell pkg-config --libs cfitsio)
+-MKOCT_FLAGS = $(shell pkg-config --libs cfitsio --cflags cfitsio)
 +MKOCTFILE ?= mkoctfile
 +PKG_CONFIG ?= pkg-config
-+MKOCT_FLAGS = $(shell $(PKG_CONFIG) --libs cfitsio)
++MKOCT_FLAGS = $(shell $(PKG_CONFIG) --libs cfitsio --cflags cfitsio)
  
  all: read_fits_image.oct save_fits_image.oct save_fits_image_multi_ext.oct
  
--- a/src/of-fits.mk	Thu Feb 25 13:04:24 2016 -0500
+++ b/src/of-fits.mk	Thu Feb 25 13:14:54 2016 -0500
@@ -3,10 +3,10 @@
 
 PKG             := of-fits
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.0.5
-$(PKG)_CHECKSUM := 0803d815d83d82d1b906c3a00fb43f72afbf4362
+$(PKG)_VERSION  := 1.0.7
+$(PKG)_CHECKSUM := 60b535df86444c9b173dfdafaab58ad4d4eb4274
 $(PKG)_REMOTE_SUBDIR := 
-$(PKG)_SUBDIR   := fits
+$(PKG)_SUBDIR   := fits-$($(PKG)_VERSION)
 $(PKG)_FILE     := fits-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/octave/$($(PKG)_FILE)?download
 $(PKG)_DEPS     := pkg-config cfitsio