rpms/espeak/devel .cvsignore, 1.13, 1.14 espeak.spec, 1.13, 1.14 sources, 1.13, 1.14 espeakedit-1.31-espeak_data_path.patch, 1.1, NONE espeakedit-1.31-makefile_rpmoptflags_wxversion.patch, 1.1, NONE

[Francois Aucamp (faucamp)]

Author: faucamp

Update of /cvs/pkgs/rpms/espeak/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2055

Modified Files:
	.cvsignore espeak.spec sources 
Removed Files:
	espeakedit-1.31-espeak_data_path.patch 
	espeakedit-1.31-makefile_rpmoptflags_wxversion.patch 
Log Message:
- Removed espeakedit (and associated patches) from package until all phoneme
  table compilation functions can be moved into espeak (or a separate
  commandline app without wxGTK dependencies)
- Voices are still compiled from source, but using pre-compiled phoneme table
  from upstream until the above issue is resolved



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	24 Jan 2008 15:18:01 -0000	1.13
+++ .cvsignore	25 Jan 2008 10:29:17 -0000	1.14
@@ -1,2 +1 @@
 espeak-1.31-source.zip
-espeakedit-1.31.zip


Index: espeak.spec
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/devel/espeak.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- espeak.spec	24 Jan 2008 15:18:01 -0000	1.13
+++ espeak.spec	25 Jan 2008 10:29:17 -0000	1.14
@@ -1,20 +1,13 @@
 Name:           espeak
 Version:        1.31
-Release:        1%{?dist}
+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
-# espeakedit is a GUI for creating voices for espeak.
-# However, this archive also contains the sources for the otherwise
-# binary-only phoneme tables bundled with the espeak archive, as well as the
-# compiler needed to build them.
-Source1:        http://kent.dl.sourceforge.net/sourceforge/espeak/espeakedit-%{version}.zip
 Patch0:         espeak-1.23-makefile_nostaticlibs.patch
-Patch10:        espeakedit-1.31-makefile_rpmoptflags_wxversion.patch
-Patch11:        espeakedit-1.31-espeak_data_path.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  portaudio-devel wxGTK-devel
@@ -55,45 +48,17 @@
     # F8 uses portaudio v19 - compile against that (see ReadMe)
     cp -f src/portaudio19.h src/portaudio.h
 %endif
-# Don't use the binary voice dictionaries; we compile these from source
+# Don't use the included binary voice dictionaries; we compile these from source
 rm -f espeak-data/*_dict
-# Don't use the binary phoneme tables; we compile these from espeakedit's source
-rm -f espeak-data/phon*
-
-%setup -q -T -b 1 -n espeakedit-%{version}
-%patch10 -p1 -b .rpmoptflags_wxversion
-%patch11 -p1 -b .espeak_data_path
-%if 0%{?fedora} >= 8
-    # F8 uses portaudio v19 - compile against that (see ReadMe)
-    cp -f src/portaudio19.h src/portaudio.h
-%endif
-# Copy TTS voice phoneme sources into espeak's espeak-data dir
-# (so we can compile the master phoneme tables with espeakedit)
-cp -rf phsource $RPM_BUILD_DIR/espeak-%{version}-source/espeak-data
 
 
 %build
-# Compile espeakedit (we need this to build the TTS voices for espeak)
-cd $RPM_BUILD_DIR/espeakedit-%{version}/src
-make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
-
-# Compile the phonemes sources for TTS voices for espeak
-# - for this to work, we need to set the ESPEAK_DATA_PATH environment variable
-# to our local source dir so that espeakedit can find the phoneme sources
-# as well as its destination dir
-export ESPEAK_DATA_PATH=$RPM_BUILD_DIR/espeak-%{version}-source
-export DISPLAY=:0 # Needed for GTK
-./espeakedit --compile
-# Remove the phonemes sources from espeak's dir tree
-rm -rf $RPM_BUILD_DIR/espeak-%{version}-source/espeak-data/phsource
-
 # Compile espeak
-cd $RPM_BUILD_DIR/espeak-%{version}-source/src
+cd src
 make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS"
 
-# Compile the TTS voice dictionaries using the phoneme tables we built using espeakedit
+# Compile the TTS voice dictionaries
 cd ../dictsource
-#for voice in $(ls *_*s* | cut -f 1 -d _ | uniq); do \
 for voice in $(../src/speak --voices | awk '{print $2}{print $5}' | egrep -v Language\|File\|/ | uniq); do \
     ../src/speak --compile=$voice; \
 done
@@ -130,6 +95,13 @@
 
 
 %changelog
+* Fri Jan 25 2008 Francois Aucamp <faucamp at fedoraproject.org> - 1.31-2
+- Removed espeakedit (and associated patches) from package until all phoneme
+  table compilation functions can be moved into espeak (or a separate
+  commandline app without wxGTK dependencies)
+- Voices are still compiled from source, but using pre-compiled phoneme table
+  from upstream until the above issue is resolved
+
 * Thu Jan 24 2008 Francois Aucamp <faucamp at fedoraproject.org> - 1.31-1
 - Update to version 1.31
 - Compile phoneme tables and voice dictionaries from source instead of


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/espeak/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	24 Jan 2008 15:18:01 -0000	1.13
+++ sources	25 Jan 2008 10:29:17 -0000	1.14
@@ -1,2 +1 @@
 e11f04354af42677729b0f22ce891d71  espeak-1.31-source.zip
-7ef9894e17db6beee48b8967a431feb4  espeakedit-1.31.zip


--- espeakedit-1.31-espeak_data_path.patch DELETED ---


--- espeakedit-1.31-makefile_rpmoptflags_wxversion.patch DELETED ---