[packages/flite] - updated to 1.4 - updated link,doc,DESTDIR patches - removed obsolete os_link patch - really use al
qboosh
qboosh at pld-linux.org
Sun Oct 7 10:00:40 CEST 2012
commit 75871bb9ce06da7eb302f95a823cd17768c4d163
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Oct 7 10:02:09 2012 +0200
- updated to 1.4
- updated link,doc,DESTDIR patches
- removed obsolete os_link patch
- really use alsa when linking with it
flite-DESTDIR.patch | 45 +++++++++++++++----------
flite-doc.patch | 26 ++++-----------
flite-link.patch | 94 ++++++++++++++++++++++++++++++++---------------------
flite-so_link.patch | 13 --------
flite.spec | 35 +++++++++++++++-----
5 files changed, 118 insertions(+), 95 deletions(-)
---
diff --git a/flite.spec b/flite.spec
index 627a1c6..868a3a6 100644
--- a/flite.spec
+++ b/flite.spec
@@ -2,16 +2,19 @@
# NOTE: - building is memory consuming (up to c.a. 537MB)
# TODO: - install manpages via makefile
#
+# Conditional build:
+%bcond_without alsa # ALSA audio driver (OSS otherwise)
+#
Summary: flite - a small, fast speech synthesis engine
Summary(pl.UTF-8): flite - mały, szybki silnik syntezy mowy
Summary(ru.UTF-8): flite - маленькое, быстрое средство для синтеза речи
Name: flite
-Version: 1.2
-Release: 3
+Version: 1.4
+Release: 1
License: Custom, see COPYING
Group: Applications/Sound
-Source0: http://www.speech.cs.cmu.edu/flite/packed/flite-1.2/%{name}-%{version}-release.tar.bz2
-# Source0-md5: 24c1576f5b3eb23ecedf4bebde96710f
+Source0: http://www.speech.cs.cmu.edu/flite/packed/flite-1.4/%{name}-%{version}-release.tar.bz2
+# Source0-md5: b7c3523b3bbc6f29ce61e6650cd9a428
# ALT Linux patches:
Patch0: %{name}-link.patch
Patch1: %{name}-fix-readonly-assignments.patch
@@ -21,11 +24,10 @@ Patch3: %{name}-version.patch
#
Patch4: %{name}-DESTDIR.patch
Patch5: %{name}-fix-audiodriver-setup.patch
-Patch6: %{name}-so_link.patch
URL: http://cmuflite.org/
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: alsa-lib-devel
+%{?with_alsa:BuildRequires: alsa-lib-devel}
BuildRequires: ed
BuildRequires: tetex
BuildRequires: texi2html
@@ -94,14 +96,13 @@ Statyczna biblioteka flite - małego, szybkiego silnika syntezy mowy.
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p0
%build
cp -f /usr/share/automake/config.sub .
%{__autoconf}
%configure \
- --with-audio=oss \
--enable-shared \
+ --with-audio=%{?with_alsa:alsa}%{!?with_alsa:oss} \
--with-vox=cmu_us_kal16
%{__make} -j1
@@ -127,16 +128,28 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc ACKNOWLEDGEMENTS COPYING README doc/html
%attr(755,root,root) %{_bindir}/flite
+%attr(755,root,root) %{_bindir}/flite_cmu_time_awb
+%attr(755,root,root) %{_bindir}/flite_cmu_us_awb
+%attr(755,root,root) %{_bindir}/flite_cmu_us_kal
+%attr(755,root,root) %{_bindir}/flite_cmu_us_kal16
+%attr(755,root,root) %{_bindir}/flite_cmu_us_rms
+%attr(755,root,root) %{_bindir}/flite_cmu_us_slt
%attr(755,root,root) %{_bindir}/flite_time
%attr(755,root,root) %{_bindir}/t2p
%attr(755,root,root) %{_libdir}/libflite.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libflite.so.1
%attr(755,root,root) %{_libdir}/libflite_cmu_time_awb.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libflite_cmu_time_awb.so.1
+%attr(755,root,root) %{_libdir}/libflite_cmu_us_awb.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libflite_cmu_us_awb.so.1
%attr(755,root,root) %{_libdir}/libflite_cmu_us_kal.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libflite_cmu_us_kal.so.1
%attr(755,root,root) %{_libdir}/libflite_cmu_us_kal16.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libflite_cmu_us_kal16.so.1
+%attr(755,root,root) %{_libdir}/libflite_cmu_us_rms.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libflite_cmu_us_rms.so.1
+%attr(755,root,root) %{_libdir}/libflite_cmu_us_slt.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libflite_cmu_us_slt.so.1
%attr(755,root,root) %{_libdir}/libflite_cmulex.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libflite_cmulex.so.1
%attr(755,root,root) %{_libdir}/libflite_usenglish.so.*.*
@@ -149,8 +162,11 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libflite.so
%attr(755,root,root) %{_libdir}/libflite_cmu_time_awb.so
+%attr(755,root,root) %{_libdir}/libflite_cmu_us_awb.so
%attr(755,root,root) %{_libdir}/libflite_cmu_us_kal.so
%attr(755,root,root) %{_libdir}/libflite_cmu_us_kal16.so
+%attr(755,root,root) %{_libdir}/libflite_cmu_us_rms.so
+%attr(755,root,root) %{_libdir}/libflite_cmu_us_slt.so
%attr(755,root,root) %{_libdir}/libflite_cmulex.so
%attr(755,root,root) %{_libdir}/libflite_usenglish.so
%{_includedir}/flite
@@ -159,7 +175,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%{_libdir}/libflite.a
%{_libdir}/libflite_cmu_time_awb.a
+%{_libdir}/libflite_cmu_us_awb.a
%{_libdir}/libflite_cmu_us_kal.a
%{_libdir}/libflite_cmu_us_kal16.a
+%{_libdir}/libflite_cmu_us_rms.a
+%{_libdir}/libflite_cmu_us_slt.a
%{_libdir}/libflite_cmulex.a
%{_libdir}/libflite_usenglish.a
diff --git a/flite-DESTDIR.patch b/flite-DESTDIR.patch
index 1499321..ccff894 100644
--- a/flite-DESTDIR.patch
+++ b/flite-DESTDIR.patch
@@ -1,14 +1,6 @@
---- flite-1.2-release/lib/Makefile.ark 2005-08-04 15:31:59.000000000 +0000
-+++ flite-1.2-release/lib/Makefile 2005-08-04 15:32:16.000000000 +0000
-@@ -61,4 +61,4 @@
- endif
-
- install:
-- @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -)
-+ @ tar cvf - $(ALL_LIBS) | ( cd $(DESTDIR)$(INSTALLLIBDIR) && tar xf -)
---- flite-1.2-release/Makefile.ark 2005-08-04 15:31:16.000000000 +0000
-+++ flite-1.2-release/Makefile 2005-08-04 15:31:57.000000000 +0000
-@@ -79,13 +79,13 @@
+--- flite-1.4-release/Makefile.orig 2012-10-06 12:50:46.580667756 +0200
++++ flite-1.4-release/Makefile 2012-10-06 13:54:32.223921351 +0200
+@@ -106,10 +106,10 @@
install:
@echo Installing
@@ -16,16 +8,33 @@
- mkdir -p $(INSTALLLIBDIR)
- mkdir -p $(INSTALLINCDIR)
- $(INSTALL) -m 644 include/*.h $(INSTALLINCDIR)
-- @ $(MAKE) -C lib --no-print-directory install
-- $(INSTALL) -m 755 bin/flite $(INSTALLBINDIR)
-- $(INSTALL) -m 755 bin/flite_time $(INSTALLBINDIR)
+ mkdir -p $(DESTDIR)$(INSTALLBINDIR)
+ mkdir -p $(DESTDIR)$(INSTALLLIBDIR)
+ mkdir -p $(DESTDIR)$(INSTALLINCDIR)
+ $(INSTALL) -m 644 include/*.h $(DESTDIR)$(INSTALLINCDIR)
-+ @ $(MAKE) -C lib --no-print-directory install DESTDIR="$(DESTDIR)"
-+ $(INSTALL) -m 755 bin/flite $(DESTDIR)$(INSTALLBINDIR)
-+ $(INSTALL) -m 755 bin/flite_time $(DESTDIR)$(INSTALLBINDIR)
+ @ $(MAKE) -C main --no-print-directory install
time-stamp :
- @ echo $(PROJECT_NAME) >.time-stamp
+--- flite-1.4-release/main/Makefile.orig 2009-08-14 23:11:07.000000000 +0200
++++ flite-1.4-release/main/Makefile 2012-10-06 14:50:38.057184532 +0200
+@@ -111,15 +111,15 @@
+
+ install:
+ # The basic binaries
+- @ $(INSTALL) -m 755 $(BINDIR)/flite $(INSTALLBINDIR)
++ @ $(INSTALL) -m 755 $(BINDIR)/flite $(DESTDIR)$(INSTALLBINDIR)
+ @ for i in $(VOICES) ; \
+ do \
+- $(INSTALL) $(BINDIR)/flite_$$i $(INSTALLBINDIR); \
++ $(INSTALL) $(BINDIR)/flite_$$i $(DESTDIR)$(INSTALLBINDIR); \
+ done
+- $(INSTALL) -m 755 $(BINDIR)/flite_time $(INSTALLBINDIR)
++ $(INSTALL) -m 755 $(BINDIR)/flite_time $(DESTDIR)$(INSTALLBINDIR)
+ # The libraries: static and shared (if built)
+- cp -pd $(flite_LIBS_deps) $(INSTALLLIBDIR)
++ cp -pd $(flite_LIBS_deps) $(DESTDIR)$(INSTALLLIBDIR)
+ ifdef SHFLAGS
+- cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(INSTALLLIBDIR)
++ cp -pd $(SHAREDLIBS) $(VERSIONSHAREDLIBS) $(DESTDIR)$(INSTALLLIBDIR)
+ endif
+
diff --git a/flite-doc.patch b/flite-doc.patch
index 15c71c5..37e5d44 100644
--- a/flite-doc.patch
+++ b/flite-doc.patch
@@ -1,19 +1,7 @@
---- flite-1.2-release.orig/doc/Makefile
-+++ flite-1.2-release/doc/Makefile
-@@ -52,7 +52,8 @@
- flite.html: flite.texi
- @ if [ ! -d html ] ; \
- then mkdir -p html ; fi
-- (cd html; texi2html -number -split_chapter ../flite.texi)
-+ (cd html; texi2html -number -split_chapter ../flite.texi; \
-+ mv flite/*.html .; rm -rf flite)
- @ for i in html/*.html ; \
- do \
- sed 's/<BODY>/<BODY bgcolor="#ffffff">/' $$i >ttt.html; \
---- flite-1.2-release.orig/doc/flite.texi
-+++ flite-1.2-release/doc/flite.texi
+--- flite-1.4-release/doc/flite.texi.orig 2009-12-29 17:19:14.000000000 +0100
++++ flite-1.4-release/doc/flite.texi 2012-10-06 12:47:11.377338909 +0200
@@ -16,6 +16,11 @@
- @set UPDATED 19th February 2003
+ @set UPDATED 4th January 2009
@ifinfo
+ at dircategory Miscellaneous:
@@ -24,7 +12,7 @@
This file documents @code{Flite}, a small, fast run-time speech
synthesis engine.
-@@ -510,7 +515,7 @@
+@@ -781,7 +786,7 @@
distribution, the example diphone voice is @code{cmu_us_kal}.
Here is a simple C program that uses the flite library
@@ -32,11 +20,11 @@
+ at verbatim
#include "flite.h"
- cst_voice *register_cmu_us_kal();
-@@ -532,7 +537,7 @@
+ register_cmu_us_kal();
+@@ -803,7 +808,7 @@
flite_file_to_speech(argv[1],v,"play");
- }
+ @}
- at end example
+ at end verbatim
Assuming the shell variable FLITEDIR is set to the flite directory
diff --git a/flite-link.patch b/flite-link.patch
index f62c29d..fc9485f 100644
--- a/flite-link.patch
+++ b/flite-link.patch
@@ -1,29 +1,33 @@
---- flite-1.2-release/config/common_make_rules..mk 2003-02-18 19:17:21 +0300
-+++ flite-1.2-release/config/common_make_rules 2006-04-10 01:13:53 +0400
-@@ -52,7 +52,14 @@
- LIBDIR=$(TOP)/lib
+--- flite-1.4-release/config/common_make_rules.orig 2012-10-06 19:43:00.376818894 +0200
++++ flite-1.4-release/config/common_make_rules 2012-10-06 19:47:19.680146823 +0200
+@@ -68,8 +68,18 @@
- FLITELIBS = $(TOP)/lib/libflite.a
--LDFLAGS += -L$(TOP)/lib -lflite -lm $(AUDIOLIBS) $(OTHERLIBS)
-+LDFLAGS += -L$(TOP)/lib -lflite $(OTHERLIBS)
-+
-+flite_LDLIBS = $(AUDIOLIBS) -lm
-+flite_cmulex_LDLIBS = -lflite
-+flite_usenglish_LDLIBS = -lflite
-+flite_cmu_us_kal_LDLIBS = -lflite_cmulex -lflite_usenglish
-+flite_cmu_us_kal16_LDLIBS = -lflite_cmulex -lflite_usenglish
-+flite_cmu_time_awb_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish
+ FLITELIBS = $(BUILDDIR)/lib/libflite.a
+ FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite
+-LDFLAGS += -lm $(AUDIOLIBS) $(OTHERLIBS)
++LDFLAGS += -lm $(OTHERLIBS)
++libflite_LDLIBS = $(AUDIOLIBS) -lm
++libflite_cmulex_LDLIBS = -lflite
++libflite_usenglish_LDLIBS = -lflite
++libflite_cmu_us_awb_LDLIBS = -lflite_cmulex -lflite_usenglish -lflite
++libflite_cmu_us_kal_LDLIBS = -lflite_cmulex -lflite_usenglish -lflite
++libflite_cmu_us_kal16_LDLIBS = -lflite_cmulex -lflite_usenglish -lflite
++libflite_cmu_us_rms_LDLIBS = -lflite_cmulex -lflite_usenglish -lflite
++libflite_cmu_us_slt_LDLIBS = -lflite_cmulex -lflite_usenglish -lflite
++libflite_cmu_time_awb_LDLIBS = -lflite -lflite_cmulex -lflite_usenglish -lflite
++
+ FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
ifdef SHFLAGS
SOOBJS = $(OBJS:.o=.os)
-@@ -88,7 +95,7 @@
+@@ -123,7 +133,7 @@
@ rm -rf shared_os && mkdir shared_os
- @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
+ @ rm -f $@ $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
@ (cd shared_os && ar x ../$<)
-- @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
-+ @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -Wl,-rpath-link -Wl,../ -L../ -o ../$@.${PROJECT_VERSION} *.os $($(@:lib%.so=%_LDLIBS)))
- @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
- @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
+- @ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
++ (cd shared_os && $(CC) -shared -Wl,-soname,`basename $@`.${PROJECT_SHLIB_VERSION} -Wl,-rpath-link=../$(dir $@) -L../$(dir $@) -o ../$@.${PROJECT_VERSION} *.os $($(patsubst %.so,%_LDLIBS,$(notdir $@))))
+ @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_VERSION}` `basename $@.${PROJECT_SHLIB_VERSION}` )
+ @ (cd $(LIBDIR) && ln -s `basename $@.${PROJECT_SHLIB_VERSION}` `basename $@` )
@ rm -rf shared_os
--- flite-1.2-release/doc/Makefile..mk 2002-12-30 15:57:30 +0300
+++ flite-1.2-release/doc/Makefile 2006-04-10 01:12:41 +0400
@@ -36,30 +40,46 @@
include $(TOP)/config/common_make_rules
---- flite-1.2-release/main/Makefile..mk 2003-02-20 01:17:31 +0300
-+++ flite-1.2-release/main/Makefile 2006-04-10 01:12:41 +0400
-@@ -49,11 +49,11 @@
- $(BINDIR)/t2p$(EXEEXT)
+--- flite-1.4-release/main/Makefile.orig 2012-10-06 19:43:00.376818894 +0200
++++ flite-1.4-release/main/Makefile 2012-10-06 19:49:58.660143508 +0200
+@@ -51,9 +51,9 @@
+ VOICES=$(VOXES)
+ VOICELIBS=$(VOICES:%=flite_%)
+
+-flite_LIBS = $(VOICELIBS) $(LANGS:%=flite_%) $(LEXES:%=flite_%) flite
++flite_LIBS = flite $(LEXES:%=flite_%) $(LANGS:%=flite_%) $(VOICELIBS)
- flite_LIBS = flite_$(FL_VOX) flite_$(FL_LANG) flite_$(FL_LEX)
-flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
-+flite_LIBS_flags = -L$(LIBDIR) -Wl,-rpath-link -Wl,$(LIBDIR) $(flite_LIBS:%=-l%)
++flite_LIBS_flags = -L$(LIBDIR) -Wl,-rpath-link=$(LIBDIR) $(flite_LIBS:%=-l%)
flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
- flite_time_LIBS = flite_cmu_time_awb flite_$(FL_LANG) flite_$(FL_LEX)
+ include $(TOP)/config/common_make_rules
+@@ -66,7 +66,7 @@
+ $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
+
+ flite_time_LIBS = flite_cmu_time_awb flite_usenglish flite_cmulex
-flite_time_LIBS_flags = -L$(LIBDIR) $(flite_time_LIBS:%=-l%)
-+flite_time_LIBS_flags = -L$(LIBDIR) -Wl,-rpath-link -Wl,$(LIBDIR) $(flite_time_LIBS:%=-l%)
++flite_time_LIBS_flags = -L$(LIBDIR) -Wl,-rpath-link=$(LIBDIR) $(flite_time_LIBS:%=-l%)
flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.a)
- include $(TOP)/config/common_make_rules
---- flite-1.2-release/Makefile..mk 2003-02-17 18:14:05 +0300
-+++ flite-1.2-release/Makefile 2006-04-10 01:15:02 +0400
-@@ -41,7 +41,7 @@
- ###########################################################################
+ LOCAL_CLEAN = $(BINDIR)/flite$(EXEEXT) $(BINDIR)/flite_time$(EXEEXT) \
+--- flite-1.4-release/Makefile.orig 2012-10-07 07:35:22.675928010 +0200
++++ flite-1.4-release/Makefile 2012-10-07 07:46:58.442580177 +0200
+@@ -43,7 +43,7 @@
TOP=.
- DIRNAME=.
--BUILD_DIRS = include src lang lib tools doc main
-+BUILD_DIRS = include src lang lib main doc
- ALL_DIRS=config $(BUILD_DIRS) testsuite sapi
+ DIRNAME=
+ BUILD_DIRS = include src lang doc
+-ALL_DIRS=config $(BUILD_DIRS) testsuite sapi palm wince windows tools main
++ALL_DIRS=config $(BUILD_DIRS) testsuite sapi palm wince windows main tools
CONFIG=configure configure.in config.sub config.guess \
missing install-sh mkinstalldirs
+ WINDOWS = Exports.def flite.sln fliteDll.vcproj
+@@ -51,7 +51,7 @@
+ DIST_CLEAN = config.cache config.log config.status \
+ config/config config/system.mak FileList
+
+-HOST_ONLY_DIRS = tools main
++HOST_ONLY_DIRS = main tools
+ ALL = $(BUILD_DIRS)
+
+ config_dummy := $(shell test -f config/config || ( echo '*** '; echo '*** Making default config file ***'; echo '*** '; ./configure; ) >&2)
diff --git a/flite-so_link.patch b/flite-so_link.patch
deleted file mode 100644
index cf00dac..0000000
--- a/flite-so_link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- config/common_make_rules 2007-06-30 17:12:51.704645463 +0200
-+++ config/common_make_rules-new 2007-06-30 17:13:34.736757907 +0200
-@@ -96,8 +96,8 @@
- @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
- @ (cd shared_os && ar x ../$<)
- @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -Wl,-rpath-link -Wl,../ -L../ -o ../$@.${PROJECT_VERSION} *.os $($(@:lib%.so=%_LDLIBS)))
-- @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
-- @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
-+ @ ln -s $@.${PROJECT_VERSION} $@.${PROJECT_SHLIB_VERSION}
-+ @ ln -s $@.${PROJECT_SHLIB_VERSION} $@
- @ rm -rf shared_os
-
- .make_build_dirs:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/flite.git/commitdiff/75871bb9ce06da7eb302f95a823cd17768c4d163
More information about the pld-cvs-commit
mailing list