CVS commit: pkgsrc/audio/festival

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Sep  7 13:00:48 UTC 2019

Modified Files:
        pkgsrc/audio/festival: Makefile PLIST distinfo
        pkgsrc/audio/festival/patches:
            patch-speech__tools_config_compilers_gcc__defaults.mak
Removed Files:
        pkgsrc/audio/festival/patches:
            patch-speech__tools_base__class_EST__TSimpleMatrix.cc
            patch-speech__tools_base__class_EST__TSimpleVector.cc
            patch-speech__tools_base__class_EST__TVector.cc
            patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc
            patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc
            patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc
            patch-speech__tools_configure
            patch-speech__tools_include_EST__Ngrammar.h
            patch-speech__tools_include_EST__SCFG.h
            patch-speech__tools_include_EST__String.h
            patch-speech__tools_include_EST__TIterator.h
            patch-speech__tools_include_EST__TNamedEnum.h
            patch-speech__tools_include_EST__error.h
            patch-speech__tools_stats_dynamic__program.cc
            patch-speech__tools_utils_EST__ServiceTable.cc

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/audio/festival/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/audio/festival/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/audio/festival/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/audio/festival/patches/patch-speech__tools_base__class_EST__TSimpleMatrix.cc \
    pkgsrc/audio/festival/patches/patch-speech__tools_base__class_EST__TSimpleVector.cc \
    pkgsrc/audio/festival/patches/patch-speech__tools_base__class_EST__TVector.cc \
    pkgsrc/audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__dmatrix__t.cc \
    pkgsrc/audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__dvector__t.cc \
    pkgsrc/audio/festival/patches/patch-speech__tools_base__class_inst__tmpl_vector__fmatrix__t.cc \
    pkgsrc/audio/festival/patches/patch-speech__tools_configure \
    pkgsrc/audio/festival/patches/patch-speech__tools_include_EST__SCFG.h \
    pkgsrc/audio/festival/patches/patch-speech__tools_include_EST__String.h \
    pkgsrc/audio/festival/patches/patch-speech__tools_include_EST__TIterator.h \
    pkgsrc/audio/festival/patches/patch-speech__tools_include_EST__TNamedEnum.h \
    pkgsrc/audio/festival/patches/patch-speech__tools_include_EST__error.h \
    pkgsrc/audio/festival/patches/patch-speech__tools_stats_dynamic__program.cc \
    pkgsrc/audio/festival/patches/patch-speech__tools_utils_EST__ServiceTable.cc
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/audio/festival/patches/patch-speech__tools_include_EST__Ngrammar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/festival/Makefile
diff -u pkgsrc/audio/festival/Makefile:1.77 pkgsrc/audio/festival/Makefile:1.78
--- pkgsrc/audio/festival/Makefile:1.77 Sun Aug 11 13:17:53 2019
+++ pkgsrc/audio/festival/Makefile      Sat Sep  7 13:00:48 2019
@@ -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 @@ CONFIGURE_SCRIPT=     ${SPEECHTOOLS}/configu
 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"

Index: pkgsrc/audio/festival/PLIST
diff -u pkgsrc/audio/festival/PLIST:1.9 pkgsrc/audio/festival/PLIST:1.10
--- pkgsrc/audio/festival/PLIST:1.9     Mon Nov 21 01:35:29 2011
+++ pkgsrc/audio/festival/PLIST Sat Sep  7 13:00:48 2019
@@ -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.ta
 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

Index: pkgsrc/audio/festival/distinfo
diff -u pkgsrc/audio/festival/distinfo:1.26 pkgsrc/audio/festival/distinfo:1.27
--- pkgsrc/audio/festival/distinfo:1.26 Fri Apr 21 12:33:15 2017
+++ pkgsrc/audio/festival/distinfo      Sat Sep  7 13:00:48 2019
@@ -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

Index: pkgsrc/audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak
diff -u pkgsrc/audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak:1.1 pkgsrc/audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak:1.2
--- pkgsrc/audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak:1.1    Thu Jun 13 21:40:43 2013
+++ pkgsrc/audio/festival/patches/patch-speech__tools_config_compilers_gcc__defaults.mak        Sat Sep  7 13:00:48 2019
@@ -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