diff options
author | nia <nia@pkgsrc.org> | 2019-09-07 13:00:48 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2019-09-07 13:00:48 +0000 |
commit | fa1eaa05c6a60ccda93e2af7944db0da4292a6fe (patch) | |
tree | bf47d02ee144523c46a5510f2283a7988c728899 /audio | |
parent | 111029a8ac0b26760bae800c464b1e870c39ca94 (diff) | |
download | pkgsrc-fa1eaa05c6a60ccda93e2af7944db0da4292a6fe.tar.gz |
festival: Update to 2.5.0
New in Festival 2.5:
Support for gcc6 (which is a somewhat different dialect of C++)
New in Festival 2.2:
Updates to hts (hts_engine 1.07) and clustergen
Diffstat (limited to 'audio')
19 files changed, 44 insertions, 500 deletions
diff --git a/audio/festival/Makefile b/audio/festival/Makefile index c05d64fc8da..36e1b097823 100644 --- a/audio/festival/Makefile +++ b/audio/festival/Makefile @@ -1,15 +1,14 @@ -# $NetBSD: Makefile,v 1.77 2019/08/11 13:17:53 wiz Exp $ +# $NetBSD: Makefile,v 1.78 2019/09/07 13:00:48 nia Exp $ -DISTNAME= festival-2.1-release -PKGNAME= festival-2.1 -PKGREVISION= 9 +DISTNAME= festival-2.5.0-release +PKGNAME= ${DISTNAME:S/-release//} CATEGORIES= audio -MASTER_SITES= http://festvox.org/packed/festival/2.1/ +MASTER_SITES= http://festvox.org/packed/festival/2.5/ DISTFILES= ${DISTNAME}.tar.gz \ - speech_tools-2.1-release.tar.gz + speech_tools-${PKGVERSION_NOREV}-release.tar.gz MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/ +HOMEPAGE= http://festvox.org/festival/index.html COMMENT= Advanced multi-lingual speech synthesis system LICENSE= original-bsd @@ -28,9 +27,6 @@ CONFIGURE_SCRIPT= ${SPEECHTOOLS}/configure CONFIG_GUESS_OVERRIDE= ${SPEECHTOOLS}/config.guess ${FESTIVAL}/config.guess CONFIG_SUB_OVERRIDE= ${SPEECHTOOLS}/config.sub ${FESTIVAL}/config.sub -MAKE_ENV+= BUILDLINK_CPPFLAGS=${BUILDLINK_CPPFLAGS:Q} -MAKE_ENV+= BUILDLINK_LDFLAGS=${BUILDLINK_LDFLAGS:Q} - .include "../../mk/bsd.prefs.mk" .include "../../mk/compiler.mk" @@ -56,8 +52,8 @@ MAKE_ENV+= PKG_EST_HOME=${SPEECHTOOLS:Q} \ PKG_FESTIVAL_BUILD_HOME=${FESTIVAL:Q} \ PKG_FESTIVAL_HOME=${FHOME:Q} \ PKG_COMPILER=${PKG_COMPILER:Q} \ - PKG_X11BASE=${X11BASE:Q} \ - PKG_PREFIX=${PREFIX:Q} \ + PKG_X11BASE=${X11BASE} \ + PKG_PREFIX=${PREFIX} \ EGCS_CC=${CC:Q} \ EGCS_CXX=${CXX:Q} \ GCC295_CC=${CC:Q} \ @@ -119,10 +115,9 @@ do-install: ${INSTALL_MAN} ${FESTIVAL}/doc/festival_client.1 \ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/festival_client.1 -.include "../../audio/nas/buildlink3.mk" -.if ${OPSYS} == "Linux" -# See DebianGNULinux.mak -.include "../../mk/curses.buildlink3.mk" -.endif .include "../../mk/termcap.buildlink3.mk" +BUILDLINK_TRANSFORM+= rm:-lcurses +BUILDLINK_TRANSFORM+= rm:-lncurses +MAKE_ENV+= BUILDLINK_CPPFLAGS=${BUILDLINK_CPPFLAGS:Q} +MAKE_ENV+= BUILDLINK_LDFLAGS=${BUILDLINK_LDADD.termcap:Q} .include "../../mk/bsd.pkg.mk" diff --git a/audio/festival/PLIST b/audio/festival/PLIST index 4d1520e4803..6e362f30ce8 100644 --- a/audio/festival/PLIST +++ b/audio/festival/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2011/11/21 01:35:29 marino Exp $ +@comment $NetBSD: PLIST,v 1.10 2019/09/07 13:00:48 nia Exp $ bin/festival bin/festival_client libexec/audsp @@ -53,6 +53,8 @@ share/festival/examples/speech_pm_1.0.tar share/festival/examples/spintro.text share/festival/examples/text2pos share/festival/examples/text2pos.sh +share/festival/examples/text2utt +share/festival/examples/text2utt.sh share/festival/examples/text2wave share/festival/examples/text2wave.sh share/festival/examples/th-mode.scm diff --git a/audio/festival/distinfo b/audio/festival/distinfo index f757170c60d..6c9a2f1229c 100644 --- a/audio/festival/distinfo +++ b/audio/festival/distinfo @@ -1,36 +1,21 @@ -$NetBSD: distinfo,v 1.26 2017/04/21 12:33:15 jperkin Exp $ +$NetBSD: distinfo,v 1.27 2019/09/07 13:00:48 nia Exp $ -SHA1 (festival-2.1-release.tar.gz) = f0c5a4282667898c584516e3605742835f59cb77 -RMD160 (festival-2.1-release.tar.gz) = b3c646ecc532e4e05f846db06bbab12a13ec1d6b -SHA512 (festival-2.1-release.tar.gz) = 1f9f28af7106c98e313d3c4d4bb26a7f927c1214fa5a0e2b4972fc85e1011e328331b73852abb57f26fa5062263d1dbccaf65e3be59c6ec762ccf340fc93797a -Size (festival-2.1-release.tar.gz) = 787313 bytes -SHA1 (speech_tools-2.1-release.tar.gz) = bbf43b259de8bb91e0c5e8a1defc6e45a10e60f9 -RMD160 (speech_tools-2.1-release.tar.gz) = 59831fbe607f05308f339a3cfb3af53d7337328b -SHA512 (speech_tools-2.1-release.tar.gz) = 6ef9a7dd01ede152c4dafd0b2037312d62a79d875813d74ea048899a52eee505b93ffbabef9b6c0a1d15aeadb5508fd18a2f392e85276847fe071173aec5db96 -Size (speech_tools-2.1-release.tar.gz) = 1681999 bytes +SHA1 (festival-2.5.0-release.tar.gz) = a433de2d1c344a1af63579e757551432abe583ca +RMD160 (festival-2.5.0-release.tar.gz) = 68f71e389f38c78863b15da319f16d21dcf27818 +SHA512 (festival-2.5.0-release.tar.gz) = 529ec3a1780a861074b6070567f3e11cfcc839081f61e078978a491f11eb424bc4d6adf599f073d5571e20f66871b7045df9f9b175a1083d10e8bb02342639b1 +Size (festival-2.5.0-release.tar.gz) = 789013 bytes +SHA1 (speech_tools-2.5.0-release.tar.gz) = 8154c956465b2407c4de1700c7ecd0b04b4694ca +RMD160 (speech_tools-2.5.0-release.tar.gz) = a13c480ed7d5cd13a090d47a04bca011f07ee183 +SHA512 (speech_tools-2.5.0-release.tar.gz) = 013540a5252efb57633f442143a51bc87aac719dfb46c8f47e750322d19dac9b504f55125462a2ee74a6b0bd2661a63a1fc73a8c3c6d2886e38b136a80447fd7 +Size (speech_tools-2.5.0-release.tar.gz) = 1328624 bytes SHA1 (patch-aa) = 053713a156c277fd47ff4e687b3623bf0061dd89 SHA1 (patch-ab) = 7f22ea2a89caf72dcb18818eb98bdb54911d5e7c SHA1 (patch-ac) = 9ffe5f44dc50d9ab5161b9ca107956e799fff463 SHA1 (patch-ae) = 9d630d198f829979508b90416ddb0f56d721b422 SHA1 (patch-aq) = 81109b22e5db0f733fa2a3d8e7cdef1cdcbe0185 -SHA1 (patch-speech__tools_base__class_EST__TSimpleMatrix.cc) = e1ad503b0ea0f7c2e051cbc633dc343f5df5164f -SHA1 (patch-speech__tools_base__class_EST__TSimpleVector.cc) = 07acc5515d038733eeddd84ea6245e1fd0d2894a -SHA1 (patch-speech__tools_base__class_EST__TVector.cc) = 0e205df1ac66bb747696c72eee08db16ca58865f -SHA1 (patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc) = 5ee2d525df6a289b376bfa3375b8905d5752dad4 -SHA1 (patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc) = 8a2a4c1b1816c7be2479c0e0310cacfc9917c7ee -SHA1 (patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc) = 1d64a2e5aa1dc8c5b7d275e2bf66b2e96b599c35 -SHA1 (patch-speech__tools_config_compilers_gcc__defaults.mak) = 7441f2e424046dd50c1531160a5b5f94b8506e9d +SHA1 (patch-festival_src_modules_hts__engine_HTS__misc.c) = ee03faa0ac6db409e7352e0aad5ff64272d99e80 +SHA1 (patch-speech__tools_config_compilers_gcc__defaults.mak) = 0498a265d7f77b39503d5442cca0754ad72531a8 SHA1 (patch-speech__tools_config_modules_editline.mak) = 5386449fb61a1a0dfc3d5daed292917eb257fa3c SHA1 (patch-speech__tools_config_rules_compile__options.mak) = d3aa93029edba84f8130f1bc33c8d74219bafd9a -SHA1 (patch-speech__tools_configure) = b26108be7d30be0847e1caccbe82eb805e5ab8b1 -SHA1 (patch-speech__tools_configure.in) = 58b3b3b6dfb2b085c638b3637ece67bb6e5b014e -SHA1 (patch-speech__tools_include_EST__Ngrammar.h) = bd63f89cbdc11baf76c6d6c42aa814ac5b9daca9 -SHA1 (patch-speech__tools_include_EST__SCFG.h) = d58bc030dec4d526a89719e32c3624c642f33f3e -SHA1 (patch-speech__tools_include_EST__String.h) = 21961c1864eddc025a763081315b7f40f2450735 -SHA1 (patch-speech__tools_include_EST__TIterator.h) = db7617f5c4a802672ce3b098ecd512b6cdb96aeb -SHA1 (patch-speech__tools_include_EST__TNamedEnum.h) = f240a338d17d7a36a5dba1b0f3b48190b235bf03 -SHA1 (patch-speech__tools_include_EST__error.h) = 26c99948bee89f11b39efbb9d6eb195e1fb1602d SHA1 (patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = ec5eb54fba5a50b43d1a0c9f0a5ae36407f55bff SHA1 (patch-speech__tools_include_unix_EST__socket__unix.h) = f81c0cda0858d121e2d24182f39c7ab8fc673174 -SHA1 (patch-speech__tools_stats_dynamic__program.cc) = d932f865d5c5577f7c1adc446adf9a2ab25c59c9 -SHA1 (patch-speech__tools_utils_EST__ServiceTable.cc) = d085b9e1a925a12e80e0fc25884f4373ba271fd5 diff --git a/audio/festival/patches/patch-speech__tools_base__class_EST__TSimpleMatrix.cc b/audio/festival/patches/patch-speech__tools_base__class_EST__TSimpleMatrix.cc deleted file mode 100644 index c4ea2afc683..00000000000 --- a/audio/festival/patches/patch-speech__tools_base__class_EST__TSimpleMatrix.cc +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-speech__tools_base__class_EST__TSimpleMatrix.cc,v 1.1 2012/05/04 16:01:04 joerg Exp $ - ---- speech_tools/base_class/EST_TSimpleMatrix.cc.orig 2012-04-27 12:32:06.000000000 +0000 -+++ speech_tools/base_class/EST_TSimpleMatrix.cc -@@ -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 @@ void EST_TSimpleMatrix<T>::resize(int ne - { - 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 @@ void EST_TSimpleMatrix<T>::resize(int ne - 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); diff --git a/audio/festival/patches/patch-speech__tools_base__class_EST__TSimpleVector.cc b/audio/festival/patches/patch-speech__tools_base__class_EST__TSimpleVector.cc deleted file mode 100644 index bababac7a71..00000000000 --- a/audio/festival/patches/patch-speech__tools_base__class_EST__TSimpleVector.cc +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-speech__tools_base__class_EST__TSimpleVector.cc,v 1.1 2012/05/04 16:01:04 joerg Exp $ - ---- speech_tools/base_class/EST_TSimpleVector.cc.orig 2012-04-27 12:32:56.000000000 +0000 -+++ speech_tools/base_class/EST_TSimpleVector.cc -@@ -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 @@ template<class T> void EST_TSimpleVector - int old_offset = this->p_offset; - unsigned int q; - -- just_resize(newn, &old_vals); -+ this->just_resize(newn, &old_vals); - - if (set && old_vals) - { diff --git a/audio/festival/patches/patch-speech__tools_base__class_EST__TVector.cc b/audio/festival/patches/patch-speech__tools_base__class_EST__TVector.cc deleted file mode 100644 index 6a4e386cf46..00000000000 --- a/audio/festival/patches/patch-speech__tools_base__class_EST__TVector.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-speech__tools_base__class_EST__TVector.cc,v 1.1 2012/05/04 16:01:04 joerg Exp $ - ---- speech_tools/base_class/EST_TVector.cc.orig 2012-04-27 13:01:33.000000000 +0000 -+++ speech_tools/base_class/EST_TVector.cc -@@ -258,7 +258,7 @@ int EST_TVector<T>::operator == (const E - return 0; - - for(int i=0; i<num_columns() ; i++) -- if (fast_a_v(i) != v.fast_a_v(i)) -+ if (!(fast_a_v(i) == v.fast_a_v(i))) - return 0; - return 1; - } diff --git a/audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc b/audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc deleted file mode 100644 index 241d3a4487d..00000000000 --- a/audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc,v 1.1 2012/05/04 16:01:04 joerg Exp $ - ---- speech_tools/base_class/inst_tmpl/vector_dmatrix_t.cc.orig 2012-04-27 12:36:31.000000000 +0000 -+++ speech_tools/base_class/inst_tmpl/vector_dmatrix_t.cc -@@ -40,6 +40,11 @@ - #include "EST_types.h" - #include "EST_TVector.h" - -+static const EST_DMatrix def_val_DMatrix; -+static EST_DMatrix error_return_DMatrix; -+template <> const EST_DMatrix *EST_TVector<EST_DMatrix>::def_val = &def_val_DMatrix; -+template <> EST_DMatrix *EST_TVector<EST_DMatrix>::error_return = &error_return_DMatrix; -+ - #if defined(INSTANTIATE_TEMPLATES) - - #include "../base_class/EST_TVector.cc" -@@ -47,10 +52,6 @@ - template class EST_TVector<EST_DMatrix>; - - #endif --static const EST_DMatrix def_val_DMatrix; --static EST_DMatrix error_return_DMatrix; --template <> const EST_DMatrix *EST_TVector<EST_DMatrix>::def_val = &def_val_DMatrix; --template <> EST_DMatrix *EST_TVector<EST_DMatrix>::error_return = &error_return_DMatrix; - - int operator !=(const EST_DMatrix &fm1, - const EST_DMatrix &fm2) diff --git a/audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc b/audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc deleted file mode 100644 index 4feac2f74bb..00000000000 --- a/audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc,v 1.1 2012/05/04 16:01:04 joerg Exp $ - ---- speech_tools/base_class/inst_tmpl/vector_dvector_t.cc.orig 2012-04-27 12:36:12.000000000 +0000 -+++ speech_tools/base_class/inst_tmpl/vector_dvector_t.cc -@@ -40,6 +40,11 @@ - #include "EST_types.h" - #include "EST_TVector.h" - -+static const EST_DVector def_val_DVector; -+static EST_DVector error_return_DVector; -+template <> const EST_DVector *EST_TVector<EST_DVector>::def_val = &def_val_DVector; -+template <> EST_DVector *EST_TVector<EST_DVector>::error_return = &error_return_DVector; -+ - #if defined(INSTANTIATE_TEMPLATES) - - #include "../base_class/EST_TVector.cc" -@@ -47,10 +52,6 @@ - template class EST_TVector<EST_DVector>; - - #endif --static const EST_DVector def_val_DVector; --static EST_DVector error_return_DVector; --template <> const EST_DVector *EST_TVector<EST_DVector>::def_val = &def_val_DVector; --template <> EST_DVector *EST_TVector<EST_DVector>::error_return = &error_return_DVector; - - int operator !=(const EST_DVector &fv1, - const EST_DVector &fv2) diff --git a/audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc b/audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc deleted file mode 100644 index af8a8354358..00000000000 --- a/audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc,v 1.1 2012/05/04 16:01:04 joerg Exp $ - ---- speech_tools/base_class/inst_tmpl/vector_fmatrix_t.cc.orig 2012-04-27 12:34:44.000000000 +0000 -+++ speech_tools/base_class/inst_tmpl/vector_fmatrix_t.cc -@@ -40,6 +40,10 @@ - #include "EST_types.h" - #include "EST_TVector.h" - -+static EST_FMatrix error_return_FMatrix; -+static const EST_FMatrix def_val_FMatrix; -+template <> const EST_FMatrix *EST_TVector<EST_FMatrix>::def_val = &def_val_FMatrix; -+template <> EST_FMatrix *EST_TVector<EST_FMatrix>::error_return = &error_return_FMatrix; - #if defined(INSTANTIATE_TEMPLATES) - - #include "../base_class/EST_TVector.cc" -@@ -48,10 +52,6 @@ template class EST_TVector<EST_FMatrix>; - - - #endif --static const EST_FMatrix def_val_FMatrix; --static EST_FMatrix error_return_FMatrix; --template <> const EST_FMatrix *EST_TVector<EST_FMatrix>::def_val = &def_val_FMatrix; --template <> EST_FMatrix *EST_TVector<EST_FMatrix>::error_return = &error_return_FMatrix; - - int operator !=(const EST_FMatrix &fm1, - const EST_FMatrix &fm2) diff --git a/audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak b/audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak index e18ae6a05c8..0c35fd3d1a4 100644 --- a/audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak +++ b/audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak @@ -1,24 +1,33 @@ -$NetBSD: patch-speech__tools_config_compilers_gcc__defaults.mak,v 1.1 2013/06/13 21:40:43 joerg Exp $ +$NetBSD: patch-speech__tools_config_compilers_gcc__defaults.mak,v 1.2 2019/09/07 13:00:48 nia Exp $ ---- speech_tools/config/compilers/gcc_defaults.mak.orig 2010-02-03 12:28:14.000000000 +0000 +--- speech_tools/config/compilers/gcc_defaults.mak.orig 2017-09-04 15:54:03.000000000 +0000 +++ speech_tools/config/compilers/gcc_defaults.mak -@@ -39,10 +39,7 @@ +@@ -38,17 +38,11 @@ + ## ## ########################################################################### - CC=gcc +-CC=gcc -CXX=gcc -ifeq ($(OSTYPE),Darwin) - CXX=g++ +-CXX=g++ -endif - +- COMPILER_DESC=FSF gcc COMPILER_VERSION_COMMAND=$(CXX) -v 2>&1 | tail -1 | sed -e 's/^....//' -@@ -98,7 +95,7 @@ TEMPLATE_ARGS = + +-CFLAGS = $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS) +-CXXFLAGS = $(GCC_SYSTEM_OPTIONS) -fno-implicit-templates $(CC_OTHER_FLAGS) $(OMP_OPTS) $(OMP_DEFS) ++CFLAGS += $(GCC_SYSTEM_OPTIONS) $(CC_OTHER_FLAGS) ++CXXFLAGS += $(GCC_SYSTEM_OPTIONS) -fno-implicit-templates $(CC_OTHER_FLAGS) $(OMP_OPTS) $(OMP_DEFS) + + DEBUG_CCFLAGS = -g + DEBUG_CXXFLAGS = -g +@@ -100,7 +94,7 @@ TEMPLATE_ARGS = ## The -lgcc here is redundant - gcc does this anyway - but it ## helps java know what needs to be loaded. --COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++ -lgcc -+COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) +-COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) -lstdc++ $(OMP_OPTS) ++COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%) $(OMP_OPTS) ## special ways of doing things, blank means default diff --git a/audio/festival/patches/patch-speech__tools_configure b/audio/festival/patches/patch-speech__tools_configure deleted file mode 100644 index 2ceb5e2c0fb..00000000000 --- a/audio/festival/patches/patch-speech__tools_configure +++ /dev/null @@ -1,85 +0,0 @@ -$NetBSD: patch-speech__tools_configure,v 1.1 2013/10/11 11:16:12 roy Exp $ - -Test for termcap before ncurses - ---- speech_tools/configure.orig 2013-10-11 10:22:29.000000000 +0000 -+++ speech_tools/configure -@@ -3838,6 +3838,70 @@ presetting ac_cv_c_bigendian=no (or yes) - esac - - -+{ echo "$as_me:$LINENO: checking for tputs in -ltermcap" >&5 -+echo $ECHO_N "checking for tputs in -ltermcap... $ECHO_C" >&6; } -+if test "${ac_cv_lib_termcap_tputs+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-ltermcap $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char tputs (); -+int -+main () -+{ -+return tputs (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -+ (eval "$ac_link") 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && -+ $as_test_x conftest$ac_exeext; then -+ ac_cv_lib_termcap_tputs=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_cv_lib_termcap_tputs=no -+fi -+ -+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_tputs" >&5 -+echo "${ECHO_T}$ac_cv_lib_termcap_tputs" >&6; } -+if test $ac_cv_lib_termcap_tputs = yes; then -+ TERMCAPLIB=-ltermcap -+else - { echo "$as_me:$LINENO: checking for tputs in -lncurses" >&5 - echo $ECHO_N "checking for tputs in -lncurses... $ECHO_C" >&6; } - if test "${ac_cv_lib_ncurses_tputs+set}" = set; then -@@ -3905,6 +3969,7 @@ else - TERMCAPLIB=-lcurses - fi - -+fi - - - COMPILERTYPE=gcc diff --git a/audio/festival/patches/patch-speech__tools_include_EST__Ngrammar.h b/audio/festival/patches/patch-speech__tools_include_EST__Ngrammar.h deleted file mode 100644 index c4412127d68..00000000000 --- a/audio/festival/patches/patch-speech__tools_include_EST__Ngrammar.h +++ /dev/null @@ -1,57 +0,0 @@ -$NetBSD: patch-speech__tools_include_EST__Ngrammar.h,v 1.2 2013/07/18 20:19:51 joerg Exp $ - ---- speech_tools/include/EST_Ngrammar.h.orig 2013-07-17 14:46:59.000000000 +0000 -+++ speech_tools/include/EST_Ngrammar.h -@@ -538,18 +538,18 @@ public: - double floor); - friend EST_write_status save_ngram_htk_ascii(const EST_String filename, - EST_Ngrammar &n, -- double floor=0.0); -+ double floor); - - //friend EST_write_status save_ngram_htk_binary(const EST_String filename, - // EST_Ngrammar &n); - friend EST_write_status save_ngram_cstr_ascii(const EST_String filename, - EST_Ngrammar &n, -- const bool trace=false, -- double floor=0.0); -+ const bool trace, -+ double floor); - friend EST_write_status save_ngram_cstr_bin(const EST_String filename, - EST_Ngrammar &n, -- const bool trace=false, -- double floor=0.0); -+ const bool trace, -+ double floor); - friend EST_write_status save_ngram_arpa(const EST_String filename, - EST_Ngrammar &n); - friend EST_write_status save_ngram_arpa_sub(ostream *ost, -@@ -561,11 +561,11 @@ public: - // Auxiliary functions - - // smoothing --friend void frequency_of_frequencies(EST_DVector &ff, EST_Ngrammar &n,int this_order=0); --friend void map_frequencies(EST_Ngrammar &n, const EST_DVector &map, const int this_order=0); --friend bool Good_Turing_smooth(EST_Ngrammar &n, int maxcount, int mincount=0); -+friend void frequency_of_frequencies(EST_DVector &ff, EST_Ngrammar &n,int this_order); -+friend void map_frequencies(EST_Ngrammar &n, const EST_DVector &map, const int this_order); -+friend bool Good_Turing_smooth(EST_Ngrammar &n, int maxcount, int mincount); - friend void Good_Turing_discount(EST_Ngrammar &ngrammar, const int maxcount, -- const double default_discount=0.5); -+ const double default_discount); - - friend void fs_build_backoff_ngrams(EST_Ngrammar *backoff_ngrams, - EST_Ngrammar &ngram); -@@ -584,6 +584,12 @@ friend class EST_BackoffNgrammar; - - }; - -+void frequency_of_frequencies(EST_DVector &ff, EST_Ngrammar &n,int this_order=0); -+void map_frequencies(EST_Ngrammar &n, const EST_DVector &map, const int this_order=0); -+bool Good_Turing_smooth(EST_Ngrammar &n, int maxcount, int mincount=0); -+void Good_Turing_discount(EST_Ngrammar &ngrammar, const int maxcount, -+ const double default_discount=0.5); -+ - void Ngram_freqsmooth(EST_Ngrammar &ngram, - int smooth_thresh1, - int smooth_thresh2); diff --git a/audio/festival/patches/patch-speech__tools_include_EST__SCFG.h b/audio/festival/patches/patch-speech__tools_include_EST__SCFG.h deleted file mode 100644 index 74f4da9b860..00000000000 --- a/audio/festival/patches/patch-speech__tools_include_EST__SCFG.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-speech__tools_include_EST__SCFG.h,v 1.1 2012/05/04 16:01:04 joerg Exp $ - ---- speech_tools/include/EST_SCFG.h.orig 2012-04-27 12:52:20.000000000 +0000 -+++ speech_tools/include/EST_SCFG.h -@@ -85,6 +85,8 @@ class EST_bracketed_string { - int valid(int i,int k) const { return valid_spans[i][k]; } - - /// -+ int operator ==(const EST_bracketed_string &a) const -+ { return (this == &a); } - int operator !=(const EST_bracketed_string &a) const - { return (!(this == &a)); } - /// diff --git a/audio/festival/patches/patch-speech__tools_include_EST__String.h b/audio/festival/patches/patch-speech__tools_include_EST__String.h deleted file mode 100644 index 28406f610eb..00000000000 --- a/audio/festival/patches/patch-speech__tools_include_EST__String.h +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-speech__tools_include_EST__String.h,v 1.1 2013/07/18 11:57:42 joerg Exp $ - ---- speech_tools/include/EST_String.h.orig 2013-07-17 14:40:20.000000000 +0000 -+++ speech_tools/include/EST_String.h -@@ -574,10 +574,10 @@ public: - */ - //@{ - friend int fcompare(const EST_String &a, const EST_String &b, -- const unsigned char *table=NULL); -+ const unsigned char *table); - - friend int fcompare(const EST_String &a, const char *b, -- const unsigned char *table=NULL); -+ const unsigned char *table); - /// - friend inline int fcompare(const EST_String &a, const EST_String &b, - const EST_String &table) -@@ -643,6 +643,12 @@ int operator == (const char *a, const ES - int operator == (const EST_String &a, const EST_String &b); - ostream &operator << (ostream &s, const EST_String &str); - -+int fcompare(const EST_String &a, const EST_String &b, -+ const unsigned char *table=NULL); -+ -+int fcompare(const EST_String &a, const char *b, -+ const unsigned char *table=NULL); -+ - #include "EST_Regex.h" - - #endif diff --git a/audio/festival/patches/patch-speech__tools_include_EST__TIterator.h b/audio/festival/patches/patch-speech__tools_include_EST__TIterator.h deleted file mode 100644 index 7ae40cf8b52..00000000000 --- a/audio/festival/patches/patch-speech__tools_include_EST__TIterator.h +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-speech__tools_include_EST__TIterator.h,v 1.1 2012/05/04 16:01:04 joerg Exp $ - ---- speech_tools/include/EST_TIterator.h.orig 2012-04-27 12:26:17.000000000 +0000 -+++ speech_tools/include/EST_TIterator.h -@@ -209,7 +209,7 @@ public: - - /// 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 @@ public: - - /// 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();} diff --git a/audio/festival/patches/patch-speech__tools_include_EST__TNamedEnum.h b/audio/festival/patches/patch-speech__tools_include_EST__TNamedEnum.h deleted file mode 100644 index aaa120c3fbd..00000000000 --- a/audio/festival/patches/patch-speech__tools_include_EST__TNamedEnum.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-speech__tools_include_EST__TNamedEnum.h,v 1.1 2012/05/04 16:01:04 joerg Exp $ - ---- speech_tools/include/EST_TNamedEnum.h.orig 2012-04-27 12:28:44.000000000 +0000 -+++ speech_tools/include/EST_TNamedEnum.h -@@ -130,7 +130,7 @@ public: - {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); }; - - }; - diff --git a/audio/festival/patches/patch-speech__tools_include_EST__error.h b/audio/festival/patches/patch-speech__tools_include_EST__error.h deleted file mode 100644 index 95c90a9385b..00000000000 --- a/audio/festival/patches/patch-speech__tools_include_EST__error.h +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-speech__tools_include_EST__error.h,v 1.1 2013/04/29 21:12:37 joerg Exp $ - ---- speech_tools/include/EST_error.h.orig 2013-04-28 06:54:36.000000000 +0000 -+++ speech_tools/include/EST_error.h -@@ -84,19 +84,19 @@ void EST_quiet_error_fn(const char *form - void EST_quiet_sys_error_fn(const char *format, ...); - - --#define __S_(X) #X --#define __s_(X) __S_(X) -+#define STR_(X) #X -+#define str_(X) STR_(X) - --#define EST_bug (EST_error_where = __FILE__ ", line " __s_(__LINE__)),\ -+#define EST_bug (EST_error_where = __FILE__ ", line " str_(__LINE__)),\ - (*EST_bug_func) - - #if defined(EST_DEBUGGING) - #define EST_exit(N) abort() --#define EST_error (EST_error_where = __FILE__ ", line " __s_(__LINE__)),\ -+#define EST_error (EST_error_where = __FILE__ ", line " str_(__LINE__)),\ - (*EST_error_func) --#define EST_warning (EST_error_where = __FILE__ ", line " __s_(__LINE__)),\ -+#define EST_warning (EST_error_where = __FILE__ ", line " str_(__LINE__)),\ - (*EST_warning_func) --#define EST_sys_error (EST_error_where = __FILE__ ", line " __s_(__LINE__)),\ -+#define EST_sys_error (EST_error_where = __FILE__ ", line " str_(__LINE__)),\ - (*EST_sys_error_func) - #else - diff --git a/audio/festival/patches/patch-speech__tools_stats_dynamic__program.cc b/audio/festival/patches/patch-speech__tools_stats_dynamic__program.cc deleted file mode 100644 index ef31d4d77a4..00000000000 --- a/audio/festival/patches/patch-speech__tools_stats_dynamic__program.cc +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-speech__tools_stats_dynamic__program.cc,v 1.1 2012/05/04 16:01:04 joerg Exp $ - ---- speech_tools/stats/dynamic_program.cc.orig 2012-04-27 12:49:30.000000000 +0000 -+++ speech_tools/stats/dynamic_program.cc -@@ -42,6 +42,12 @@ - #include "ling_class/EST_Utterance.h" - - typedef EST_TVector<EST_Item*> EST_Item_ptr_Vector; -+ -+static EST_Item *const def_val_item_ptr = NULL; -+template <> EST_Item* const *EST_Item_ptr_Vector::def_val = &def_val_item_ptr; -+static EST_Item* error_return_item_ptr = NULL; -+template <> EST_Item* *EST_Item_ptr_Vector::error_return = &error_return_item_ptr; -+ - #if defined(INSTANTIATE_TEMPLATES) - #include "../base_class/EST_TVector.cc" - -@@ -49,12 +55,6 @@ template class EST_TVector<EST_Item*>; - - #endif - --static EST_Item *const def_val_item_ptr = NULL; --template <> EST_Item* const *EST_Item_ptr_Vector::def_val = &def_val_item_ptr; -- --static EST_Item* error_return_item_ptr = NULL; --template <> EST_Item* *EST_Item_ptr_Vector::error_return = &error_return_item_ptr; -- - typedef - float (*local_cost_function)(const EST_Item *item1, - const EST_Item *item2); diff --git a/audio/festival/patches/patch-speech__tools_utils_EST__ServiceTable.cc b/audio/festival/patches/patch-speech__tools_utils_EST__ServiceTable.cc deleted file mode 100644 index e6461cf7178..00000000000 --- a/audio/festival/patches/patch-speech__tools_utils_EST__ServiceTable.cc +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-speech__tools_utils_EST__ServiceTable.cc,v 1.1 2012/05/04 16:01:04 joerg Exp $ - ---- speech_tools/utils/EST_ServiceTable.cc.orig 2012-04-27 12:30:06.000000000 +0000 -+++ speech_tools/utils/EST_ServiceTable.cc -@@ -68,6 +68,7 @@ int gethostname(char *name, int namelen) - } - #endif - -+Declare_KVL_T(EST_String, EST_ServiceTable::Entry, EST_String_ST_entry) - - EST_ServiceTable::EntryTable EST_ServiceTable::entries; - bool EST_ServiceTable::random_init=FALSE; -@@ -339,7 +340,6 @@ const EST_ServiceTable::Entry &EST_Servi - - - --Declare_KVL_T(EST_String, EST_ServiceTable::Entry, EST_String_ST_entry) - - #if defined(INSTANTIATE_TEMPLATES) - |