From cf9d33ced85793f5709143182c06765bb53a9004 Mon Sep 17 00:00:00 2001 From: drowe67 Date: Mon, 19 Sep 2016 01:28:19 +0000 Subject: [PATCH] fixed patch and instructions git-svn-id: https://svn.code.sf.net/p/freetel/code@2877 01035d8c-6547-0410-b346-abe4f91aad63 --- codec2-dev/octave/cml.patch | 39 ++++++++++++++++++++++--------------- codec2-dev/octave/ldpc.m | 5 +++-- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/codec2-dev/octave/cml.patch b/codec2-dev/octave/cml.patch index d5ba3205..cb517a45 100644 --- a/codec2-dev/octave/cml.patch +++ b/codec2-dev/octave/cml.patch @@ -1,24 +1,31 @@ -diff -ruN -x '*.o' -x '*.dll' -x '*.mex' -x '*.mat' cml-orig/CmlStartup.m cml/CmlStartup.m --- cml-orig/CmlStartup.m 2007-09-08 23:12:26.000000000 +0930 -+++ cml/CmlStartup.m 2015-09-04 07:21:14.218455223 +0930 ++++ cml/CmlStartup.m 2016-09-19 10:30:08.673767127 +0930 +@@ -20,7 +20,7 @@ + addpath( strcat( cml_home, '\mex'), ... + strcat( cml_home, '\mat'), ... + strcat( cml_home, '\matalt' ), ... +- strcat( cml_home, '\mexhelp'), ... ++ %strcat( cml_home, '\mexhelp'), ... + strcat( cml_home, '\demos' ), ... + strcat( cml_home, '\scenarios'), ... + strcat( cml_home, '\localscenarios'),... @@ -41,7 +41,7 @@ - addpath( strcat( cml_home, '/mex'), ... - strcat( cml_home, '/mat'), ... - strcat( cml_home, '/matalt' ), ... -- strcat( cml_home, '/mexhelp'), ... -+ %strcat( cml_home, '/mexhelp'), ... - strcat( cml_home, '/demos' ), ... - strcat( cml_home, '/scenarios'), ... - strcat( cml_home, '/localscenarios'),... + addpath( strcat( cml_home, '/mex'), ... + strcat( cml_home, '/mat'), ... + strcat( cml_home, '/matalt' ), ... +- strcat( cml_home, '/mexhelp'), ... ++ %strcat( cml_home, '/mexhelp'), ... + strcat( cml_home, '/demos' ), ... + strcat( cml_home, '/scenarios'), ... + strcat( cml_home, '/localscenarios'),... @@ -59,4 +59,4 @@ - save_directory = strcat( cml_home, '/scenarios/CmlHome.mat' ); - end - + save_directory = strcat( cml_home, '/scenarios/CmlHome.mat' ); + end + -save( save_directory, save_flag, 'cml_home' ); \ No newline at end of file -+save( save_directory, save_flag, 'cml_home' ); -diff -ruN -x '*.o' -x '*.dll' -x '*.mex' -x '*.mat' cml-orig/source/matrix.h cml/source/matrix.h ++save( save_directory, save_flag, 'cml_home' ); --- cml-orig/source/matrix.h 1970-01-01 09:30:00.000000000 +0930 -+++ cml/source/matrix.h 2015-09-04 07:06:46.907248420 +0930 ++++ cml/source/matrix.h 2016-09-19 10:25:58.009761169 +0930 @@ -0,0 +1 @@ +#include diff --git a/codec2-dev/octave/ldpc.m b/codec2-dev/octave/ldpc.m index 38713031..1151adfd 100644 --- a/codec2-dev/octave/ldpc.m +++ b/codec2-dev/octave/ldpc.m @@ -9,10 +9,11 @@ % $ sudo apt-get install liboctave-dev % $ wget http://www.iterativesolutions.com/user/image/cml.1.10.zip % $ unzip cml.1.10.zip -% $ patch < ~/codec2-dev/octave/cml.patch -% $ cd source +% $ patch -p0 < ~/codec2-dev/octave/cml.patch +% $ cd cml/source % $ octave % octave:> make +% (you'll see a few warnings but hopefully no errors) 1; -- 2.25.1