cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

further fixes for gcc4 on LP64

Browse Source
This commit is contained in:
espie 2010-06-06 07:45:31 +00:00
parent 11333598c5
commit 2af8e74da2
4 changed files with 118 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/festival/core/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.12 2010/04/26 01:32:38 jakemsr Exp $
# $OpenBSD: Makefile,v 1.13 2010/06/06 07:45:31 espie Exp $
COMMENT= general multi-lingual speech synthesis system
V= 1.95
DISTNAME= festival-${V}-beta
PKGNAME= ${DISTNAME:S/-beta/beta/}p3
PKGNAME= ${DISTNAME:S/-beta/beta/}p4
CATEGORIES= audio
MASTER_SITES= http://www.cstr.ed.ac.uk/downloads/festival/${V}/ \
http://festvox.org/packed/festival/${V}/

36
audio/festival/core/patches/patch-speech_tools_include_EST_simplestats_h Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-speech_tools_include_EST_simplestats_h,v 1.1 2010/06/06 07:45:31 espie Exp $
--- speech_tools/include/EST_simplestats.h.orig Sun Jun 6 09:33:27 2010
+++ speech_tools/include/EST_simplestats.h Sun Jun 6 09:36:59 2010
@@ -193,7 +193,7 @@ enum EST_tprob_type {tprob_string, tprob_int, tprob_di
Methods are provided to iterate over the values in a distribution,
for example
\begin{verbatim}
- EST_DiscreteProbistribution pdf;
+ EST_DiscreteProbDistribution pdf;
for (int i=pdf.item_start(); i < pdf.item_end(); i=pdf.item_next(i))
{
EST_String name;
@@ -265,17 +265,17 @@ class EST_DiscreteProbDistribution { (public)
///
double frequency(const int i) const;
/// Used for iterating through members of the distribution
- int item_start() const;
+ long item_start() const;
/// Used for iterating through members of the distribution
- int item_next(int idx) const;
+ long item_next(long idx) const;
/// Used for iterating through members of the distribution
- int item_end(int idx) const;
+ long item_end(long idx) const;
/// During iteration returns name given index
- const EST_String &item_name(int idx) const;
+ const EST_String &item_name(long idx) const;
/// During iteration returns name and frequency given index
- void item_freq(int idx,EST_String &s,double &freq) const;
+ void item_freq(long idx,EST_String &s,double &freq) const;
/// During iteration returns name and probability given index
- void item_prob(int idx,EST_String &s,double &prob) const;
+ void item_prob(long idx,EST_String &s,double &prob) const;
/// Returns discrete vocabulary of distribution
inline const EST_Discrete *const get_discrete() const { return discrete; };

12
audio/festival/core/patches/patch-speech_tools_ling_class_item_feats_cc Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-speech_tools_ling_class_item_feats_cc,v 1.1 2010/06/06 07:45:31 espie Exp $
--- speech_tools/ling_class/item_feats.cc.orig Sun Jun 6 09:28:22 2010
+++ speech_tools/ling_class/item_feats.cc Sun Jun 6 09:29:00 2010
@@ -78,7 +78,7 @@ EST_String get_featname(const EST_Item_featfunc func)
EST_String name = EST_FeatureFunctionContext::global->get_featfunc_name(func, found);
if (!found)
- EST_error("featfunc 0x%x has no name", (int)func);
+ EST_error("featfunc 0x%lx has no name", (long)func);
return name;
}

68
audio/festival/core/patches/patch-speech_tools_stats_EST_DProbDist_cc Normal file
View File

@ -0,0 +1,68 @@
$OpenBSD: patch-speech_tools_stats_EST_DProbDist_cc,v 1.1 2010/06/06 07:45:31 espie Exp $
--- speech_tools/stats/EST_DProbDist.cc.orig Sun Jun 6 09:32:19 2010
+++ speech_tools/stats/EST_DProbDist.cc Sun Jun 6 09:36:58 2010
@@ -305,15 +305,15 @@ double EST_DiscreteProbDistribution::entropy() const
}
// For iterating through members of a probability distribution
-int EST_DiscreteProbDistribution::item_start(void) const
+long EST_DiscreteProbDistribution::item_start(void) const
{
if (type == tprob_discrete)
return 0;
else
- return (int)scounts.list.head();
+ return (long)scounts.list.head();
}
-int EST_DiscreteProbDistribution::item_end(int idx) const
+long EST_DiscreteProbDistribution::item_end(long idx) const
{
if (type == tprob_discrete)
return (idx >= icounts.length());
@@ -321,15 +321,15 @@ int EST_DiscreteProbDistribution::item_end(int idx) co
return ((EST_Litem *)idx == 0);
}
-int EST_DiscreteProbDistribution::item_next(int idx) const
+long EST_DiscreteProbDistribution::item_next(long idx) const
{
if (type == tprob_discrete)
return ++idx;
else
- return (int)next((EST_Litem *)idx);
+ return (long)next((EST_Litem *)idx);
}
-const EST_String &EST_DiscreteProbDistribution::item_name(int idx) const
+const EST_String &EST_DiscreteProbDistribution::item_name(long idx) const
{
if (type == tprob_discrete)
return discrete->name(idx);
@@ -337,7 +337,7 @@ const EST_String &EST_DiscreteProbDistribution::item_n
return scounts.list((EST_Litem *)idx).k;
}
-void EST_DiscreteProbDistribution::item_freq(int idx,EST_String &s,double &freq) const
+void EST_DiscreteProbDistribution::item_freq(long idx,EST_String &s,double &freq) const
{
if (type == tprob_discrete)
{
@@ -351,7 +351,7 @@ void EST_DiscreteProbDistribution::item_freq(int idx,E
}
}
-void EST_DiscreteProbDistribution::item_prob(int idx,EST_String &s,double &prob) const
+void EST_DiscreteProbDistribution::item_prob(long idx,EST_String &s,double &prob) const
{
if (type == tprob_discrete)
{
@@ -368,7 +368,7 @@ void EST_DiscreteProbDistribution::item_prob(int idx,E
ostream & operator<<(ostream &s, const EST_DiscreteProbDistribution &pd)
{
// Output best with probabilities
- int i;
+ long i;
double prob;
double sum=0;
EST_String name;