rpms/espeak/F-11 espeak-1.40.02-gcc_no_libstdc++.patch, NONE, 1.1 espeak.1, NONE, 1.1 .cvsignore, 1.15, 1.16 espeak.spec, 1.20, 1.21 sources, 1.15, 1.16

Francois Aucamp faucamp at fedoraproject.org
Tue Jun 30 10:08:24 UTC 2009


Author: faucamp

Update of /cvs/pkgs/rpms/espeak/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1307

Modified Files:
	.cvsignore espeak.spec sources 
Added Files:
	espeak-1.40.02-gcc_no_libstdc++.patch espeak.1 
Log Message:
* Mon Jun 22 2009 Francois Aucamp <faucamp at fedoraproject.org> - 1.40.02-1
- Update to version 1.40.02
- Added patch to compile with GCC and not to link to libstdc++ (not needed)
- Added manpage (thanks goes to Luke Yelavich from Ubuntu for writing it)


espeak-1.40.02-gcc_no_libstdc++.patch:

--- NEW FILE espeak-1.40.02-gcc_no_libstdc++.patch ---
diff -uNr espeak-1.40.02-source/src/Makefile espeak-1.40.02-source-mod/src/Makefile
--- espeak-1.40.02-source/src/Makefile	2009-06-22 11:37:23.937814593 +0200
+++ espeak-1.40.02-source-mod/src/Makefile	2009-06-22 11:39:56.435041329 +0200
@@ -70,29 +70,29 @@
 OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
 LIBS3=-lstdc++ -L . -lespeak
 
-CXXFLAGS=-O2
+CFLAGS=-O2
 
 
 all: $(BIN_NAME) $(LIB_NAME) $(STATIC_LIB_NAME) $(BIN2_NAME)
 	mv $(LIB_NAME) $(LIB_NAME).$(LIBTAG)
 
 .cpp.o:
-	$(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions  $<
+	$(CC) $(CFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -pedantic -I. -c -fno-exceptions  $<
 
 $(BIN_NAME): $(OBJS1)
-	$(CXX) -o $@ $(OBJS1) $(LIBS1)
+	$(CC) -o $@ $(OBJS1) $(LIBS1)
 
 $(BIN2_NAME): $(OBJS3) $(LIB_NAME)
-	$(CXX) -o $@ $(OBJS3) $(LIBS3)
+	$(CC) -o $@ $(OBJS3) $(LIBS3)
 
 
 
 x_%.o: %.cpp
-	$(CXX) $(CXXFLAGS) $(USE_AUDIO) -Wall -fpic -fvisibility=hidden -pedantic \
+	$(CC) $(CFLAGS) $(USE_AUDIO) -Wall -fpic -fvisibility=hidden -pedantic \
 	-I. -D LIBRARY -c -fno-exceptions  $<  -o x_$*.o
 
 $(LIB_NAME): $(OBJS2)
-	$(CXX) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
+	$(CC) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
 
 $(STATIC_LIB_NAME): $(OBJS2)
 	$(AR) cqs $(STATIC_LIB_NAME) $(OBJS2)


--- NEW FILE espeak.1 ---
.\"                                      Hey, EMACS: -*- nroff -*-
.\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1)
.TH ESPEAK 1 "July 25, 2007"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
.\" .nh        disable hyphenation
.\" .hy        enable hyphenation
.\" .ad l      left justify
.\" .ad b      justify to both left and right margins
.\" .nf        disable filling
.\" .fi        enable filling
.\" .br        insert line break
.\" .sp <n>    insert n+1 empty lines
.\" for manpage-specific macros, see man(7)
.SH NAME
espeak \- A multi-lingual software speech synthesizer.
.SH SYNOPSIS
.B espeak
.RI [ options ]\ [ "<words>" ]
.SH DESCRIPTION
.B espeak
is a software speech synthesizer for English, and some other languages.
.SH OPTIONS
.TP
.B \-h
Show summary of options.
.TP
.B \-f <text file>
Text file to speak
.TP
.B \-\-stdin
Read text input from stdin instead of a file
.TP
If neither -f nor --stdin, <words> are spoken, or if none then text is spoken from stdin, each line separately.
.TP
.B \-q
Quiet, don't produce any speech (may be useful with -x)
.TP
.B \-a <integer>
Amplitude, 0 to 20, default is 10
.TP
.B \-l <integer>
Line length. If not zero (which is the default), consider
lines less than this length as and-of-clause
.TP
.B \-p <integer>
Pitch adjustment, 0 to 99, default is 50
.TP
.B -s <integer>
Speed in words per minute, default is 160
.TP
.B \-v <voice name>
Use voice file of this name from espeak-data/voices
.TP
.B -b
Input text is 8-bit encoding
.TP
.B -m
Indicates that the text contains SSML (Speech Synthesis Markup Language) tags or other XML tags. Those SSML tags which are supported are interpreted. Other tags, including HTML, are ignored, except that some HTML tags such as <hr> <h2> and <li> ensure a break in the speech.
.TP
.B \-w <wave file name>
Write output to this WAV file, rather than speaking it directly
.TP
.B \-x
Write phoneme mnemonics to stdout
.TP
.B \-X
Write phonemes mnemonics and translation trace to stdout. If rules files have been built with --compile=debug, line numbers will also be displayed.
.TP
.B \-\-stdout
Write speech output to stdout
.TP
.B \-\-compile=<voice name>
Compile the pronunciation rules and dictionary in the current directory. =<voice name> is optional and specifies which language
.TP
.B \-\-path=<path>
Specifies the directory containing the espeak-data directory
.TP
.B \-\-phonout=<filename>
Write output from -x -X commands and mbrola phoneme data to this file
.TP
.B \-\-punct="<characters>"
Speak the names of punctuation characters during speaking. If =<characters> is omitted, all punctuation is spoken.
.TP
.B \-k <integer>
Indicate capital letters with: 1=sound, 2=the word "capitals", higher values = a pitch increase (try -k20).
.TP
.B \-\-voices[=<language code>]
Lists the available voices. If =<language code> is present then only those voices which are suitable for that language are listed.
.TP
.B \-\-compile=voicename
Compile the pronunciation rules and dictionary in the current directory. =<voice name> is optional and specifies which language
.TP
.B \-\-compile=debug
Compile the pronunciation rules and dictionary in the current directory as above, but include line numbers, that get shown when -X is used.
.SH AUTHOR
eSpeak was written by Jonathan Duddington <jonsd at jsd.clara.co.uk>. The webpage for this package can be found at http://espeak.sourceforge.net/.
.PP
This manual page was written by Luke Yelavich <themuso at ubuntu.com>, for the Ubuntu project (but may be used by others).


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/F-11/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	21 Oct 2008 15:04:47 -0000	1.15
+++ .cvsignore	30 Jun 2009 10:07:53 -0000	1.16
@@ -1 +1 @@
-espeak-1.39-source.zip
+espeak-1.40.02-source.zip


Index: espeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/F-11/espeak.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- espeak.spec	24 Feb 2009 15:28:49 -0000	1.20
+++ espeak.spec	30 Jun 2009 10:07:53 -0000	1.21
@@ -1,13 +1,15 @@
 Name:           espeak
-Version:        1.39
-Release:        2%{?dist}
+Version:        1.40.02
+Release:        1%{?dist}
 Summary:        Software speech synthesizer (text-to-speech)
 
 Group:          Applications/Multimedia
 License:        GPLv3+
 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  portaudio-devel
@@ -39,6 +41,7 @@ Development files for eSpeak, a software
 %prep
 %setup -q -n espeak-%{version}-source
 %patch0 -p1 -b .nostaticlibs
+%patch1 -p1 -b .gcc_no_libstdc++
 # Fix file permissions
 find . -type f -exec chmod 0644 {} ";"
 # Prepare documentation
@@ -55,7 +58,7 @@ rm -f espeak-data/*_dict
 %build
 # Compile espeak
 cd src
-make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
 
 # Compile the TTS voice dictionaries
 export ESPEAK_DATA_PATH=$RPM_BUILD_DIR/espeak-%{version}-source
@@ -69,7 +72,9 @@ done
 rm -rf $RPM_BUILD_ROOT
 cd $RPM_BUILD_DIR/espeak-%{version}-source/src
 make install DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} INCDIR=%{_includedir}/espeak LIBDIR=%{_libdir}
-
+# Install manpage
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+cp -pf %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man1/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -84,6 +89,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/
+%{_mandir}/man1/espeak.1.gz
 %{_bindir}/espeak
 %{_datadir}/espeak-data
 %{_libdir}/libespeak.so.*
@@ -96,6 +102,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 22 2009 Francois Aucamp <faucamp at fedoraproject.org> - 1.40.02-1
+- Update to version 1.40.02
+- Added patch to compile with GCC and not to link to libstdc++ (not needed)
+- Added manpage (thanks goes to Luke Yelavich from Ubuntu for writing it)
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.39-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- sources	21 Oct 2008 15:04:47 -0000	1.15
+++ sources	30 Jun 2009 10:07:53 -0000	1.16
@@ -1 +1 @@
-7cda8008ebb4d8f1311de4b5a544261e  espeak-1.39-source.zip
+708954b44c526e8174df8b88a6382738  espeak-1.40.02-source.zip




More information about the fedora-extras-commits mailing list