Hello community, here is the log from the commit of package festival for openSUSE:Factory checked in at Fri Jul 8 09:42:26 CEST 2011.
-------- --- festival/festival.changes 2010-09-30 14:50:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/festival/festival.changes 2011-06-27 20:18:59.000000000 +0200 @@ -1,0 +2,22 @@ +Mon Jun 27 19:38:24 CEST 2011 - [email protected] + +- Update to version 2.1: + + Integrated and updated support for HTS, Clustergen, Multisyn + and Clunits voices. + + Build fixes for newer gcc. + + Bug fixes galore. +- Drop various patches that were needed to fix build issues + (generally caused by recent gcc): festival-1.95-gcc4.patch, + festival-1.96.patch, speech_tools-1.2.95-gcc4.patch, + speech_tools-1.2.95-gcc41.patch, + speech_tools-1.2.95-returnvalue.patch, + speech_tools-1.2.96-beta-const.patch, + speech_tools-1.2.96-beta.patch. +- Rebase festival-no-LD_LIBRARY_PATH-extension.patch and + speech_tools-no-LD_LIBRARY_PATH-extension.patch, and change them + to not remove empty files (which introduces errors during the + build) by keeping an empty line in those files. +- Add speech_tools-undefined-operation.patch, which contains the + only interesting bit left from speech_tools-1.2.95-gcc41.patch. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- festival-1.95-gcc4.patch festival-1.96-beta.tar.bz2 festival-1.96.patch festlex_CMU.tar.bz2 festlex_POSLEX.tar.bz2 festvox_kallpc16k.tar.bz2 speech_tools-1.2.95-gcc4.patch speech_tools-1.2.95-gcc41.patch speech_tools-1.2.95-returnvalue.patch speech_tools-1.2.96-beta-const.patch speech_tools-1.2.96-beta.patch speech_tools-1.2.96-beta.tar.bz2 New: ---- festival-2.1-release.tar.gz festlex_CMU.tar.gz festlex_POSLEX.tar.gz festvox_kallpc16k.tar.gz speech_tools-2.1-release.tar.gz speech_tools-undefined-operation.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ festival.spec ++++++ --- /var/tmp/diff_new_pack.Ndrsry/_old 2011-07-08 09:40:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Ndrsry/_new 2011-07-08 09:40:55.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package festival (Version 1.96) +# spec file for package festival # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,24 +19,20 @@ Name: festival -BuildRequires: gcc-c++ ncurses-devel pkgconfig -Url: http://www.cstr.ed.ac.uk/projects/festival/ +Version: 2.1 +Release: 1 +Summary: The Festival Speech Synthesis System License: BSD3c +Url: http://www.cstr.ed.ac.uk/projects/festival/ Group: Productivity/Text/Convertors -AutoReqProv: on -Version: 1.96 -Release: 128 -Summary: The Festival Speech Synthesis System -Source0: festival-%{version}-beta.tar.bz2 -Source1: speech_tools-1.2.96-beta.tar.bz2 -Source2: festlex_CMU.tar.bz2 -Source3: festvox_kallpc16k.tar.bz2 -Source4: festlex_POSLEX.tar.bz2 +Source0: http://www.cstr.ed.ac.uk/downloads/festival/2.1/festival-%{version}-release.tar.gz +Source1: http://www.cstr.ed.ac.uk/downloads/festival/2.1/speech_tools-%{version}-release.tar.gz +Source2: http://www.cstr.ed.ac.uk/downloads/festival/2.1/festlex_CMU.tar.gz +Source3: http://www.cstr.ed.ac.uk/downloads/festival/2.1/festvox_kallpc16k.tar.gz +Source4: http://www.cstr.ed.ac.uk/downloads/festival/2.1/festlex_POSLEX.tar.gz Source5: sysconfig.festival Source6: rcfestival # festival patches -Patch0: %{name}-%{version}.patch -Patch1: festival-1.95-gcc4.patch Patch2: festival-1.95-examples.patch Patch3: festival-text2wave-manpage.patch Patch4: festival-1.95-libdir.patch @@ -47,16 +43,16 @@ # PATCH-FIX-UPSTREAM festival-safe-temp-file.patch bnc#642507 [email protected] -- Create temporary files in a safe way Patch10: festival-safe-temp-file.patch # speech-tools patches -Patch11: speech_tools-1.2.95-gcc4.patch +# PATCH-FIX-UPSTREAM speech_tools-undefined-operation.patch [email protected] -- Avoid a undefined-operation warning with gcc (sending mail upstream) +Patch11: speech_tools-undefined-operation.patch Patch12: speech_tools-1.2.95-config.patch -Patch13: speech_tools-1.2.95-gcc41.patch -Patch14: speech_tools-1.2.95-returnvalue.patch -Patch15: speech_tools-1.2.96-beta.patch -Patch16: speech_tools-1.2.96-beta-const.patch # PATCH-FIX-UPSTREAM speech_tools-no-LD_LIBRARY_PATH-extension.patch [email protected] -- Do not change LD_LIBRARY_PATH in binaries, to avoid any risks Patch17: speech_tools-no-LD_LIBRARY_PATH-extension.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: gcc-c++ +BuildRequires: ncurses-devel +BuildRequires: pkgconfig PreReq: %fillup_prereq /usr/sbin/useradd /usr/sbin/groupadd +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Festival is a multilingual speech synthesis system developed at CSTR. @@ -69,16 +65,13 @@ License: MIT Summary: Development Package for Festival Group: Productivity/Text/Convertors -AutoReqProv: on -Requires: %name == %version +Requires: %{name} = %{version} %description devel Files needed for developing software that uses Festival. %prep %setup -q -b 1 -b 2 -b 3 -b 4 -q -n festival -%patch0 -%patch1 %patch2 -p1 %patch3 -p1 %patch4 @@ -87,12 +80,8 @@ %patch9 -p1 %patch10 -p1 cd ../speech_tools -#%patch11 -p1 +%patch11 -p1 %patch12 -%patch13 -p1 -%patch14 -p1 -%patch15 -%patch16 %patch17 -p1 %build @@ -113,9 +102,9 @@ make doc %install -make install DESTDIR=$RPM_BUILD_ROOT +%make_install cd ../speech_tools -make install DESTDIR=$RPM_BUILD_ROOT +%make_install cd ../festival # install binarys install -D bin/text2wave $RPM_BUILD_ROOT%_bindir/text2wave ++++++ festival-no-LD_LIBRARY_PATH-extension.patch ++++++ --- /var/tmp/diff_new_pack.Ndrsry/_old 2011-07-08 09:40:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Ndrsry/_new 2011-07-08 09:40:55.000000000 +0200 @@ -22,7 +22,7 @@ - eval "export $var" - } - --extend LD_LIBRARY_PATH "__EST__/lib:__LDPATH__" +-extend __LDVAR__ "__EST__/lib:__LDPATH__" - exec __MAIN__/__PROGRAM__ "$@" @@ -30,9 +30,9 @@ Index: festival/src/scripts/shared_setup_prl =================================================================== --- festival.orig/src/scripts/shared_setup_prl -+++ /dev/null -@@ -1,10 +0,0 @@ -- ++++ festival/src/scripts/shared_setup_prl +@@ -1,10 +1,2 @@ + -if (defined($ENV{LD_LIBRARY_PATH})) - { - $ENV{LD_LIBRARY_PATH} = "__TOP__/lib:__LDPATH__:$ENV{LD_LIBRARY_PATH}"; @@ -41,13 +41,13 @@ - { - $ENV{LD_LIBRARY_PATH} = "__TOP__/lib"; - } -- + Index: festival/src/scripts/shared_setup_sh =================================================================== --- festival.orig/src/scripts/shared_setup_sh -+++ /dev/null -@@ -1,20 +0,0 @@ -- ++++ festival/src/scripts/shared_setup_sh +@@ -1,20 +1,2 @@ + -# festival shared setup - -extend() { @@ -66,4 +66,4 @@ - } - -extend LD_LIBRARY_PATH "__EST__/lib:__LDPATH__" -- + ++++++ speech_tools-no-LD_LIBRARY_PATH-extension.patch ++++++ --- /var/tmp/diff_new_pack.Ndrsry/_old 2011-07-08 09:40:55.000000000 +0200 +++ /var/tmp/diff_new_pack.Ndrsry/_new 2011-07-08 09:40:55.000000000 +0200 @@ -22,7 +22,7 @@ - eval "export $var" - } - --extend LD_LIBRARY_PATH "__LIB__:__LDPATH__" +-extend __LDVAR__ "__LIB__:__LDPATH__" - exec __MAIN__/__PROGRAM__ "$@" @@ -30,9 +30,9 @@ Index: speech_tools/scripts/shared_setup_prl =================================================================== --- speech_tools.orig/scripts/shared_setup_prl -+++ /dev/null -@@ -1,10 +0,0 @@ -- ++++ speech_tools/scripts/shared_setup_prl +@@ -1,10 +1,2 @@ + -if (defined($ENV{LD_LIBRARY_PATH})) - { - $ENV{LD_LIBRARY_PATH} = "__TOP__/lib:__LDPATH__:$ENV{LD_LIBRARY_PATH}"; @@ -41,13 +41,13 @@ - { - $ENV{LD_LIBRARY_PATH} = "__TOP__/lib"; - } -- + Index: speech_tools/scripts/shared_setup_sh =================================================================== --- speech_tools.orig/scripts/shared_setup_sh -+++ /dev/null -@@ -1,20 +0,0 @@ -- ++++ speech_tools/scripts/shared_setup_sh +@@ -1,20 +1,2 @@ + -# EST shared setup - -extend() { @@ -66,4 +66,4 @@ - } - -extend LD_LIBRARY_PATH "__TOP__/lib:__LDPATH__" -- + ++++++ speech_tools-undefined-operation.patch ++++++ --- speech_tools/base_class/rateconv.cc +++ speech_tools/base_class/rateconv.cc @@ -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; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
