diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/festival/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/festival/speech_tools-2.1-build.patch | 81 |
2 files changed, 87 insertions, 2 deletions
diff --git a/extra/festival/PKGBUILD b/extra/festival/PKGBUILD index a05c8574a..a663b3353 100644 --- a/extra/festival/PKGBUILD +++ b/extra/festival/PKGBUILD @@ -20,7 +20,8 @@ source=("http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/${pkgname}-${pk "http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz" 'speechconfig.patch' 'festconfig.patch' - 'festival-shared-build.patch') + 'festival-shared-build.patch' + 'speech_tools-2.1-build.patch') md5sums=('c93eb3e389ed171ab9abd46afe8897a8' '6920ddc75b042910a3bcfee3ab106938' '6a2ee4fed7c3ebedf197a3b8524ccb87' @@ -28,14 +29,17 @@ md5sums=('c93eb3e389ed171ab9abd46afe8897a8' 'aa80f9250065b318325f16fdad3a4484' 'c30ae990baca40c9c2b1d5cd27502139' '348cc033430aee7989463198818ae74c' - '46132b1cd86a982007312def49ab176a') + '46132b1cd86a982007312def49ab176a' + '347c9433a3879c0f12e1cd6befbd92ff') build() { cd "$srcdir" patch -Np0 -i "$srcdir/festival-shared-build.patch" + patch -Np0 -i ${srcdir}/speech_tools-2.1-build.patch # Build Speech Tools first cd "$srcdir/speech_tools" + sed -i 's/ -fno-shared-data//g' config/compilers/gcc_defaults.mak patch -Np1 -i "$srcdir/speechconfig.patch" ./configure --prefix=/usr --sysconfdir=/etc --build=$CHOST --host=$CHOST make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" diff --git a/extra/festival/speech_tools-2.1-build.patch b/extra/festival/speech_tools-2.1-build.patch new file mode 100644 index 000000000..f465e6cb6 --- /dev/null +++ b/extra/festival/speech_tools-2.1-build.patch @@ -0,0 +1,81 @@ +--- speech_tools.orig/include/EST_TIterator.h 2004-05-03 19:00:16.000000000 -0500 ++++ speech_tools/include/EST_TIterator.h 2013-07-21 23:38:24.643554686 -0500 +@@ -209,7 +209,7 @@ + + /// Create an iterator ready to run over the given container. + EST_TStructIterator(const Container &over) +- { begin(over); } ++ { this->begin(over); } + + const Entry *operator ->() const + {return &this->current();} +@@ -289,7 +289,7 @@ + + /// Create an iterator ready to run over the given container. + EST_TRwStructIterator(Container &over) +- { begin(over); } ++ { this->begin(over); } + + Entry *operator ->() const + {return &this->current();} +--- speech_tools.orig/include/EST_TNamedEnum.h 2004-09-30 07:53:36.000000000 -0500 ++++ speech_tools/include/EST_TNamedEnum.h 2013-07-21 23:55:47.072143553 -0500 +@@ -130,7 +130,7 @@ + {this->initialise((const void *)defs); }; + EST_TNamedEnumI(EST_TValuedEnumDefinition<const char *,const char *,INFO> defs[], ENUM (*conv)(const char *)) + {this->initialise((const void *)defs, conv); }; +- const char *name(ENUM tok, int n=0) const {return value(tok,n); }; ++ const char *name(ENUM tok, int n=0) const {return this->value(tok,n); }; + + }; + +--- speech_tools.orig/base_class/EST_TSimpleMatrix.cc 2009-02-18 07:56:24.000000000 -0500 ++++ speech_tools/base_class/EST_TSimpleMatrix.cc 2013-07-22 01:23:50.302856444 -0500 +@@ -42,6 +42,7 @@ + + #include "EST_TSimpleMatrix.h" + #include "EST_TVector.h" ++#include <cstring> + #include <fstream> + #include <iostream> + #include "EST_cutils.h" +@@ -98,7 +99,7 @@ + { + int copy_r = Lof(this->num_rows(), new_rows); + +- just_resize(new_rows, new_cols, &old_vals); ++ this->just_resize(new_rows, new_cols, &old_vals); + + for (q=0; q<(copy_r*new_cols*sizeof(T)); q++) /* memcpy */ + ((char *)this->p_memory)[q] = ((char *)old_vals)[q]; +@@ -127,9 +128,9 @@ + int copy_r = Lof(this->num_rows(), new_rows); + int copy_c = Lof(this->num_columns(), new_cols); + +- just_resize(new_rows, new_cols, &old_vals); ++ this->just_resize(new_rows, new_cols, &old_vals); + +- set_values(old_vals, ++ this->set_values(old_vals, + old_row_step, old_column_step, + 0, copy_r, + 0, copy_c); +--- speech_tools.orig/base_class/EST_TSimpleVector.cc 2009-02-18 07:52:55.000000000 -0500 ++++ speech_tools/base_class/EST_TSimpleVector.cc 2013-07-22 01:43:44.981811522 -0500 +@@ -42,6 +42,7 @@ + + #include "EST_TSimpleVector.h" + #include "EST_matrix_support.h" ++#include <cstring> + #include <fstream> + #include "EST_cutils.h" + +@@ -70,7 +71,7 @@ + int old_offset = this->p_offset; + unsigned int q; + +- just_resize(newn, &old_vals); ++ this->just_resize(newn, &old_vals); + + if (set && old_vals) + { |