commit 6e32974f26554e3ab3b69d4dfdc83cadf89604f2
Author: Jakub Bogusz <[email protected]>
Date: Fri Aug 4 19:45:27 2017 +0200
- updated to 2.4 (note: new sonames)
- updated pulse patch
- removed obsolete rateconvtrivialbug,gcc42,gcc47,format-security patches
- gcc44 patch merged into soname patch
- added alsa patch
format-security.patch | 22 ---------
speech_tools-alsa.patch | 11 +++++
speech_tools-gcc42.patch | 11 -----
speech_tools-gcc44.patch | 20 --------
speech_tools-gcc47.patch | 92 -----------------------------------
speech_tools-pulse.patch | 9 ++--
speech_tools-rateconvtrivialbug.patch | 12 -----
speech_tools-soname.patch | 2 +-
speech_tools.spec | 53 +++++++-------------
9 files changed, 33 insertions(+), 199 deletions(-)
---
diff --git a/speech_tools.spec b/speech_tools.spec
index 12de5fb..3cf2b1a 100644
--- a/speech_tools.spec
+++ b/speech_tools.spec
@@ -3,24 +3,19 @@
Summary: Edinburgh Speech Tools Library
Summary(pl.UTF-8): Biblioteka narzędzi mowy Edinburgh
Name: speech_tools
-Version: 2.1
-Release: 4
+Version: 2.4
+Release: 1
License: distributable
Group: Applications/Sound
-# also:
http://www.cstr.ed.ac.uk/download/festival/2.1/%{name}-%{version}-release.tar.gz
-Source0:
http://www.festvox.org/packed/festival/latest/%{name}-%{version}-release.tar.gz
-# Source0-md5: 6920ddc75b042910a3bcfee3ab106938
+Source0:
http://www.festvox.org/packed/festival/2.4/%{name}-%{version}-release.tar.gz
+# Source0-md5: 3d60e563135363eb2548d947f7ef4e14
Patch0: %{name}-shared.patch
Patch1: %{name}-soname.patch
Patch2: %{name}-bin_printf.patch
-Patch3: %{name}-rateconvtrivialbug.patch
+Patch3: %{name}-alsa.patch
Patch4: %{name}-as-needed.patch
-Patch5: %{name}-gcc42.patch
-Patch6: %{name}-gcc44.patch
Patch7: %{name}-link.patch
-Patch8: %{name}-gcc47.patch
-Patch9: %{name}-pulse.patch
-Patch10: format-security.patch
+Patch8: %{name}-pulse.patch
URL: http://www.cstr.ed.ac.uk/projects/speech_tools/
BuildRequires: alsa-lib-devel
BuildRequires: autoconf
@@ -84,14 +79,10 @@ Programy użytkowe narzędzi mowy Edinburgh.
%patch0 -p1
%patch1 -p1
%patch2 -p0
-%patch3 -p2
+%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
-%patch10 -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
@@ -122,14 +113,10 @@ install -d
$RPM_BUILD_ROOT{%{_bindir},%{_includedir}/EST,%{_datadir}/%{name}/exa
# includes
cp -r include/* $RPM_BUILD_ROOT%{_includedir}/EST
find $RPM_BUILD_ROOT%{_includedir}/EST -name Makefile -exec rm \{\} \;
-for file in `find $RPM_BUILD_ROOT%{_includedir}/EST -type f`
-do
- sed 's/\"\(.*h\)\"/\<EST\/\1\>/g' $file > $file.tmp
- grep -v est_string_config\.h $file.tmp > $file
- rm -f $file.tmp
+for file in `find $RPM_BUILD_ROOT%{_includedir}/EST -type f`; do
+ sed -i -e 's/\"\(.*h\)\"/\<EST\/\1\>/g' -e '/est_string_config\.h/d'
$file
done
-sed 's/\<EST\//&rxp\//g' $RPM_BUILD_ROOT%{_includedir}/EST/rxp/rxp.h > bzzz
-mv bzzz $RPM_BUILD_ROOT%{_includedir}/EST/rxp/rxp.h
+sed -i -e 's/\<EST\//&rxp\//g' $RPM_BUILD_ROOT%{_includedir}/EST/rxp/rxp.h
for i in $RPM_BUILD_ROOT%{_includedir}/EST/rxp/*
do
ln -s %{_includedir}/EST/rxp/`basename $i`
$RPM_BUILD_ROOT%{_includedir}/EST/`basename $i`
@@ -137,15 +124,11 @@ done
ln -s /usr/include/EST $RPM_BUILD_ROOT%{_libdir}/%{name}/include
# libraries
-install lib/lib* $RPM_BUILD_ROOT%{_libdir}
-for i in $RPM_BUILD_ROOT%{_libdir}/*.so
-do
- rm $i
- ln -s `basename $i*` $i
-done
+cp -dp lib/lib* $RPM_BUILD_ROOT%{_libdir}
+/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
# binaries
-install `find bin -type f -perm +1` $RPM_BUILD_ROOT%{_bindir}
+install `find bin -type f -perm -001` $RPM_BUILD_ROOT%{_bindir}
# scripts
install
scripts/{example_to_doc++.prl,make_wagon_desc.sh,resynth.sh,shared_script,shared_setup_prl,shared_setup_sh}
\
@@ -153,9 +136,10 @@ install
scripts/{example_to_doc++.prl,make_wagon_desc.sh,resynth.sh,shared_scrip
# example data
install lib/example_data/* $RPM_BUILD_ROOT%{_datadir}/%{name}/example_data
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/example_data/Makefile
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/example_data/Makefile
# more shit
+# FIXME: do we need to package everything?
cp -r config $RPM_BUILD_ROOT%{_libdir}/%{name}
cp -r testsuite $RPM_BUILD_ROOT%{_libdir}/%{name}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/testsuite/*.o
@@ -172,8 +156,6 @@ cp -a base_class $RPM_BUILD_ROOT%{_libdir}/%{name}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/base_class/.build*
%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/base_class/*/.build*
-/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -184,9 +166,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc README
%attr(755,root,root) %{_libdir}/libestbase.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libestbase.so.2.1
+%attr(755,root,root) %ghost %{_libdir}/libestbase.so.2.4
%attr(755,root,root) %{_libdir}/libestools.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libestools.so.2.1
+%attr(755,root,root) %ghost %{_libdir}/libestools.so.2.4
%attr(755,root,root) %{_libdir}/libeststring.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libeststring.so.1
%{_datadir}/%{name}
@@ -221,7 +203,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/est_gdb
%attr(755,root,root) %{_bindir}/est_program
%attr(755,root,root) %{_bindir}/example_to_doc++
-%attr(755,root,root) %{_bindir}/fringe_client
%attr(755,root,root) %{_bindir}/make_wagon_desc
%attr(755,root,root) %{_bindir}/na_play
%attr(755,root,root) %{_bindir}/na_record
diff --git a/format-security.patch b/format-security.patch
deleted file mode 100644
index b6ca691..0000000
--- a/format-security.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- speech_tools/siod/siodeditline.c~ 2004-04-30 18:56:51.000000000 +0200
-+++ speech_tools/siod/siodeditline.c 2015-05-10 00:54:43.756487007 +0200
-@@ -151,7 +151,7 @@
- symbol = el_current_sym();
- infostring = siod_manual_sym(symbol);
- putc('\n',stderr);
-- fprintf(stderr,infostring);
-+ fprintf(stderr,"%s",infostring);
- fflush(stderr);
- putc('\n',stderr);
- fflush(stderr);
---- speech_tools/utils/cmd_line.cc~ 2010-11-05 16:10:38.000000000 +0100
-+++ speech_tools/utils/cmd_line.cc 2015-05-10 00:56:45.835259085 +0200
-@@ -460,7 +460,7 @@
- fprintf(stdout,"<cmdsynopsis><command>%s</command>",
- (const char *)full.filename());
-
-- fprintf(stdout, (const char *)ts.get_upto_eoln().string());
-+ fprintf(stdout, "%s", (const char *)ts.get_upto_eoln().string());
-
- while (!ts.eof())
- {
diff --git a/speech_tools-alsa.patch b/speech_tools-alsa.patch
new file mode 100644
index 0000000..eadf963
--- /dev/null
+++ b/speech_tools-alsa.patch
@@ -0,0 +1,11 @@
+--- speech_tools/configure.in.orig 2014-12-20 16:35:49.000000000 +0100
++++ speech_tools/configure.in 2017-07-20 17:26:19.669578458 +0200
+@@ -85,7 +85,7 @@
+ LINUXAUDIO=none
+ AC_TRY_COMPILE([#include <alsa/version.h>],
+ [int j=
+- #if SND_LIB_SUBMINOR >= 11
++ #if (SND_LIB_MAJOR > 1) || ((SND_LIB_MAJOR == 1) &&
((SND_LIB_MINOR > 0) || (SND_LIB_SUBMINOR >= 11)))
+ 3;
+ #endif],
+ [LINUXAUDIO="alsa"])
diff --git a/speech_tools-gcc42.patch b/speech_tools-gcc42.patch
deleted file mode 100644
index d11cd86..0000000
--- a/speech_tools-gcc42.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- speech_tools/config/compilers/gcc_defaults.mak~ 2012-01-17
16:25:23.304846522 +0100
-+++ speech_tools/config/compilers/gcc_defaults.mak 2012-01-17
16:27:30.357325642 +0100
-@@ -81,7 +81,7 @@
- SHARED_LINKFLAGS =
-
- ifndef GCC_MAKE_SHARED_LIB
-- MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX -Wl,-soname
-Wl,YYY
-+ MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname -Wl,YYY
- else
- MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
- endif
diff --git a/speech_tools-gcc44.patch b/speech_tools-gcc44.patch
deleted file mode 100644
index bcfef59..0000000
--- a/speech_tools-gcc44.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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)
diff --git a/speech_tools-gcc47.patch b/speech_tools-gcc47.patch
deleted file mode 100644
index 2fee844..0000000
--- a/speech_tools-gcc47.patch
+++ /dev/null
@@ -1,92 +0,0 @@
---- speech_tools/include/EST_TIterator.h.orig 2012-02-25 12:09:30.926212818
-0600
-+++ speech_tools/include/EST_TIterator.h 2012-02-25 12:10:32.981099676
-0600
-@@ -101,7 +101,7 @@
-
- /// Create an iterator ready to run over the given container.
- EST_TIterator(const Container &over)
-- { begin(over); }
-+ { this->begin(over); }
-
- /// Copy an iterator by assignment
- Iter &operator = (const Iter &orig)
-@@ -109,7 +109,7 @@
-
- /// Assigning a container to an iterator sets it ready to start.
- Iter &operator = (const Container &over)
-- { begin(over); return *this;}
-+ { this->begin(over); return *this;}
-
- /// Set the iterator ready to run over this container.
- void begin(const Container &over)
-@@ -209,7 +209,7 @@
-
- /// 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();}
-@@ -239,7 +239,7 @@
-
- /// Create an iterator ready to run over the given container.
- EST_TRwIterator(Container &over)
-- { begin(over); }
-+ { this->begin(over); }
-
- /// Set the iterator ready to run over this container.
- void begin(Container &over)
-@@ -289,7 +289,7 @@
-
- /// 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.orig 2012-02-25 12:26:51.432455812
-0600
-+++ speech_tools/include/EST_TNamedEnum.h 2012-02-25 12:27:07.125450312
-0600
-@@ -130,7 +130,7 @@
- {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); };
-
- };
-
---- speech_tools/base_class/EST_TSimpleMatrix.cc.orig 2012-02-25
12:34:37.095639209 -0600
-+++ speech_tools/base_class/EST_TSimpleMatrix.cc 2012-02-25
12:35:33.952865468 -0600
-@@ -97,7 +97,7 @@
- {
- 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);
-
- memcpy((void *)this->p_memory,
- (const void *)old_vals,
-@@ -126,9 +126,9 @@
- 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.orig 2012-02-25
12:38:16.647543126 -0600
-+++ speech_tools/base_class/EST_TSimpleVector.cc 2012-02-25
12:38:41.571710862 -0600
-@@ -70,7 +70,7 @@
- T *old_vals =NULL;
- int old_offset = this->p_offset;
-
-- just_resize(newn, &old_vals);
-+ this->just_resize(newn, &old_vals);
-
- if (set && old_vals)
- {
diff --git a/speech_tools-pulse.patch b/speech_tools-pulse.patch
index 0c37e93..18fb04c 100644
--- a/speech_tools-pulse.patch
+++ b/speech_tools-pulse.patch
@@ -234,16 +234,15 @@ diff -up speech_tools/config/config.in.pulse
speech_tools/config/config.in
diff -up speech_tools/config/modules/Makefile.pulse
speech_tools/config/modules/Makefile
--- speech_tools/config/modules/Makefile.pulse 2004-07-15 19:03:05.000000000
-0400
+++ speech_tools/config/modules/Makefile 2009-09-29 02:05:53.359687618
-0400
-@@ -41,7 +41,8 @@ RULESETS = efence.mak dmalloc.mak debugg
+@@ -41,7 +41,7 @@ RULESETS = efence.mak dmalloc.mak debugg
psola_tm.mak editline.mak tcl.mak \
freebsd16_audio.mak irix_audio.mak linux16_audio.mak \
sun16_audio.mak win32_audio.mak macosx_audio.mak \
-- mplayer_audio.mak nas_audio.mak esd_audio.mak
-+ mplayer_audio.mak nas_audio.mak esd_audio.mak \
-+ pulse_audio.mak
+- mplayer_audio.mak nas_audio.mak esd_audio.mak \
++ mplayer_audio.mak nas_audio.mak esd_audio.mak pulse_audio.mak \
+ siod_python.mak
FILES = Makefile descriptions $(RULESETS)
-
diff -up /dev/null speech_tools/config/modules/pulse_audio.mak
--- /dev/null 2009-09-29 00:23:01.118964058 -0400
+++ speech_tools/config/modules/pulse_audio.mak 2009-09-29
02:05:53.361688082 -0400
diff --git a/speech_tools-rateconvtrivialbug.patch
b/speech_tools-rateconvtrivialbug.patch
deleted file mode 100644
index 91d08e0..0000000
--- a/speech_tools-rateconvtrivialbug.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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;
diff --git a/speech_tools-soname.patch b/speech_tools-soname.patch
index fdf04f7..f377b46 100644
--- a/speech_tools-soname.patch
+++ b/speech_tools-soname.patch
@@ -5,7 +5,7 @@
ifndef GCC_MAKE_SHARED_LIB
- MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
-+ MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX -Wl,-soname
-Wl,YYY
++ MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname -Wl,YYY
else
MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/speech_tools.git/commitdiff/6e32974f26554e3ab3b69d4dfdc83cadf89604f2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
