Mercurial > mxe-octave
changeset 4089:98a8748f0438
of-mapping: update to 1.2.1
* build_packages.m: update mapping version
* src/of-mapping.mk: update checksum,version, subdir and add dependancy on gdal
* src/of-mapping-1-cross-fixes.patch: new file
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Mon, 08 Feb 2016 06:15:11 -0500 |
parents | 48ef551fa5e0 |
children | d6f9b54851b5 |
files | build_packages.m src/of-mapping-1-cross-fixes.patch src/of-mapping.mk |
diffstat | 3 files changed, 33 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/build_packages.m Wed Feb 03 08:46:16 2016 -0500 +++ b/build_packages.m Mon Feb 08 06:15:11 2016 -0500 @@ -62,7 +62,7 @@ try_install interval-1.2.0.tar.gz try_install nan-2.8.1.tar.gz try_install ocs-0.1.5.tar.gz -try_install mapping-1.2.0.tar.gz +try_install mapping-1.2.1.tar.gz try_install tisean-0.2.3.tar.gz try_install sparsersb-1.0.0.tar.gz try_install video-1.2.2.tar.gz
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/of-mapping-1-cross-fixes.patch Mon Feb 08 06:15:11 2016 -0500 @@ -0,0 +1,28 @@ +diff -ur mapping-1.2.1.orig/src/configure mapping-1.2.1/src/configure +--- mapping-1.2.1.orig/src/configure 2016-02-08 12:49:21.906234446 -0500 ++++ mapping-1.2.1/src/configure 2016-02-08 12:50:26.136276230 -0500 +@@ -1810,8 +1810,8 @@ + OCTAVE=octave + fi + +-HAS_RAD2DEG=`$OCTAVE -qf --eval "printf ('%i', exist ('rad2deg'))"` +-HAS_DEG2RAD=`$OCTAVE -qf --eval "printf ('%i', exist ('deg2rad'))"` ++HAS_RAD2DEG=0 #`$OCTAVE -qf --eval "printf ('%i', exist ('rad2deg'))"` ++HAS_DEG2RAD=0 #`$OCTAVE -qf --eval "printf ('%i', exist ('deg2rad'))"` + + if test "$HAS_RAD2DEG" == 0; then + ac_config_files="$ac_config_files rad2deg.m" +diff -ur mapping-1.2.1.orig/src/configure.ac mapping-1.2.1/src/configure.ac +--- mapping-1.2.1.orig/src/configure.ac 2016-02-08 12:49:21.906234446 -0500 ++++ mapping-1.2.1/src/configure.ac 2016-02-08 12:50:01.067650216 -0500 +@@ -11,8 +11,8 @@ + OCTAVE=octave + fi + +-HAS_RAD2DEG=`$OCTAVE -qf --eval "printf ('%i', exist ('rad2deg'))"` +-HAS_DEG2RAD=`$OCTAVE -qf --eval "printf ('%i', exist ('deg2rad'))"` ++HAS_RAD2DEG=0 #`$OCTAVE -qf --eval "printf ('%i', exist ('rad2deg'))"` ++HAS_DEG2RAD=0 #`$OCTAVE -qf --eval "printf ('%i', exist ('deg2rad'))"` + + if test "$HAS_RAD2DEG" == 0; then + AC_CONFIG_FILES([rad2deg.m])
--- a/src/of-mapping.mk Wed Feb 03 08:46:16 2016 -0500 +++ b/src/of-mapping.mk Mon Feb 08 06:15:11 2016 -0500 @@ -3,13 +3,13 @@ PKG := of-mapping $(PKG)_IGNORE := -$(PKG)_VERSION := 1.2.0 -$(PKG)_CHECKSUM := 21101d6d1a92499df826063ce79ee093fd95d23d +$(PKG)_VERSION := 1.2.1 +$(PKG)_CHECKSUM := dcda538e8142365f3c8485238e2cd6caf737b62e $(PKG)_REMOTE_SUBDIR := -$(PKG)_SUBDIR := mapping +$(PKG)_SUBDIR := mapping-$($(PKG)_VERSION) $(PKG)_FILE := mapping-$($(PKG)_VERSION).tar.gz $(PKG)_URL := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download' -$(PKG)_DEPS := +$(PKG)_DEPS := gdal define $(PKG)_UPDATE $(WGET) -q -O- 'http://$(SOURCEFORGE_MIRROR)/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/' | \