rpms/espeak/F-10 espeak-1.40.02-gcc_no_libstdc++.patch, NONE, 1.1 espeak-1.40.02-pulseaudio.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 espeak.spec, 1.19, 1.20 sources, 1.15, 1.16

Francois Aucamp faucamp at fedoraproject.org
Tue Jun 30 10:57:17 UTC 2009


Author: faucamp

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

Modified Files:
	.cvsignore espeak.spec sources 
Added Files:
	espeak-1.40.02-gcc_no_libstdc++.patch 
	espeak-1.40.02-pulseaudio.patch 
Log Message:
* Tue Jun 30 2009 Francois Aucamp <faucamp at fedoraproject.org> - 1.40.02-2
- Compile against pulseaudio instead of portaudio (RHBZ #481651)


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)

espeak-1.40.02-pulseaudio.patch:

--- NEW FILE espeak-1.40.02-pulseaudio.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	2008-12-23 00:37:41.000000000 +0200
+++ espeak-1.40.02-source-mod/src/Makefile	2009-06-30 12:29:32.414693347 +0200
@@ -24,8 +24,8 @@
 LN_SF = /bin/ln -sf
 MKDIR = mkdir -p
 
-AUDIO = portaudio
-#AUDIO = pulseaudio
+#AUDIO = portaudio
+AUDIO = pulseaudio
 #AUDIO = sada
 
 ifeq ($(AUDIO),pulseaudio)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/F-10/.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:56:47 -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-10/espeak.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- espeak.spec	21 Oct 2008 15:04:47 -0000	1.19
+++ espeak.spec	30 Jun 2009 10:56:47 -0000	1.20
@@ -1,16 +1,19 @@
 Name:           espeak
-Version:        1.39
-Release:        1%{?dist}
+Version:        1.40.02
+Release:        2%{?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
+Patch2:         espeak-1.40.02-pulseaudio.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  portaudio-devel
+BuildRequires:  pulseaudio-libs-devel
 
 
 %description
@@ -39,15 +42,13 @@ Development files for eSpeak, a software
 %prep
 %setup -q -n espeak-%{version}-source
 %patch0 -p1 -b .nostaticlibs
+%patch1 -p1 -b .gcc_no_libstdc++
+%patch2 -p1 -b .pulseaudio
 # Fix file permissions
 find . -type f -exec chmod 0644 {} ";"
 # Prepare documentation
 mv docs html
 sed -i 's/\r//' License.txt
-%if 0%{?fedora} >= 8
-    # F8 uses portaudio v19 - compile against that (see ReadMe)
-    cp -f src/portaudio19.h src/portaudio.h
-%endif
 # Don't use the included binary voice dictionaries; we compile these from source
 rm -f espeak-data/*_dict
 
@@ -55,7 +56,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 +70,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 +87,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 +100,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 30 2009 Francois Aucamp <faucamp at fedoraproject.org> - 1.40.02-2
+- Compile against pulseaudio instead of portaudio (RHBZ #481651)
+
+* 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
+
 * Tue Oct 21 2008 Francois Aucamp <faucamp at fedoraproject.org> - 1.39-1
 - Update to version 1.39
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/F-10/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:56:47 -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