Attachment 163438 Details for Bug 204754 – audio/festival

[patch] audio/festival

festival.svndif (text/plain), 13.36 KB, created by Anonymized Account on 2015-11-22 18:39:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anonymized Account

Created: 2015-11-22 18:39:47 UTC

Size: 13.36 KB

patch

obsolete

>Index: audio/festival/Makefile
>===================================================================
>--- audio/festival/Makefile	(revision 402228)
>+++ audio/festival/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	festival
>-PORTVERSION=	2.1
>-PORTREVISION=	1
>+PORTVERSION=	2.4
> CATEGORIES=	audio accessibility
> MASTER_SITES=	FESTIVAL
> DISTFILES=	${DISTNAME}-release.tar.gz 	\
>@@ -41,19 +40,8 @@
> 		EST_HOME=${SPEECHTOOLS}
> WRKSRC=		${WRKDIR}
> 
>-SPT_PATCHES=	base__class_EST__TVector.cc	\
>-		base__class_inst__tmpl_vector__dmatrix__t.cc	\
>-		base__class_inst__tmpl_vector__dvector__t.cc	\
>-		base__class_inst__tmpl_vector__fmatrix__t.cc	\
>-		config_compilers_gcc__defaults.mak	\
>-		include_EST__Ngrammar.h	\
>-		include_EST__SCFG.h	\
>-		include_EST__String.h	\
>-		include_EST__error.h	\
>-		include_ling__class_EST__FeatureFunctionPackage.h	\
>-		include_unix_EST__socket__unix.h	\
>-		stats_dynamic__program.cc	\
>-		utils_EST__ServiceTable.cc
>+SPT_PATCHES=	include_ling__class_EST__FeatureFunctionPackage.h	\
>+		include_unix_EST__socket__unix.h
> 
> do-build:
> .for d in speech_tools festival
>Index: audio/festival/distinfo
>===================================================================
>--- audio/festival/distinfo	(revision 402228)
>+++ audio/festival/distinfo	(working copy)
>@@ -1,7 +1,7 @@
>-SHA256 (festival/festival-2.1-release.tar.gz) = 06f3dcbad9d26e27443fc66947a0faf0c6679482220df4b5f42a261adf758080
>-SIZE (festival/festival-2.1-release.tar.gz) = 787313
>-SHA256 (festival/speech_tools-2.1-release.tar.gz) = ff6167cd929a88e2f91b47191c6c4dae87c9c06ba39fccc4465af9d79e9b2be9
>-SIZE (festival/speech_tools-2.1-release.tar.gz) = 1681999
>+SHA256 (festival/festival-2.4-release.tar.gz) = 1e47f293e0857ffde2bccead97947c040ea0b35ea12dd5796edb51583e5e5d84
>+SIZE (festival/festival-2.4-release.tar.gz) = 788656
>+SHA256 (festival/speech_tools-2.4-release.tar.gz) = fbc2482c443919aa79d2e599d6a5faee4e793df55a79ef377f1dc7e8ba237010
>+SIZE (festival/speech_tools-2.4-release.tar.gz) = 1329613
> SHA256 (festival/src_modules_diphone_diphone.h.diff?id=b58a836) = 148ecd31aef84d5823470d339b3104b73af099404ab957fcee838520f8808104
> SIZE (festival/src_modules_diphone_diphone.h.diff?id=b58a836) = 870
> SHA256 (festival/src_modules_diphone_di_io.cc.diff?id=b58a836) = 0dfbe69e30ce8fbe695d30fed42a10c79bc6525dd4e971432a669c88bec4e048
>@@ -36,10 +36,6 @@
> SIZE (festival/patch-speech__tools_include_EST__SCFG.h) = 519
> SHA256 (festival/patch-speech__tools_include_EST__String.h) = ce8b3513bf218fd369716101fb0b3defc8ddb4d8a57e28df2c0e80f95fe52e74
> SIZE (festival/patch-speech__tools_include_EST__String.h) = 1068
>-SHA256 (festival/patch-speech__tools_include_EST__TIterator.h) = c44d8125a04447a63e8458cee910cd7fe4aa84d31d4c06139b76ae168c66bcf7
>-SIZE (festival/patch-speech__tools_include_EST__TIterator.h) = 730
>-SHA256 (festival/patch-speech__tools_include_EST__TNamedEnum.h) = c825a92c81ecdda555963319c400a026aa797c694897e2a6a232ea94660d6557
>-SIZE (festival/patch-speech__tools_include_EST__TNamedEnum.h) = 608
> SHA256 (festival/patch-speech__tools_include_EST__error.h) = ad43dcfa0fb0222d3cfc86cc2a316badbe1f2e27b663a91139ee3ccc3fd325e5
> SIZE (festival/patch-speech__tools_include_EST__error.h) = 1210
> SHA256 (festival/patch-speech__tools_include_ling__class_EST__FeatureFunctionPackage.h) = 2249d192d1c16697e0971263a1c1c1d8dbfecfe080c077abe49765e703775157
>Index: audio/festival/files/patch-debian-bug-667377
>===================================================================
>--- audio/festival/files/patch-debian-bug-667377	(revision 402228)
>+++ audio/festival/files/patch-debian-bug-667377	(working copy)
>@@ -1,3 +1,5 @@
>+(blindly) adapted to Festival 2.4
>+
> Obtained from:
> 	http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667377
> 
>@@ -20,27 +22,6 @@
>  #include "EST_cutils.h"
>  
>  template<class T> 
>-@@ -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);
> --- speech_tools/base_class/EST_TSimpleVector.cc
> +++ speech_tools/base_class/EST_TSimpleVector.cc
> @@ -43,6 +43,7 @@
>@@ -51,43 +32,3 @@
>  #include "EST_cutils.h"
>  
>  template<class T> void EST_TSimpleVector<T>::copy(const EST_TSimpleVector<T> &a)
>-@@ -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)
>-     {
>---- speech_tools/include/EST_TIterator.h
>-+++ 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();}
>---- speech_tools/include/EST_TNamedEnum.h
>-+++ 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); };
>- 
>- };
>- 
>Index: audio/festival/files/patch-festival_src_modules_hts_engine_HTS_misc.c
>===================================================================
>--- audio/festival/files/patch-festival_src_modules_hts_engine_HTS_misc.c	(nonexistent)
>+++ audio/festival/files/patch-festival_src_modules_hts_engine_HTS_misc.c	(working copy)
>@@ -0,0 +1,14 @@
>+--- festival/src/modules/hts_engine/HTS_misc.c.orig	2013-07-03 19:43:35.000000000 +0600
>++++ festival/src/modules/hts_engine/HTS_misc.c	2015-11-22 20:43:30.055818000 +0500
>+@@ -245,11 +245,7 @@
>+    } else if (fp->type == HTS_FILE) {
>+       fpos_t pos;
>+       fgetpos((FILE *) fp->pointer, &pos);
>+-#if defined(_WIN32) || defined(__CYGWIN__) || defined(__APPLE__)
>+       return (size_t) pos;
>+-#else
>+-      return (size_t) pos.__pos;
>+-#endif                          /* _WIN32 || __APPLE__ */
>+    }
>+    HTS_error(0, "HTS_ftell: Unknown file type.\n");
>+    return 0;
>
>Property changes on: audio/festival/files/patch-festival_src_modules_hts_engine_HTS_misc.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/festival/files/patch-speech__tools_config_compilers_gcc__defaults.mak
>===================================================================
>--- audio/festival/files/patch-speech__tools_config_compilers_gcc__defaults.mak	(nonexistent)
>+++ audio/festival/files/patch-speech__tools_config_compilers_gcc__defaults.mak	(working copy)
>@@ -0,0 +1,26 @@
>+(blindly) adapted to Festival 2.4
>+
>+#$NetBSD: patch-speech__tools_config_compilers_gcc__defaults.mak,v 1.1 2013/06/13 21:40:43 joerg Exp $
>+
>+--- speech_tools/config/compilers/gcc_defaults.mak.orig	2010-02-03 12:28:14.000000000 +0000
>++++ speech_tools/config/compilers/gcc_defaults.mak
>+@@ -39,10 +39,7 @@
>+  ###########################################################################
>+ 
>+ CC=gcc
>+-CXX=gcc
>+-ifeq ($(OSTYPE),Darwin)
>+ 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 = 
>+ ## 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++
>++COMPILERLIBS= $(COMPILER_LIBS_DIR:%=-L%)
>+ 
>+ ## special ways of doing things, blank means default
>+ 
>
>Property changes on: audio/festival/files/patch-speech__tools_config_compilers_gcc__defaults.mak
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/festival/files/patch-speech__tools_include_EST__Ngrammar.h
>===================================================================
>--- audio/festival/files/patch-speech__tools_include_EST__Ngrammar.h	(nonexistent)
>+++ audio/festival/files/patch-speech__tools_include_EST__Ngrammar.h	(working copy)
>@@ -0,0 +1,19 @@
>+(blindly) adapted to Festival 2.4
>+
>+#$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
>+@@ -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);
>
>Property changes on: audio/festival/files/patch-speech__tools_include_EST__Ngrammar.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/festival/files/patch-speech__tools_include_EST__String.h
>===================================================================
>--- audio/festival/files/patch-speech__tools_include_EST__String.h	(nonexistent)
>+++ audio/festival/files/patch-speech__tools_include_EST__String.h	(working copy)
>@@ -0,0 +1,19 @@
>+(blindly) adapted to Festival 2.4
>+
>+#$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
>+@@ -647,6 +647,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	
>
>Property changes on: audio/festival/files/patch-speech__tools_include_EST__String.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: audio/festival/files/patch-voxware
>===================================================================
>--- audio/festival/files/patch-voxware	(revision 402228)
>+++ audio/festival/files/patch-voxware	(working copy)
>@@ -29,18 +29,11 @@
>  #include <fcntl.h>
> -int linux16_supported = TRUE;
> -int freebsd16_supported = FALSE;
>--static char *aud_sys_name = "Linux";
>+-static const char *aud_sys_name = "Linux";
> +
>  static int stereo_only = 0;
>  
>-@@ -152,5 +156,5 @@
>-     int audio,actual_fmt;
>-     int i,r,n;
>--    char *audiodevice;
>-+    const char *audiodevice;
>- 
>-     if (al.present("-audiodevice"))
>-@@ -279,5 +283,5 @@
>+@@ -764,5 +768,5 @@
>      int audio=-1,actual_fmt;
>      int i,r,n;
> -    char *audiodevice;
>Index: audio/festival/pkg-plist
>===================================================================
>--- audio/festival/pkg-plist	(revision 402228)
>+++ audio/festival/pkg-plist	(working copy)
>@@ -26,12 +26,12 @@
> %%DATADIR%%/examples/intro.text
> %%DATADIR%%/examples/latest
> %%DATADIR%%/examples/latest.sh
>-%%DATADIR%%/examples/run-festival-script
>-%%DATADIR%%/examples/run-festival-script.sh
> %%DATADIR%%/examples/make_utts
> %%DATADIR%%/examples/make_utts.sh
> %%DATADIR%%/examples/powmeanstd
> %%DATADIR%%/examples/powmeanstd.sh
>+%%DATADIR%%/examples/run-festival-script
>+%%DATADIR%%/examples/run-festival-script.sh
> %%DATADIR%%/examples/saytime
> %%DATADIR%%/examples/saytime.sh
> %%DATADIR%%/examples/scfg_parse_text
>@@ -52,6 +52,8 @@
> %%DATADIR%%/examples/spintro.text
> %%DATADIR%%/examples/text2pos
> %%DATADIR%%/examples/text2pos.sh
>+%%DATADIR%%/examples/text2utt
>+%%DATADIR%%/examples/text2utt.sh
> %%DATADIR%%/examples/text2wave
> %%DATADIR%%/examples/text2wave.sh
> %%DATADIR%%/examples/th-mode.scm

Actions: View | Diff

Attachments on bug 204754: 163438 | 163439 | 163440