# HG changeset patch
# User John Donoghue
# Date 1416938063 18000
# Node ID 6dc67bfb5958b93ef11a6de7ae6322475b985184
# Parent 2609ed5b5d7635f40105d7f94f77d17bde4b9435
ltfat: add of-ltfat package
* Makefile.in: add ltfat for OCTAVE_FORGE_PACKAGES
* build_packages: add build of ltfat-2.0.1.tar.gz
* dist-files.mk: add of-ltfat.mk, of-ltfat-1-mingw-fixes.patch
* index.html: add of-ltfat package.
* src/of-ltfat-1-mingw-fixes.patch: new file
* src/of-ltfat.mk: new file.
diff -r 2609ed5b5d76 -r 6dc67bfb5958 Makefile.in
--- a/Makefile.in Wed Nov 19 13:56:02 2014 -0500
+++ b/Makefile.in Tue Nov 25 12:54:23 2014 -0500
@@ -390,7 +390,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)
+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)
BLAS_PACKAGES := blas
ifeq ($(ENABLE_OPENBLAS),yes)
diff -r 2609ed5b5d76 -r 6dc67bfb5958 build_packages.m
--- a/build_packages.m Wed Nov 19 13:56:02 2014 -0500
+++ b/build_packages.m Tue Nov 25 12:54:23 2014 -0500
@@ -46,4 +46,5 @@
try_install tsa-4.2.7.tar.gz
try_install dicom-0.1.1.tar.gz
try_install netcdf-1.0.5.tar.gz
+try_install ltfat-2.0.1.tar.gz
diff -r 2609ed5b5d76 -r 6dc67bfb5958 dist-files.mk
--- a/dist-files.mk Wed Nov 19 13:56:02 2014 -0500
+++ b/dist-files.mk Tue Nov 25 12:54:23 2014 -0500
@@ -446,6 +446,8 @@
of-image.mk \
of-io.mk \
of-linear-algebra.mk \
+ of-ltfat.mk \
+ of-ltfat-1-mingw-fixes.patch \
of-miscellaneous.mk \
of-netcdf.mk \
of-odepkg.mk \
diff -r 2609ed5b5d76 -r 6dc67bfb5958 index.html
--- a/index.html Wed Nov 19 13:56:02 2014 -0500
+++ b/index.html Tue Nov 25 12:54:23 2014 -0500
@@ -1858,6 +1858,10 @@
Octave Forge linear-algebra package |
+ of-ltfat |
+ Octave Forge ltfat package |
+
+
of-miscellaneous |
Octave Forge miscellaneous package |
diff -r 2609ed5b5d76 -r 6dc67bfb5958 src/of-ltfat-1-mingw-fixes.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-ltfat-1-mingw-fixes.patch Tue Nov 25 12:54:23 2014 -0500
@@ -0,0 +1,50 @@
+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 2609ed5b5d76 -r 6dc67bfb5958 src/of-ltfat.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/of-ltfat.mk Tue Nov 25 12:54:23 2014 -0500
@@ -0,0 +1,22 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG := of-ltfat
+$(PKG)_IGNORE :=
+$(PKG)_VERSION := 2.0.1
+$(PKG)_CHECKSUM := 5c1d4ee5b3a9e478ef8a5ecb3a2ae1bd84f6fd61
+$(PKG)_REMOTE_SUBDIR :=
+$(PKG)_SUBDIR := ltfat
+$(PKG)_FILE := ltfat-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL := '$(OCTAVE_FORGE_BASE_URL)/$($(PKG)_FILE)/download'
+$(PKG)_DEPS := portaudio
+
+define $(PKG)_UPDATE
+ $(WGET) -q -O- 'http://$(SOURCEFORGE_MIRROR)/projects/octave/files/Octave%20Forge%20Packages/Individual%20Package%20Releases/' | \
+ $(SED) -n 's,.*title="ltfat-\([0-9][^"]*\).tar.gz".*,\1,p' | \
+ head -1
+endef
+
+define $(PKG)_BUILD
+ $(OCTAVE_FORGE_PKG_BUILD)
+endef