--- a/ChangeLog Wed Aug 20 14:40:15 2008 +0000
+++ b/ChangeLog Wed Aug 20 15:35:15 2008 +0000
@@ -1,3 +1,10 @@
+2008-08-20 Willie Walker <[email protected]>
+
+ * patches/espeak-01-makefile.diff: new file for SUNWespeak
+ copyright/SUNWespeak.copyright: new file for SUNWespeak
+ SUNWespeak.spec: new file - migrate from spec-files-extra
+ SUNWgnome-a11y-speech.spec: use SUNWespeak instead of SFEespeak
+
2008-08-20 Henry Zhang <[email protected]>
* base-specs/libgtop.spec,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/SUNWespeak.spec Wed Aug 20 15:35:15 2008 +0000
@@ -0,0 +1,61 @@
+%include Solaris.inc
+
+%define src_name espeak
+%define src_url http://downloads.sourceforge.net/%{src_name}
+
+Name: SUNWespeak
+Summary: eSpeak - compact open source software speech synthesizer
+Version: 1.37
+Source: %{src_url}/%{src_name}-%{version}-source.zip
+Patch1: espeak-01-makefile.diff
+SUNW_BaseDir: %{_basedir}
+SUNW_Copyright: %{name}.copyright
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%include default-depend.inc
+
+%package devel
+Summary: %{summary} - development files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %name
+
+%prep
+%setup -q -n %{src_name}-%{version}-source
+%patch1 -p1
+
+%build
+CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
+if test "x$CPUS" = "x" -o $CPUS = 0; then
+ CPUS=1
+fi
+cd src
+make -j$CPUS EXTRA_LIBS=-lm AUDIO=sada
+make install EXTRA_LIBS=-lm AUDIO=sada DESTDIR=$RPM_BUILD_ROOT
+rm $RPM_BUILD_ROOT/%{_libdir}/lib*.a
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr (-, root, bin)
+%dir %attr (0755, root, bin) %{_bindir}
+%{_bindir}/*
+%dir %attr (0755, root, bin) %{_libdir}
+%{_libdir}/lib*.so*
+%dir %attr (0755, root, sys) %{_datadir}
+%{_datadir}/*
+
+%files devel
+%defattr (-, root, bin)
+%{_includedir}
+
+%changelog
+* Wed Aug 20 2008 - Willie Walker
+- Migrate to JDS (SFEespeak.spec to SUNWespeak.spec)
+* Tue Aug 12 2008 - Willie Walker
+- Port to SunStudio (thanks Brian Cameron!)
+* Tue Apr 15 2008 - Willie Walker
+- Upgrade to version 1.37 which contains direct SADA support and eliminates
+ all PulseAudio and other dependencies.
+* Tue Jan 29 2008 - Willie Walker
+- Initial spec
--- a/SUNWgnome-a11y-speech.spec Wed Aug 20 14:40:15 2008 +0000
+++ b/SUNWgnome-a11y-speech.spec Wed Aug 20 15:35:15 2008 +0000
@@ -12,7 +12,7 @@
%include Solaris.inc
%define build_dectalk %(test -f /usr/bin/say && echo 1 || echo 0)
-%define build_espeak %(pkginfo -q SFEespeak && echo 1 || echo 0)
+%define build_espeak %(pkginfo -q SUNWespeak && echo 1 || echo 0)
%define build_swift %(test -d /opt/swift && echo 1 || echo 0)
%use gnome_speech = gnome-speech.spec
@@ -56,9 +56,9 @@
%package espeak
Summary: %{summary} - eSpeak Synthesis Driver
SUNW_BaseDir: %{_basedir}
-Requires: SFEespeak
+Requires: SUNWespeak
Requires: SUNWgnome-a11y-speech
-BuildRequires: SFEespeak-devel
+BuildRequires: SUNWespeak-devel
%include default-depend.inc
%endif
@@ -183,6 +183,8 @@
%{_libdir}/pkgconfig/*
%changelog
+* Wed Aug 20 2008 - [email protected]
+- Migrate SFEespeak.spec to SUNWespeak.spec
* Tue Aug 05 2008 - [email protected]
- Add manpages.
* Thu Apr 21 2008 - [email protected]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/copyright/SUNWespeak.copyright Wed Aug 20 15:35:15 2008 +0000
@@ -0,0 +1,43 @@
+Copyright (C) 2005 to 2007 by Jonathan Duddington
+Copyright (C) 2007 Gilles Casse <[email protected]>
+Copyright (C) 2008 Sun Microsystems, Inc.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, see: <http://www.gnu.org/licenses/>.
+
+--------------------------------------------------------------------
+
+Copyright (c) 1999-2000 Ross Bencina and Phil Burk
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files
+(the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+Any person wishing to distribute modifications to the Software is
+requested to send the modifications to the original developer so that
+they can be incorporated into the canonical version.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/espeak-01-makefile.diff Wed Aug 20 15:35:15 2008 +0000
@@ -0,0 +1,39 @@
+--- espeak-1.37-source/src/Makefile-orig 2008-08-08 20:04:39.001556000 -0500
++++ espeak-1.37-source/src/Makefile 2008-08-08 20:04:42.246443000 -0500
+@@ -15,7 +15,7 @@ LIB_VERSION = 1
+ LIBTAG = $(LIB_VERSION).$(RELEASE)
+
+ # Use SONAME_OPT=-Wl,h, on Solaris
+-SONAME_OPT=-Wl,-soname,
++SONAME_OPT=-h
+
+ # Use EXTRA_LIBS=-lm on Solaris
+ EXTRA_LIBS =
+@@ -60,15 +60,15 @@ libespeak_SOURCES = speak_lib.cpp compil
+
+ SRCS1=$(speak_SOURCES)
+ OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
+-LIBS1=-lstdc++ $(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
++LIBS1=$(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
+
+ SRCS2=$(libespeak_SOURCES)
+ OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
+-LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread
++LIBS2=$(LIB_AUDIO) -lpthread
+
+ SRCS3 = espeak.cpp
+ OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
+-LIBS3=-lstdc++ -L . -lespeak
++LIBS3=-L . -lespeak
+
+ CXXFLAGS=-O2
+
+@@ -92,7 +92,7 @@ x_%.o: %.cpp
+ -I. -D LIBRARY -c -fno-exceptions $< -o x_$*.o
+
+ $(LIB_NAME): $(OBJS2)
+- $(CXX) -shared $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
++ $(CXX) -G $(SONAME_OPT)$(LIB_NAME).$(LIB_VERSION) -o $@ $(OBJS2) $(LIBS2)
+
+ $(STATIC_LIB_NAME): $(OBJS2)
+ $(AR) cqs $(STATIC_LIB_NAME) $(OBJS2)