[espeak] New version Updated runtime_detection patch Dropped gcc_no_libstdc++ patch
Jaroslav Škarvada
jskarvad at fedoraproject.org
Thu Sep 15 14:52:19 UTC 2011
commit 319a586ac0f7cecef3c7c670bfdc03c8da59770c
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Thu Sep 15 16:50:45 2011 +0200
New version
Updated runtime_detection patch
Dropped gcc_no_libstdc++ patch
espeak-1.40.02-gcc_no_libstdc++.patch | 39 ---------------
espeak-1.40.02-pulseaudio.patch | 14 ------
espeak-1.43-ftbs_ld_libm.patch | 2 +-
...patch => espeak-1.45.05-runtime-detection.patch | 50 ++++++++++++--------
espeak.spec | 15 ++++--
5 files changed, 40 insertions(+), 80 deletions(-)
---
diff --git a/espeak-1.43-ftbs_ld_libm.patch b/espeak-1.43-ftbs_ld_libm.patch
index 341fc5b..be13077 100644
--- a/espeak-1.43-ftbs_ld_libm.patch
+++ b/espeak-1.43-ftbs_ld_libm.patch
@@ -18,5 +18,5 @@ diff -uNr espeak-1.43-source/src/Makefile espeak-1.43-source-mod/src/Makefile
-LIBS3=-lstdc++ -L . -lespeak
+LIBS3=-lstdc++ -lm -L . -lespeak
- CFLAGS=-O2
+ CXXFLAGS=-O2
diff --git a/espeak-1.42.04-runtime-detection.patch b/espeak-1.45.05-runtime-detection.patch
similarity index 80%
rename from espeak-1.42.04-runtime-detection.patch
rename to espeak-1.45.05-runtime-detection.patch
index b991137..b94b905 100644
--- a/espeak-1.42.04-runtime-detection.patch
+++ b/espeak-1.45.05-runtime-detection.patch
@@ -1,13 +1,15 @@
-diff -ur espeak-1.42.04-source/src/Makefile espeak-1.42.04-runtime-detection/src/Makefile
---- espeak-1.42.04-source/src/Makefile 2009-11-26 01:11:54.000000000 +0100
-+++ espeak-1.42.04-runtime-detection/src/Makefile 2009-12-17 17:08:57.000000000 +0100
-@@ -24,10 +24,16 @@
+diff -up espeak-1.45.05-source/src/Makefile.runtime-detection espeak-1.45.05-source/src/Makefile
+--- espeak-1.45.05-source/src/Makefile.runtime-detection 2011-09-15 14:02:16.601703780 +0200
++++ espeak-1.45.05-source/src/Makefile 2011-09-15 14:02:16.609703969 +0200
+@@ -25,12 +25,18 @@ INSTALL = install
LN_SF = /bin/ln -sf
MKDIR = mkdir -p
-AUDIO = portaudio
+AUDIO = runtime
+#AUDIO = portaudio
+ #AUDIO = portaudio0
+ #AUDIO = portaudio2
#AUDIO = pulseaudio
#AUDIO = sada
@@ -19,7 +21,7 @@ diff -ur espeak-1.42.04-source/src/Makefile espeak-1.42.04-runtime-detection/src
ifeq ($(AUDIO),pulseaudio)
WAVE=wave_pulse.cpp
LIB_AUDIO=-lpulse
-@@ -46,6 +52,7 @@
+@@ -61,6 +68,7 @@ endif
endif
endif
endif
@@ -27,10 +29,10 @@ diff -ur espeak-1.42.04-source/src/Makefile espeak-1.42.04-runtime-detection/src
speak_SOURCES = speak.cpp compiledict.cpp dictionary.cpp intonation.cpp \
readclause.cpp setlengths.cpp numbers.cpp synth_mbrola.cpp \
-diff -ur espeak-1.42.04-source/src/wave.cpp espeak-1.42.04-runtime-detection/src/wave.cpp
---- espeak-1.42.04-source/src/wave.cpp 2009-12-09 18:48:13.000000000 +0100
-+++ espeak-1.42.04-runtime-detection/src/wave.cpp 2009-12-17 16:30:14.000000000 +0100
-@@ -53,6 +53,145 @@
+diff -up espeak-1.45.05-source/src/wave.cpp.runtime-detection espeak-1.45.05-source/src/wave.cpp
+--- espeak-1.45.05-source/src/wave.cpp.runtime-detection 2011-08-11 23:38:05.000000000 +0200
++++ espeak-1.45.05-source/src/wave.cpp 2011-09-15 14:02:16.603703826 +0200
+@@ -53,6 +53,145 @@ enum {ONE_BILLION=1000000000};
#endif
@@ -41,7 +43,7 @@ diff -ur espeak-1.42.04-source/src/wave.cpp espeak-1.42.04-runtime-detection/src
+static int pulse_running;
+
+// wave.cpp (this file)
-+void wave_port_init();
++void wave_port_init(int);
+void* wave_port_open(const char* the_api);
+size_t wave_port_write(void* theHandler, char* theMono16BitsWaveBuffer, size_t theSize);
+int wave_port_close(void* theHandler);
@@ -56,7 +58,7 @@ diff -ur espeak-1.42.04-source/src/wave.cpp espeak-1.42.04-runtime-detection/src
+
+// wave_pulse.cpp
+int is_pulse_running();
-+void wave_pulse_init();
++void wave_pulse_init(int);
+void* wave_pulse_open(const char* the_api);
+size_t wave_pulse_write(void* theHandler, char* theMono16BitsWaveBuffer, size_t theSize);
+int wave_pulse_close(void* theHandler);
@@ -70,13 +72,13 @@ diff -ur espeak-1.42.04-source/src/wave.cpp espeak-1.42.04-runtime-detection/src
+int wave_pulse_get_remaining_time(uint32_t sample, uint32_t* time);
+
+// wrappers
-+void wave_init() {
++void wave_init(int srate) {
+ pulse_running = is_pulse_running();
+
+ if (pulse_running)
-+ wave_pulse_init();
++ wave_pulse_init(srate);
+ else
-+ wave_port_init();
++ wave_port_init(srate);
+}
+
+void* wave_open(const char* the_api) {
@@ -176,10 +178,18 @@ diff -ur espeak-1.42.04-source/src/wave.cpp espeak-1.42.04-runtime-detection/src
static t_wave_callback* my_callback_is_output_enabled=NULL;
#define N_WAV_BUF 10
-diff -ur espeak-1.42.04-source/src/wave_pulse.cpp espeak-1.42.04-runtime-detection/src/wave_pulse.cpp
---- espeak-1.42.04-source/src/wave_pulse.cpp 2009-12-09 18:48:13.000000000 +0100
-+++ espeak-1.42.04-runtime-detection/src/wave_pulse.cpp 2009-12-17 17:11:35.000000000 +0100
-@@ -75,6 +75,39 @@
+diff -up espeak-1.45.05-source/src/wave_pulse.cpp.runtime-detection espeak-1.45.05-source/src/wave_pulse.cpp
+--- espeak-1.45.05-source/src/wave_pulse.cpp.runtime-detection 2011-08-11 23:38:05.000000000 +0200
++++ espeak-1.45.05-source/src/wave_pulse.cpp 2011-09-15 14:24:42.662695100 +0200
+@@ -65,6 +65,7 @@ enum {
+
+ static t_wave_callback* my_callback_is_output_enabled=NULL;
+
++#define SAMPLE_RATE 22050
+ #define ESPEAK_FORMAT PA_SAMPLE_S16LE
+ #define ESPEAK_CHANNEL 1
+
+@@ -74,6 +75,39 @@ static t_wave_callback* my_callback_is_o
#define MINREQ 880
#define FRAGSIZE 0
@@ -219,7 +229,7 @@ diff -ur espeak-1.42.04-source/src/wave_pulse.cpp espeak-1.42.04-runtime-detecti
static pthread_mutex_t pulse_mutex;
static pa_context *context = NULL;
-@@ -893,8 +926,9 @@
+@@ -843,8 +877,9 @@ int wave_get_remaining_time(uint32_t sam
return 0;
}
@@ -230,7 +240,7 @@ diff -ur espeak-1.42.04-source/src/wave_pulse.cpp espeak-1.42.04-runtime-detecti
//>
//<clock_gettime2, add_time_in_ms
-@@ -928,6 +962,7 @@
+@@ -878,6 +913,7 @@ void add_time_in_ms(struct timespec *ts,
}
ts->tv_nsec = (long int)t_ns;
}
diff --git a/espeak.spec b/espeak.spec
index 4b8d8b7..6f5fcf6 100644
--- a/espeak.spec
+++ b/espeak.spec
@@ -1,6 +1,6 @@
Name: espeak
-Version: 1.43
-Release: 3%{?dist}
+Version: 1.45.05
+Release: 1%{?dist}
Summary: Software speech synthesizer (text-to-speech)
Group: Applications/Multimedia
@@ -9,8 +9,7 @@ URL: http://espeak.sourceforge.net
Source0: http://kent.dl.sourceforge.net/sourceforge/espeak/espeak-%{version}-source.zip
Source1: espeak.1
Patch0: espeak-1.23-makefile_nostaticlibs.patch
-Patch1: espeak-1.40.02-gcc_no_libstdc++.patch
-Patch2: espeak-1.42.04-runtime-detection.patch
+Patch2: espeak-1.45.05-runtime-detection.patch
Patch3: espeak-1.43-ftbs_ld_libm.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,7 +42,6 @@ Development files for eSpeak, a software speech synthesizer.
%prep
%setup -q -n espeak-%{version}-source
%patch0 -p1 -b .nostaticlibs
-%patch1 -p1 -b .gcc_no_libstdc++
%patch2 -p1 -b .runtime-detection
%patch3 -p1 -b .ftbs_ld_libm
@@ -94,7 +92,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc $RPM_BUILD_DIR/espeak-%{version}-source/ReadMe $RPM_BUILD_DIR/espeak-%{version}-source/ChangeLog $RPM_BUILD_DIR/espeak-%{version}-source/License.txt $RPM_BUILD_DIR/espeak-%{version}-source/html/
+%doc $RPM_BUILD_DIR/espeak-%{version}-source/ReadMe $RPM_BUILD_DIR/espeak-%{version}-source/ChangeLog.txt $RPM_BUILD_DIR/espeak-%{version}-source/License.txt $RPM_BUILD_DIR/espeak-%{version}-source/html/
%{_mandir}/man1/espeak.1.gz
%{_bindir}/espeak
%{_datadir}/espeak-data
@@ -108,6 +106,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Sep 15 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 1.45.05-1
+- New version
+- Updated runtime_detection patch
+- Dropped gcc_no_libstdc++ patch
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.43-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list