rpms/espeak/F-11 espeak-1.40.02-pulseaudio.patch, NONE, 1.1 espeak.spec, 1.21, 1.22

[Francois Aucamp]

Author: faucamp

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

Modified Files:
	espeak.spec 
Added Files:
	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-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: espeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/F-11/espeak.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- espeak.spec	30 Jun 2009 10:07:53 -0000	1.21
+++ espeak.spec	30 Jun 2009 10:46:24 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           espeak
 Version:        1.40.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Software speech synthesizer (text-to-speech)
 
 Group:          Applications/Multimedia
@@ -10,9 +10,10 @@ Source0:        http://kent.dl.sourcefor
 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
@@ -42,15 +43,12 @@ Development files for eSpeak, a software
 %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
 
@@ -102,6 +100,9 @@ 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)