# HG changeset patch # User John Donoghue # Date 1431892709 14400 # Node ID 4255bbc26c5ebc86c0ff326cbf8e1cb7b0d3243a # Parent e143ff6d58febabb5fc7e8307c118d88345ad34b of-ltfat: update to v2.1.0 * src/of-ltfat.mk: update version, checksum * src/of-ltfat-1-mingw-fixes.patch: removed file * dist-files.mk: remove of-ltfat-1-mingw-fixes.patch * build_packages.m: change ltfat version diff -r e143ff6d58fe -r 4255bbc26c5e build_packages.m --- a/build_packages.m Sat May 16 07:40:05 2015 -0400 +++ b/build_packages.m Sun May 17 15:58:29 2015 -0400 @@ -44,7 +44,7 @@ try_install tsa-4.2.7.tar.gz try_install dicom-0.1.1.tar.gz try_install netcdf-1.0.6.tar.gz -try_install ltfat-2.0.1.tar.gz +try_install ltfat-2.1.0.tar.gz try_install database-2.3.2.tar.gz try_install instrument-control-0.2.1.tar.gz try_install generate_html-0.1.8.tar.gz diff -r e143ff6d58fe -r 4255bbc26c5e dist-files.mk --- a/dist-files.mk Sat May 16 07:40:05 2015 -0400 +++ b/dist-files.mk Sun May 17 15:58:29 2015 -0400 @@ -470,7 +470,6 @@ of-linear-algebra-1-cross-fixes.patch \ of-linear-algebra.mk \ of-lssa.mk \ - of-ltfat-1-mingw-fixes.patch \ of-ltfat.mk \ of-miscellaneous-1-fixes.patch \ of-miscellaneous.mk \ diff -r e143ff6d58fe -r 4255bbc26c5e src/of-ltfat-1-mingw-fixes.patch --- a/src/of-ltfat-1-mingw-fixes.patch Sat May 16 07:40:05 2015 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,50 +0,0 @@ -diff -ur ltfat.orig/src/Makefile.in ltfat/src/Makefile.in ---- ltfat.orig/src/Makefile.in 2014-11-13 07:55:44 -0500 -+++ ltfat/src/Makefile.in 2014-11-13 15:31:03 -0500 -@@ -1,5 +1,11 @@ - targets = oct playrec - -+CC=@CC@ -+CXX=@CXX@ -+ -+export CC -+export CXX -+ - ifeq (@have_libportaudio@,1) - export HAVE_PORTAUDIO=1 - endif -diff -ur ltfat.orig/src/Makefile_unix ltfat/src/Makefile_unix ---- ltfat.orig/src/Makefile_unix 2014-11-13 07:55:44 -0500 -+++ ltfat/src/Makefile_unix 2014-11-21 08:31:02 -0500 -@@ -21,8 +21,11 @@ - SFFTW=-lfftw3f - endif - -- --CFLAGS=-O3 -fPIC -std=c99 -Ithirdparty -+ifeq ($(OS),Windows_NT) -+ CFLAGS=-O3 -std=c99 -Ithirdparty -+else -+ CFLAGS=-O3 -fPIC -std=c99 -Ithirdparty -+endif - SHARED_FLAGS=-shared -Wl,--no-undefined -lc -lm -L"$(MATLABROOT)/bin/$(ARCH)" \ - -lmwblas -lmwlapack $(DFFTW) $(SFFTW) - -diff -ur ltfat.orig/src/ostools.mk ltfat/src/ostools.mk ---- ltfat.orig/src/ostools.mk 2014-11-13 07:55:44 -0500 -+++ ltfat/src/ostools.mk 2014-11-13 15:28:55 -0500 -@@ -9,12 +9,14 @@ - CP = copy /Y - PS2 = \\ - PS = $(strip $(PS2)) -+ifndef SHELL - ifdef ComSpec - SHELL := $(ComSpec) - endif - ifdef COMSPEC - SHELL := $(COMSPEC) - endif -+endif - CC = gcc - else - #If not on Windows diff -r e143ff6d58fe -r 4255bbc26c5e src/of-ltfat.mk --- a/src/of-ltfat.mk Sat May 16 07:40:05 2015 -0400 +++ b/src/of-ltfat.mk Sun May 17 15:58:29 2015 -0400 @@ -3,8 +3,8 @@ PKG := of-ltfat $(PKG)_IGNORE := -$(PKG)_VERSION := 2.0.1 -$(PKG)_CHECKSUM := 5c1d4ee5b3a9e478ef8a5ecb3a2ae1bd84f6fd61 +$(PKG)_VERSION := 2.1.0 +$(PKG)_CHECKSUM := 20e3dea089addb57bd3f3cb2810913cd72abf413 $(PKG)_REMOTE_SUBDIR := $(PKG)_SUBDIR := ltfat $(PKG)_FILE := ltfat-$($(PKG)_VERSION).tar.gz