Date: Sunday, July 14, 2019 @ 13:00:29 Author: arojas Revision: 357976
Update to 2.5.0 Added: festival/trunk/festival-2.5.0-compile.patch Modified: festival/trunk/PKGBUILD festival/trunk/festconfig.patch festival/trunk/festival-shared-build.patch festival/trunk/speechconfig.patch Deleted: festival/trunk/festival-2.4-compat.patch festival/trunk/festival-gcc47.patch ------------------------------+ PKGBUILD | 46 ++--- festconfig.patch | 2 festival-2.4-compat.patch | 365 ----------------------------------------- festival-2.5.0-compile.patch | 12 + festival-gcc47.patch | 59 ------ festival-shared-build.patch | 8 speechconfig.patch | 8 7 files changed, 39 insertions(+), 461 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-07-14 11:05:11 UTC (rev 357975) +++ PKGBUILD 2019-07-14 13:00:29 UTC (rev 357976) @@ -4,47 +4,45 @@ # Contributor: Simo Leone <neot...@gmail.com> pkgname=festival -pkgver=2.4 -pkgrel=4 +pkgver=2.5.0 +pkgrel=1 pkgdesc="A general multi-lingual speech synthesis system" arch=(x86_64) -url="http://www.cstr.ed.ac.uk/projects/festival/" +url="http://festvox.org/festival/" license=(BSD GPL custom) depends=(perl alsa-lib) options=('!makeflags') -source=(http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/$pkgname-$pkgver-release.tar.gz - http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/speech_tools-$pkgver-release.tar.gz - http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_CMU.tar.gz - http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_OALD.tar.gz - http://www.cstr.ed.ac.uk/downloads/${pkgname}/${pkgver}/festlex_POSLEX.tar.gz +source=(http://festvox.org/packed/festival/${pkgver%.*}/festival-$pkgver-release.tar.gz + http://festvox.org/packed/festival/${pkgver%.*}/speech_tools-$pkgver-release.tar.gz + http://festvox.org/packed/festival/${pkgver%.*}/festlex_CMU.tar.gz + http://festvox.org/packed/festival/${pkgver%.*}/festlex_OALD.tar.gz + http://festvox.org/packed/festival/${pkgver%.*}/festlex_POSLEX.tar.gz speechconfig.patch festconfig.patch - festival-2.4-compat.patch festival-shared-build.patch - festival-gcc47.patch) -sha512sums=('7c8eb6812c587623ea0877d5c792418ace2787f71087929d867adc4714ba13612da6e431dde89ca234330a83bf76519306c1302623e837a6fbfa4c4416b32231' - 'e6931216069fd3ea791ad22f8657fddd73b18296221e12cbbdf9241d2efda7821ea80a549e595151343533039107a00f939b52f7dc1034a6d9cf2f57d7baefa7' + festival-2.5.0-compile.patch) +sha512sums=('529ec3a1780a861074b6070567f3e11cfcc839081f61e078978a491f11eb424bc4d6adf599f073d5571e20f66871b7045df9f9b175a1083d10e8bb02342639b1' + '013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7' 'c293344020fd3337193303cd5dfb7e2b0a1012770a484d8bccaae921b0c61b75699204bec45fee0db754506d6f1558fd616866cc94e76afcbb85a4dcbcf9542b' 'dc7ec5db71ef331f4c4460a741392d548e037369d47080dc734e912aa312bd5c11e66cdcb94bdc4746a3f6c16c0e0294ce159f07b46e350b85c0afab07cc2064' 'd7f96621fd98bcd3c84f0188fc6ac5a006e2cbb535279693be3341d51148344360f68e67962f08c4041df1e3527de9b30705b13fb9859ad91e3c804704eb5348' - 'a50f876baed49404be9611f01d8762822ae2566c779176a857b4a0aa17fd1e96be429ac10e7f3e1b5aa65525a0e4030194d4b61e0d308086c45df7b45ad4f1be' - '94f654904baeaa3ac3a68e382fdc3b9937c01062924891fef48dbd08403fafcfbff32a92b7064d0e9813bae58239cff83d4aecd786b866f9e2178d2b7942df15' + 'd48f899826914a94efcf4005d0e029cebd577ad2c4feb3e1af2e094259e9ca5a5829a6b5c08f22900049c6032ade926af159200d55613cc8d4f3d17e579edd3a' + 'a3d92ae83bf4b55e9bc83469b85eb1540675c3ed06b9bffa8f99a8a0c4fbdb0cb3fc1abe8c8a4fa5b2c22c77d84bbca36b6b2db3ae0e5ef2d7ddfa214a049372' '246396fd37105025fad4c85df3c3d6060b41712aa555320d89d7c5b40e6231e22c35b79d6c4c235a1b7891595556e3f963d62b5efcd784cc54b30eff166ee914' - 'd9d2202f1f7d6c8df35a3ded9423f0105644356807b0873ffc3ad71987f5c5d9b3490c767a8e5a39011e748627695b62e696ecf5955f77e2375a736795997f73' - '685bb1bde730ea6332fab0d1ac96632511ab3f9b99411689c07eeda2276c089fc8ff2c2bdd5d59e23524482d24b8ce6d1e9e0e65bde991c9999591eb9c4216f8') + 'cd14a06e7eaef8755be08635a6354380c0cd67e533d1ec908413f4096b271c5594c054499d016ec4d255180288a68b55d24b891e06e5d04595e3004f2bb62d49' + '1e00f531710eb7bb4d7fcfd48f53a485023d37a068cfc87323df1fcfd8c358ca3dce21e261dfc73c5a9d724da64f60ea4fca46656215e1cc5055d4f038110567') prepare() { patch -Np0 -i speechconfig.patch patch -Np0 -i festconfig.patch - # fix build with new gcc versions and build shared libs - taken from Mageia + # build shared libs - taken from Mageia patch -Np0 -i festival-shared-build.patch - patch -Np0 -i festival-gcc47.patch - patch -Np0 -i festival-2.4-compat.patch - + patch -p0 -i festival-2.5.0-compile.patch # Fix build (OpenMandriva) + # Avoid make failure on making scripts and docs - sed -i "s#examples bin doc#examples#" festival/Makefile + sed -i "s|examples bin doc|examples|" festival/Makefile } build() { @@ -51,12 +49,12 @@ # Build Speech Tools first cd speech_tools ./configure --prefix=/usr --sysconfdir=/etc - make OPTIMISE_CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing -fno-delete-null-pointer-checks -std=gnu++98" OPTIMISE_CCFLAGS="${CFLAGS} -fno-strict-aliasing" + make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" # Build Festival itself cd ../festival ./configure --prefix=/usr --sysconfdir=/etc - make OPTIMISE_CXXFLAGS="${CXXFLAGS} -fno-delete-null-pointer-checks -std=gnu++98" OPTIMISE_CCFLAGS="${CFLAGS}" + make OPTIMISE_CXXFLAGS="${CXXFLAGS}" OPTIMISE_CCFLAGS="${CFLAGS}" } package() { @@ -120,7 +118,7 @@ #licenses install -D -m644 "$srcdir"/festival/COPYING \ "$pkgdir"/usr/share/licenses/$pkgname/LICENSE - install -D -m644 "$srcdir"/speech_tools/README \ + install -D -m644 "$srcdir"/speech_tools/README.md \ "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.other # Ok now some general cleanups Modified: festconfig.patch =================================================================== --- festconfig.patch 2019-07-14 11:05:11 UTC (rev 357975) +++ festconfig.patch 2019-07-14 13:00:29 UTC (rev 357976) @@ -13,7 +13,7 @@ diff -Nru festival.orig/config/project.mak festival/config/project.mak --- festival.orig/config/project.mak 2004-07-12 10:39:37.000000000 -0500 +++ festival/config/project.mak 2005-05-30 19:50:45.000000000 -0500 -@@ -114,6 +114,5 @@ +@@ -112,6 +112,5 @@ DOCXX_DIRS = $(TOP)/src MODULE_TO_DOCXX = perl $(TOP)/src/modules/utilities/extract_module_doc++.prl Deleted: festival-2.4-compat.patch =================================================================== --- festival-2.4-compat.patch 2019-07-14 11:05:11 UTC (rev 357975) +++ festival-2.4-compat.patch 2019-07-14 13:00:29 UTC (rev 357976) @@ -1,365 +0,0 @@ -diff -Naur festival.orig/src/modules/clustergen/HTS_vocoder_me.cc festival/src/modules/clustergen/HTS_vocoder_me.cc ---- festival.orig/src/modules/clustergen/HTS_vocoder_me.cc 2013-02-18 16:10:50.000000000 +0100 -+++ festival/src/modules/clustergen/HTS_vocoder_me.cc 2015-07-28 18:25:52.846670680 +0200 -@@ -90,8 +90,9 @@ - - HTS_VOCODER_ME_C_START; - -+#include <math.h> - #include "./HTS_vocoder_me.h" --#include "../hts_engine/HTS_vocoder.c" -+#include "../hts_engine/HTS_vocoder.h" - - /* HTS_Vocoder_initialize_me: initialize vocoder (mixed excitation) */ - void HTS_Vocoder_initialize_me(HTS_Vocoder_ME * v_me, -diff -Naur festival.orig/src/modules/hts_engine/HTS_vocoder.c festival/src/modules/hts_engine/HTS_vocoder.c ---- festival.orig/src/modules/hts_engine/HTS_vocoder.c 2013-02-18 16:10:52.000000000 +0100 -+++ festival/src/modules/hts_engine/HTS_vocoder.c 2015-07-28 18:26:22.680173336 +0200 -@@ -57,10 +57,12 @@ - - #include <math.h> /* for sqrt(),log(),exp(),pow(),cos() */ - -+//#include "HTS_vocoder.h" -+ - /* hts_engine libraries */ - #include "HTS_hidden.h" - --static const double HTS_pade[21] = { -+const double HTS_pade[21] = { - 1.00000000000, - 1.00000000000, - 0.00000000000, -@@ -85,7 +87,7 @@ - }; - - /* HTS_movem: move memory */ --static void HTS_movem(double *a, double *b, const int nitem) -+void HTS_movem(double *a, double *b, const int nitem) - { - long i = (long) nitem; - -@@ -101,7 +103,7 @@ - } - - /* HTS_mlsafir: sub functions for MLSA filter */ --static double HTS_mlsafir(const double x, const double *b, const int m, const double a, const double aa, double *d) -+double HTS_mlsafir(const double x, const double *b, const int m, const double a, const double aa, double *d) - { - double y = 0.0; - int i; -@@ -122,7 +124,7 @@ - } - - /* HTS_mlsadf1: sub functions for MLSA filter */ --static double HTS_mlsadf1(double x, const double *b, const int m, const double a, const double aa, const int pd, double *d, const double *ppade) -+double HTS_mlsadf1(double x, const double *b, const int m, const double a, const double aa, const int pd, double *d, const double *ppade) - { - double v, out = 0.0, *pt; - int i; -@@ -144,7 +146,7 @@ - } - - /* HTS_mlsadf2: sub functions for MLSA filter */ --static double HTS_mlsadf2(double x, const double *b, const int m, const double a, const double aa, const int pd, double *d, const double *ppade) -+double HTS_mlsadf2(double x, const double *b, const int m, const double a, const double aa, const int pd, double *d, const double *ppade) - { - double v, out = 0.0, *pt; - int i; -@@ -166,7 +168,7 @@ - } - - /* HTS_mlsadf: functions for MLSA filter */ --static double HTS_mlsadf(double x, const double *b, const int m, const double a, const int pd, double *d) -+double HTS_mlsadf(double x, const double *b, const int m, const double a, const int pd, double *d) - { - const double aa = 1 - a * a; - const double *ppade = &(HTS_pade[pd * (pd + 1) / 2]); -@@ -178,7 +180,7 @@ - } - - /* HTS_rnd: functions for random noise generation */ --static double HTS_rnd(unsigned long *next) -+double HTS_rnd(unsigned long *next) - { - double r; - -@@ -189,7 +191,7 @@ - } - - /* HTS_nrandom: functions for gaussian random noise generation */ --static double HTS_nrandom(HTS_Vocoder * v) -+double HTS_nrandom(HTS_Vocoder * v) - { - if (v->sw == 0) { - v->sw = 1; -@@ -207,7 +209,7 @@ - } - - /* HTS_mceq: function for M-sequence random noise generation */ --static int HTS_mseq(HTS_Vocoder * v) -+int HTS_mseq(HTS_Vocoder * v) - { - int x0, x28; - -@@ -229,7 +231,7 @@ - } - - /* HTS_mc2b: transform mel-cepstrum to MLSA digital fillter coefficients */ --static void HTS_mc2b(double *mc, double *b, int m, const double a) -+void HTS_mc2b(double *mc, double *b, int m, const double a) - { - if (mc != b) { - if (a != 0.0) { -@@ -244,7 +246,7 @@ - } - - /* HTS_b2bc: transform MLSA digital filter coefficients to mel-cepstrum */ --static void HTS_b2mc(const double *b, double *mc, int m, const double a) -+void HTS_b2mc(const double *b, double *mc, int m, const double a) - { - double d, o; - -@@ -257,7 +259,7 @@ - } - - /* HTS_freqt: frequency transformation */ --static void HTS_freqt(HTS_Vocoder * v, const double *c1, const int m1, double *c2, const int m2, const double a) -+void HTS_freqt(HTS_Vocoder * v, const double *c1, const int m1, double *c2, const int m2, const double a) - { - int i, j; - const double b = 1 - a * a; -@@ -287,7 +289,7 @@ - } - - /* HTS_c2ir: The minimum phase impulse response is evaluated from the minimum phase cepstrum */ --static void HTS_c2ir(const double *c, const int nc, double *h, const int leng) -+void HTS_c2ir(const double *c, const int nc, double *h, const int leng) - { - int n, k, upl; - double d; -@@ -303,7 +305,7 @@ - } - - /* HTS_b2en: calculate frame energy */ --static double HTS_b2en(HTS_Vocoder * v, const double *b, const int m, const double a) -+double HTS_b2en(HTS_Vocoder * v, const double *b, const int m, const double a) - { - int i; - double en = 0.0; -@@ -330,7 +332,7 @@ - } - - /* HTS_ignorm: inverse gain normalization */ --static void HTS_ignorm(double *c1, double *c2, int m, const double g) -+void HTS_ignorm(double *c1, double *c2, int m, const double g) - { - double k; - if (g != 0.0) { -@@ -345,7 +347,7 @@ - } - - /* HTS_gnorm: gain normalization */ --static void HTS_gnorm(double *c1, double *c2, int m, const double g) -+void HTS_gnorm(double *c1, double *c2, int m, const double g) - { - double k; - if (g != 0.0) { -@@ -360,7 +362,7 @@ - } - - /* HTS_lsp2lpc: transform LSP to LPC */ --static void HTS_lsp2lpc(HTS_Vocoder * v, double *lsp, double *a, const int m) -+void HTS_lsp2lpc(HTS_Vocoder * v, double *lsp, double *a, const int m) - { - int i, k, mh1, mh2, flag_odd; - double xx, xf, xff; -@@ -451,7 +453,7 @@ - } - - /* HTS_gc2gc: generalized cepstral transformation */ --static void HTS_gc2gc(HTS_Vocoder * v, double *c1, const int m1, const double g1, double *c2, const int m2, const double g2) -+void HTS_gc2gc(HTS_Vocoder * v, double *c1, const int m1, const double g1, double *c2, const int m2, const double g2) - { - int i, min, k, mk; - double ss1, ss2, cc; -@@ -484,7 +486,7 @@ - } - - /* HTS_mgc2mgc: frequency and generalized cepstral transformation */ --static void HTS_mgc2mgc(HTS_Vocoder * v, double *c1, const int m1, const double a1, const double g1, double *c2, const int m2, const double a2, const double g2) -+void HTS_mgc2mgc(HTS_Vocoder * v, double *c1, const int m1, const double a1, const double g1, double *c2, const int m2, const double a2, const double g2) - { - double a; - -@@ -502,7 +504,7 @@ - } - - /* HTS_lsp2mgc: transform LSP to MGC */ --static void HTS_lsp2mgc(HTS_Vocoder * v, double *lsp, double *mgc, const int m, const double alpha) -+void HTS_lsp2mgc(HTS_Vocoder * v, double *lsp, double *mgc, const int m, const double alpha) - { - int i; - /* lsp2lpc */ -@@ -531,7 +533,7 @@ - } - - /* HTS_mglsadff: sub functions for MGLSA filter */ --static double HTS_mglsadff(double x, const double *b, const int m, const double a, double *d) -+double HTS_mglsadff(double x, const double *b, const int m, const double a, double *d) - { - int i; - -@@ -550,7 +552,7 @@ - } - - /* HTS_mglsadf: sub functions for MGLSA filter */ --static double HTS_mglsadf(double x, const double *b, const int m, const double a, const int n, double *d) -+double HTS_mglsadf(double x, const double *b, const int m, const double a, const int n, double *d) - { - int i; - -@@ -561,7 +563,7 @@ - } - - /* THS_check_lsp_stability: check LSP stability */ --static void HTS_check_lsp_stability(double *lsp, size_t m) -+void HTS_check_lsp_stability(double *lsp, size_t m) - { - size_t i, j; - double tmp; -@@ -595,7 +597,7 @@ - } - - /* HTS_lsp2en: calculate frame energy */ --static double HTS_lsp2en(HTS_Vocoder * v, double *lsp, size_t m, double alpha) -+double HTS_lsp2en(HTS_Vocoder * v, double *lsp, size_t m, double alpha) - { - size_t i; - double en = 0.0; -@@ -632,7 +634,7 @@ - } - - /* HTS_white_noise: return white noise */ --static double HTS_white_noise(HTS_Vocoder * v) -+double HTS_white_noise(HTS_Vocoder * v) - { - if (v->gauss) - return (double) HTS_nrandom(v); -@@ -641,7 +643,7 @@ - } - - /* HTS_ping_pulse: ping pulse using low-pass filter */ --static void HTS_ping_pulse(HTS_Vocoder * v, const int ping_place, const double p, const int nlpf, const double *lpf) -+void HTS_ping_pulse(HTS_Vocoder * v, const int ping_place, const double p, const int nlpf, const double *lpf) - { - int i, j; - const double power = sqrt(p); -@@ -652,7 +654,7 @@ - } - - /* HTS_ping_noise: ping noise using low-pass filter */ --static void HTS_ping_noise(HTS_Vocoder * v, const int ping_place, const int nlpf, const double *lpf) -+void HTS_ping_noise(HTS_Vocoder * v, const int ping_place, const int nlpf, const double *lpf) - { - int i, j; - const double power = HTS_white_noise(v); -@@ -667,7 +669,7 @@ - } - - /* HTS_Vocoder_initialize_excitation: initialize excitation */ --static void HTS_Vocoder_initialize_excitation(HTS_Vocoder * v, size_t nlpf) -+void HTS_Vocoder_initialize_excitation(HTS_Vocoder * v, size_t nlpf) - { - size_t i; - -@@ -684,7 +686,7 @@ - } - - /* HTS_Vocoder_start_excitation: start excitation of each frame */ --static void HTS_Vocoder_start_excitation(HTS_Vocoder * v, const double pitch, const int nlpf) -+void HTS_Vocoder_start_excitation(HTS_Vocoder * v, const double pitch, const int nlpf) - { - if (v->p1 != 0.0 && pitch != 0.0) - v->inc = (pitch - v->p1) * IPERIOD / v->fprd; -@@ -699,7 +701,7 @@ - } - - /* HTS_Vocoder_get_excitation: get excitation of each sample */ --static double HTS_Vocoder_get_excitation(HTS_Vocoder * v, const int fprd_index, const int iprd_index, const int nlpf, const double *lpf) -+double HTS_Vocoder_get_excitation(HTS_Vocoder * v, const int fprd_index, const int iprd_index, const int nlpf, const double *lpf) - { - double x; - int i, j; -@@ -755,7 +757,7 @@ - } - - /* HTS_Vocoder_end_excitation: end excitation of each frame */ --static void HTS_Vocoder_end_excitation(HTS_Vocoder * v, const int nlpf) -+void HTS_Vocoder_end_excitation(HTS_Vocoder * v, const int nlpf) - { - int i; - -@@ -771,7 +773,7 @@ - } - - /* HTS_Vocoder_postfilter_mcp: postfilter for MCP */ --static void HTS_Vocoder_postfilter_mcp(HTS_Vocoder * v, double *mcp, const int m, double alpha, double beta) -+void HTS_Vocoder_postfilter_mcp(HTS_Vocoder * v, double *mcp, const int m, double alpha, double beta) - { - double e1, e2; - int k; -@@ -797,7 +799,7 @@ - } - - /* HTS_Vocoder_postfilter_lsp: postfilter for LSP */ --static void HTS_Vocoder_postfilter_lsp(HTS_Vocoder * v, double *lsp, size_t m, double alpha, double beta) -+void HTS_Vocoder_postfilter_lsp(HTS_Vocoder * v, double *lsp, size_t m, double alpha, double beta) - { - double e1, e2; - size_t i; -diff -Naur festival.orig/src/modules/hts_engine/HTS_vocoder.h festival/src/modules/hts_engine/HTS_vocoder.h ---- festival.orig/src/modules/hts_engine/HTS_vocoder.h 1970-01-01 01:00:00.000000000 +0100 -+++ festival/src/modules/hts_engine/HTS_vocoder.h 2015-07-28 18:21:15.431802892 +0200 -@@ -0,0 +1,42 @@ -+#ifndef HTS_VOCODER_H -+#define HTS_VOCODER_H -+ -+/* hts_engine libraries */ -+#include "HTS_hidden.h" -+ -+void HTS_Vocoder_clear(HTS_Vocoder *v); -+void HTS_Vocoder_synthesize(HTS_Vocoder *v,size_t m,double lf0,double *spectrum,size_t nlpf,double *lpf,double alpha,double beta,double volume,double *rawdata,HTS_Audio *audio); -+void HTS_Vocoder_initialize(HTS_Vocoder *v,size_t m,size_t stage,HTS_Boolean use_log_gain,size_t rate,size_t fperiod); -+void HTS_Vocoder_postfilter_lsp(HTS_Vocoder *v,double *lsp,size_t m,double alpha,double beta); -+void HTS_Vocoder_postfilter_mcp(HTS_Vocoder *v,double *mcp,const int m,double alpha,double beta); -+void HTS_Vocoder_end_excitation(HTS_Vocoder *v,const int nlpf); -+double HTS_Vocoder_get_excitation(HTS_Vocoder *v,const int fprd_index,const int iprd_index,const int nlpf,const double *lpf); -+void HTS_Vocoder_start_excitation(HTS_Vocoder *v,const double pitch,const int nlpf); -+void HTS_Vocoder_initialize_excitation(HTS_Vocoder *v,size_t nlpf); -+void HTS_ping_noise(HTS_Vocoder *v,const int ping_place,const int nlpf,const double *lpf); -+void HTS_ping_pulse(HTS_Vocoder *v,const int ping_place,const double p,const int nlpf,const double *lpf); -+double HTS_white_noise(HTS_Vocoder *v); -+double HTS_lsp2en(HTS_Vocoder *v,double *lsp,size_t m,double alpha); -+void HTS_check_lsp_stability(double *lsp,size_t m); -+double HTS_mglsadf(double x,const double *b,const int m,const double a,const int n,double *d); -+double HTS_mglsadff(double x,const double *b,const int m,const double a,double *d); -+void HTS_lsp2mgc(HTS_Vocoder *v,double *lsp,double *mgc,const int m,const double alpha); -+void HTS_mgc2mgc(HTS_Vocoder *v,double *c1,const int m1,const double a1,const double g1,double *c2,const int m2,const double a2,const double g2); -+void HTS_gc2gc(HTS_Vocoder *v,double *c1,const int m1,const double g1,double *c2,const int m2,const double g2); -+void HTS_lsp2lpc(HTS_Vocoder *v,double *lsp,double *a,const int m); -+void HTS_gnorm(double *c1,double *c2,int m,const double g); -+void HTS_ignorm(double *c1,double *c2,int m,const double g); -+double HTS_b2en(HTS_Vocoder *v,const double *b,const int m,const double a); -+void HTS_c2ir(const double *c,const int nc,double *h,const int leng); -+void HTS_freqt(HTS_Vocoder *v,const double *c1,const int m1,double *c2,const int m2,const double a); -+void HTS_b2mc(const double *b,double *mc,int m,const double a); -+void HTS_mc2b(double *mc,double *b,int m,const double a); -+int HTS_mseq(HTS_Vocoder *v); -+double HTS_nrandom(HTS_Vocoder *v); -+double HTS_rnd(unsigned long *next); -+double HTS_mlsadf(double x,const double *b,const int m,const double a,const int pd,double *d); -+double HTS_mlsadf2(double x,const double *b,const int m,const double a,const double aa,const int pd,double *d,const double *ppade); -+double HTS_mlsadf1(double x,const double *b,const int m,const double a,const double aa,const int pd,double *d,const double *ppade); -+double HTS_mlsafir(const double x,const double *b,const int m,const double a,const double aa,double *d); -+void HTS_movem(double *a,double *b,const int nitem); -+#endif Added: festival-2.5.0-compile.patch =================================================================== --- festival-2.5.0-compile.patch (rev 0) +++ festival-2.5.0-compile.patch 2019-07-14 13:00:29 UTC (rev 357976) @@ -0,0 +1,12 @@ +--- festival/src/modules/clustergen/HTS_vocoder_me.cc.omv~ 2017-12-28 22:12:57.990128926 +0100 ++++ festival/src/modules/clustergen/HTS_vocoder_me.cc 2017-12-28 22:16:12.636790019 +0100 +@@ -91,6 +91,9 @@ + HTS_VOCODER_ME_C_START; + + #include "./HTS_vocoder_me.h" ++#define HTS_Vocoder_initialize HTS_Vocoder_initialize_nodupes ++#define HTS_Vocoder_synthesize HTS_Vocoder_synthesize_nodupes ++#define HTS_Vocoder_clear HTS_Vocoder_clear_nodupes + #include "../hts_engine/HTS_vocoder.c" + + /* HTS_Vocoder_initialize_me: initialize vocoder (mixed excitation) */ Deleted: festival-gcc47.patch =================================================================== --- festival-gcc47.patch 2019-07-14 11:05:11 UTC (rev 357975) +++ festival-gcc47.patch 2019-07-14 13:00:29 UTC (rev 357976) @@ -1,59 +0,0 @@ -This patch allows compiling of festival on gcc 4.7 and clang 3.0. -Both these compilers are stricter of unqualified method calls in -templates than previous versions of gcc. -This patch should not alter the code in a substantive way as it -only qualifies method calls which were assumed in previous compilers. -No copyright subsists in this patch as it is too trivial. - -Author: Peter Drysdale <drysdalep...@gmail.com> - ---- speech-tools-2.1~release.orig/base_class/EST_TSimpleVector.cc -+++ speech_tools/base_class/EST_TSimpleVector.cc -@@ -43,5 +43,6 @@ - #include "EST_TSimpleVector.h" - #include "EST_matrix_support.h" - #include <fstream> -+#include <cstring> - #include "EST_cutils.h" - #include <string.h> - - template<class T> void EST_TSimpleVector<T>::copy(const EST_TSimpleVector<T> &a) -@@ -52,7 +53,7 @@ template<class T> void EST_TSimpleVector - if (this->p_column_step==1 && a.p_column_step==1) - { - resize(a.n(), FALSE); -- memcpy((void *)(this->p_memory), (const void *)(a.p_memory), this->n() * sizeof(T)); -+ std::memcpy((void *)(this->p_memory), (const void *)(a.p_memory), this->n() * sizeof(T)); - } - else - ((EST_TVector<T> *)this)->copy(a); -@@ -141,7 +142,7 @@ template<class T> EST_TSimpleVector<T> & - template<class T> void EST_TSimpleVector<T>::zero() - { - if (this->p_column_step==1) -- memset((void *)(this->p_memory), 0, this->n() * sizeof(T)); -+ std::memset((void *)(this->p_memory), 0, this->n() * sizeof(T)); - else - ((EST_TVector<T> *)this)->fill(*this->def_val); - } - ---- speech-tools-2.1~release.orig/base_class/EST_TSimpleMatrix.cc -+++ speech_tools/base_class/EST_TSimpleMatrix.cc -@@ -44,5 +44,6 @@ - #include "EST_TVector.h" - #include <fstream> - #include <iostream> -+#include <cstring> - #include "EST_cutils.h" - #include <string.h> - - template<class T> -@@ -52,7 +53,7 @@ void EST_TSimpleMatrix<T>::copy_data(con - { - - if (!a.p_sub_matrix && !this->p_sub_matrix) -- memcpy((void *)&this->a_no_check(0,0), -+ std::memcpy((void *)&this->a_no_check(0,0), - (const void *)&a.a_no_check(0,0), - this->num_rows()*this->num_columns()*sizeof(T) - ); Modified: festival-shared-build.patch =================================================================== --- festival-shared-build.patch 2019-07-14 11:05:11 UTC (rev 357975) +++ festival-shared-build.patch 2019-07-14 13:00:29 UTC (rev 357976) @@ -38,11 +38,11 @@ diff -p -up festival/speech_tools/config/compilers/gcc_defaults.mak.bettersoname festival/speech_tools/config/compilers/gcc_defaults.mak --- speech_tools/config/compilers/gcc_defaults.mak.bettersoname 2010-12-06 10:25:35.000000000 +0100 +++ speech_tools/config/compilers/gcc_defaults.mak 2010-12-06 10:27:51.000000000 +0100 -@@ -81,7 +81,7 @@ SHARED_CXXFLAGS = -fPIC - SHARED_LINKFLAGS = - +@@ -83,7 +83,7 @@ SHARED_CXXFLAGS = -fPIC ifndef GCC_MAKE_SHARED_LIB -- MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX + # Older versions of gcc might have required -fno-shared-data + # MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX +- MAKE_SHARED_LIB = $(CXX) -shared -o XXX + MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname,YYY else MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB) Modified: speechconfig.patch =================================================================== --- speechconfig.patch 2019-07-14 11:05:11 UTC (rev 357975) +++ speechconfig.patch 2019-07-14 13:00:29 UTC (rev 357976) @@ -57,14 +57,6 @@ # speech recognition #INCLUDE_MODULES += ASR -@@ -175,6 +175,6 @@ - CONFIG_WRAPPER_LANGUAGES = PYTHON - - # Language specific includes should be set to correct site paths --CONFIG_PYTHON_INCLUDES= -I/usr/include/python2.2/ -+CONFIG_PYTHON_INCLUDES= -I/usr/include/python2.7/ - ## - ################################################################### Only in speech_tools/config: config.in.orig diff -aur speech_tools.old//config/systems/default.mak speech_tools/config/systems/default.mak --- speech_tools.old//config/systems/default.mak 2005-07-17 21:06:49.000000000 +0800