pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/festival festival: Update to 2.5.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/fe58dbacba85
branches: trunk
changeset: 339141:fe58dbacba85
user: nia <nia%pkgsrc.org@localhost>
date: Sat Sep 07 13:00:48 2019 +0000
description:
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:
audio/festival/Makefile | 29 +--
audio/festival/PLIST | 4 +-
audio/festival/distinfo | 37 +---
audio/festival/patches/patch-speech__tools_base__class_EST__TSimpleMatrix.cc | 33 ---
audio/festival/patches/patch-speech__tools_base__class_EST__TSimpleVector.cc | 21 --
audio/festival/patches/patch-speech__tools_base__class_EST__TVector.cc | 13 -
audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc | 27 ---
audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc | 27 ---
audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc | 26 ---
audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak | 27 ++-
audio/festival/patches/patch-speech__tools_configure | 85 ----------
audio/festival/patches/patch-speech__tools_include_EST__Ngrammar.h | 57 ------
audio/festival/patches/patch-speech__tools_include_EST__SCFG.h | 13 -
audio/festival/patches/patch-speech__tools_include_EST__String.h | 30 ---
audio/festival/patches/patch-speech__tools_include_EST__TIterator.h | 22 --
audio/festival/patches/patch-speech__tools_include_EST__TNamedEnum.h | 13 -
audio/festival/patches/patch-speech__tools_include_EST__error.h | 30 ---
audio/festival/patches/patch-speech__tools_stats_dynamic__program.cc | 30 ---
audio/festival/patches/patch-speech__tools_utils_EST__ServiceTable.cc | 20 --
19 files changed, 44 insertions(+), 500 deletions(-)
diffs (truncated from 683 to 300 lines):
diff -r 5a997c8341b3 -r fe58dbacba85 audio/festival/Makefile
--- a/audio/festival/Makefile Sat Sep 07 11:42:58 2019 +0000
+++ b/audio/festival/Makefile Sat Sep 07 13:00:48 2019 +0000
@@ -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@localhost
-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 @@
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 @@
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 @@
${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 -r 5a997c8341b3 -r fe58dbacba85 audio/festival/PLIST
--- a/audio/festival/PLIST Sat Sep 07 11:42:58 2019 +0000
+++ b/audio/festival/PLIST Sat Sep 07 13:00:48 2019 +0000
@@ -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/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 -r 5a997c8341b3 -r fe58dbacba85 audio/festival/distinfo
--- a/audio/festival/distinfo Sat Sep 07 11:42:58 2019 +0000
+++ b/audio/festival/distinfo Sat Sep 07 13:00:48 2019 +0000
@@ -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 -r 5a997c8341b3 -r fe58dbacba85 audio/festival/patches/patch-speech__tools_base__class_EST__TSimpleMatrix.cc
--- a/audio/festival/patches/patch-speech__tools_base__class_EST__TSimpleMatrix.cc Sat Sep 07 11:42:58 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 5a997c8341b3 -r fe58dbacba85 audio/festival/patches/patch-speech__tools_base__class_EST__TSimpleVector.cc
--- a/audio/festival/patches/patch-speech__tools_base__class_EST__TSimpleVector.cc Sat Sep 07 11:42:58 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 5a997c8341b3 -r fe58dbacba85 audio/festival/patches/patch-speech__tools_base__class_EST__TVector.cc
--- a/audio/festival/patches/patch-speech__tools_base__class_EST__TVector.cc Sat Sep 07 11:42:58 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 5a997c8341b3 -r fe58dbacba85 audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc
--- a/audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc Sat Sep 07 11:42:58 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 5a997c8341b3 -r fe58dbacba85 audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc
--- a/audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc Sat Sep 07 11:42:58 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 5a997c8341b3 -r fe58dbacba85 audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc
--- a/audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc Sat Sep 07 11:42:58 2019 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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,
Home |
Main Index |
Thread Index |
Old Index