packages: speech_tools/speech_tools-shared.patch, speech_tools/speech_tools...

patrys patrys at pld-linux.org
Sun Jan 3 18:13:50 CET 2010 

Author: patrys                       Date: Sun Jan  3 17:13:50 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.2.96-beta
- please review the wtf patch as I have no idea what the author expected

---- Files affected:
packages/speech_tools:
   speech_tools-shared.patch (1.1 -> 1.2) , speech_tools.spec (1.51 -> 1.52) , speech_tools-gcc44.patch (NONE -> 1.1)  (NEW), speech_tools-rateconvtrivialbug.patch (NONE -> 1.1)  (NEW), speech_tools-wtf.patch (NONE -> 1.1)  (NEW), speech_tools-gcc41.patch (1.5 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/speech_tools/speech_tools-shared.patch
diff -u packages/speech_tools/speech_tools-shared.patch:1.1 packages/speech_tools/speech_tools-shared.patch:1.2
--- packages/speech_tools/speech_tools-shared.patch:1.1	Sat Jul  6 02:50:40 2002
+++ packages/speech_tools/speech_tools-shared.patch	Sun Jan  3 18:13:44 2010
@@ -3,9 +3,9 @@
 +++ speech_tools/config/config.in	Fri Jul  5 13:47:29 2002
 @@ -61,7 +61,7 @@
  # VERBOSE=1
- # DEBUG=1
+ #DEBUG=1
  # PROFILE=gprof
--# SHARED=1
+-#SHARED=2
 +SHARED=2
  
  ## Directory specific selections which override the above

================================================================
Index: packages/speech_tools/speech_tools.spec
diff -u packages/speech_tools/speech_tools.spec:1.51 packages/speech_tools/speech_tools.spec:1.52
--- packages/speech_tools/speech_tools.spec:1.51	Thu Jan 31 23:07:37 2008
+++ packages/speech_tools/speech_tools.spec	Sun Jan  3 18:13:44 2010
@@ -1,23 +1,24 @@
 # $Revision$, $Date$
-%define		rel	5
+%define		rel	1
 Summary:	Edinburgh Speech Tools Library
 Summary(pl.UTF-8):	Biblioteka narzędzi mowy Edinburgh
 Name:		speech_tools
-Version:	1.2.95
+Version:	1.2.96
 Release:	0.beta.%{rel}
 License:	distributable
 Group:		Applications/Sound
 #Source0:	http://www.cstr.ed.ac.uk/download/festival/1.4.3/%{name}-%{version}-release.tar.gz
-#Source0:	http://www.festvox.org/packed/festival/latest/%{name}-%{version}-current%{_snap}.tar.gz
-Source0:	http://www.festvox.org/packed/festival/1.95/%{name}-%{version}-beta.tar.gz
-# Source0-md5:	4a0a58d8c4bafaee9f0a913372ded8bd
+Source0:	http://www.festvox.org/packed/festival/latest/%{name}-%{version}-beta.tar.gz
+# Source0-md5:	887e0c7586facb97cfc0114a105763b2
 Patch0:		%{name}-termcap.patch
 Patch1:		%{name}-shared.patch
 Patch2:		%{name}-soname.patch
 Patch3:		%{name}-bin_printf.patch
-Patch4:		%{name}-gcc41.patch
+Patch4:		%{name}-rateconvtrivialbug.patch
 Patch5:		%{name}-as-needed.patch
 Patch6:		%{name}-gcc42.patch
+Patch7:		%{name}-gcc44.patch
+Patch8:		%{name}-wtf.patch
 URL:		http://www.cstr.ed.ac.uk/projects/speech_tools/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -79,9 +80,11 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p0
-%patch4 -p1
+%patch4 -p2
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 %if "%{_lib}" == "lib64"
 # fix regression output for 64-bit archs (sizeof(ptr)==8 instead of 4).
 sed -i 's:20 bytes:24 bytes:' testsuite/correct/matrix_regression.out
@@ -93,7 +96,7 @@
 %{__aclocal}
 %{__autoconf}
 %configure
-%{__make} all test \
+%{__make} all test -j1 \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
 	OPTIMISE_CCFLAGS="%{rpmcflags}" \
@@ -185,6 +188,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52  2010/01/03 17:13:44  patrys
+- 1.2.96-beta
+- please review the wtf patch as I have no idea what the author expected
+
 Revision 1.51  2008/01/31 22:07:37  glen
 - rel 5
 

================================================================
Index: packages/speech_tools/speech_tools-gcc44.patch
diff -u /dev/null packages/speech_tools/speech_tools-gcc44.patch:1.1
--- /dev/null	Sun Jan  3 18:13:50 2010
+++ packages/speech_tools/speech_tools-gcc44.patch	Sun Jan  3 18:13:44 2010
@@ -0,0 +1,41 @@
+--- speech_tools/speech_class/EST_wave_io.cc	2010-01-03 16:57:14.396879270 +0100
++++ speech_tools/speech_class/EST_wave_io.cc.orig	2006-01-12 16:37:51.000000000 +0100
+@@ -68,7 +68,7 @@
+ 
+ int nist_get_param_int(const char *hdr, const char *field, int def_val)
+ {
+-    char *p;
++    const char *p;
+     int val;
+ 
+     if (((p=strstr(hdr,field)) != NULL) &&
+@@ -84,7 +84,8 @@
+ 
+ char *nist_get_param_str(const char *hdr, const char *field, const char *def_val)
+ {
+-    char *p,*val;
++    const char *p;
++    char *val;
+     int size;
+ 
+     if (((p=strstr(hdr,field)) != NULL) &&
+--- speech_tools/base_class/EST_TSimpleMatrix.cc~	2004-09-30 14:53:35.000000000 +0200
++++ speech_tools/base_class/EST_TSimpleMatrix.cc	2010-01-03 16:48:52.345905810 +0100
+@@ -44,6 +44,7 @@
+ #include "EST_TVector.h"
+ #include <fstream>
+ #include <iostream>
++#include <string.h>
+ #include "EST_cutils.h"
+ 
+ template<class T> 
+--- speech_tools/base_class/EST_TSimpleVector.cc~	2006-07-06 14:57:18.000000000 +0200
++++ speech_tools/base_class/EST_TSimpleVector.cc	2010-01-03 16:51:50.968904972 +0100
+@@ -43,6 +43,7 @@
+ #include "EST_TSimpleVector.h"
+ #include "EST_matrix_support.h"
+ #include <fstream>
++#include <string.h>
+ #include "EST_cutils.h"
+ 
+ template<class T> void EST_TSimpleVector<T>::copy(const EST_TSimpleVector<T> &a)

================================================================
Index: packages/speech_tools/speech_tools-rateconvtrivialbug.patch
diff -u /dev/null packages/speech_tools/speech_tools-rateconvtrivialbug.patch:1.1
--- /dev/null	Sun Jan  3 18:13:50 2010
+++ packages/speech_tools/speech_tools-rateconvtrivialbug.patch	Sun Jan  3 18:13:44 2010
@@ -0,0 +1,12 @@
+--- festival/speech_tools/base_class/rateconv.cc.orig	2007-03-13 15:13:21.000000000 -0400
++++ festival/speech_tools/base_class/rateconv.cc	2007-03-13 15:15:15.000000000 -0400
+@@ -384,7 +384,8 @@
+ 	    }
+ 	    fir_stereo(inp + inoffset + inbaseidx,
+ 		       coep + cycctr * firlen, firlen,
+-		       outp + outidx++, outp + outidx++);
++		       outp + outidx, outp + outidx + 1);
++	    outidx += 2;
+ 	    cycctr++;
+ 	    if (!(cycctr %= up))
+ 		inbaseidx += 2*down;

================================================================
Index: packages/speech_tools/speech_tools-wtf.patch
diff -u /dev/null packages/speech_tools/speech_tools-wtf.patch:1.1
--- /dev/null	Sun Jan  3 18:13:50 2010
+++ packages/speech_tools/speech_tools-wtf.patch	Sun Jan  3 18:13:44 2010
@@ -0,0 +1,20 @@
+--- speech_tools/stats/EST_DProbDist.cc.orig	2004-09-30 14:53:36.000000000 +0200
++++ speech_tools/stats/EST_DProbDist.cc	2010-01-03 17:09:34.651883980 +0100
+@@ -310,7 +310,7 @@
+     if (type == tprob_discrete)
+ 	return 0;
+     else
+-	return (int)scounts.list.head();
++	return scounts.list.index(scounts.list.head());
+ }
+ 
+ int EST_DiscreteProbDistribution::item_end(int idx) const
+@@ -326,7 +326,7 @@
+     if (type == tprob_discrete)
+ 	return ++idx;
+     else
+-	return (int)next((EST_Litem *)idx);
++	return scounts.list.index(next((EST_Litem *)idx));
+ }
+ 
+ const EST_String &EST_DiscreteProbDistribution::item_name(int idx) const
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/speech_tools/speech_tools-shared.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/speech_tools/speech_tools.spec?r1=1.51&r2=1.52&f=u

More information about the pld-cvs-commit mailing list