From 5777a2b7f7e87aa6d0cd42d99b9a954127a3f9cd Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 20 Apr 2019 18:52:27 +0200 Subject: [PATCH] - updated to 2.1 - updated link patch - removed obsolete DESTDIR patch --- flite-DESTDIR.patch | 40 ---------------------------------------- flite-link.patch | 26 +++++++++++++++----------- flite.spec | 28 +++++++++++++++++++++------- 3 files changed, 36 insertions(+), 58 deletions(-) delete mode 100644 flite-DESTDIR.patch diff --git a/flite-DESTDIR.patch b/flite-DESTDIR.patch deleted file mode 100644 index ccff894..0000000 --- a/flite-DESTDIR.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- 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 -- mkdir -p $(INSTALLBINDIR) -- mkdir -p $(INSTALLLIBDIR) -- mkdir -p $(INSTALLINCDIR) -- $(INSTALL) -m 644 include/*.h $(INSTALLINCDIR) -+ mkdir -p $(DESTDIR)$(INSTALLBINDIR) -+ mkdir -p $(DESTDIR)$(INSTALLLIBDIR) -+ mkdir -p $(DESTDIR)$(INSTALLINCDIR) -+ $(INSTALL) -m 644 include/*.h $(DESTDIR)$(INSTALLINCDIR) - @ $(MAKE) -C main --no-print-directory install - - 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-link.patch b/flite-link.patch index fc9485f..b84b2a1 100644 --- a/flite-link.patch +++ b/flite-link.patch @@ -1,6 +1,6 @@ --- 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 @@ +@@ -68,8 +68,22 @@ FLITELIBS = $(BUILDDIR)/lib/libflite.a FLITELIBFLAGS = -L$(BUILDDIR)/lib -lflite @@ -10,6 +10,10 @@ +libflite_LDLIBS = $(AUDIOLIBS) -lm +libflite_cmulex_LDLIBS = -lflite +libflite_usenglish_LDLIBS = -lflite ++libflite_cmu_grapheme_lang_LDLIBS = -lflite ++libflite_cmu_grapheme_lex_LDLIBS = -lflite ++libflite_cmu_indic_lang_LDLIBS = -lflite_cmulex -lflite_usenglish -lflite ++libflite_cmu_indic_lex_LDLIBS = -lflite_cmu_indic_lang -lflite_cmulex -lflite_usenglish -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 @@ -63,19 +67,19 @@ flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.a) 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= +--- flite-2.1-release/Makefile.orig 2017-12-25 16:13:21.000000000 +0100 ++++ flite-2.1-release/Makefile 2019-04-20 09:16:48.529713034 +0200 +@@ -46,7 +46,7 @@ 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 + ALL_DIRS=config $(BUILD_DIRS) testsuite \ + wince windows android \ +- sapi tools main ++ sapi 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 \ + OLD_WINDOWS = Exports.def flite.sln fliteDll.vcproj +@@ -56,7 +56,7 @@ + config.cache config.log config.status \ config/config config/system.mak FileList -HOST_ONLY_DIRS = tools main diff --git a/flite.spec b/flite.spec index 63b67dc..1ba97e9 100644 --- a/flite.spec +++ b/flite.spec @@ -9,12 +9,12 @@ 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.4 -Release: 2 +Version: 2.1 +Release: 1 License: Custom, see COPYING Group: Applications/Sound -Source0: http://www.speech.cs.cmu.edu/flite/packed/flite-1.4/%{name}-%{version}-release.tar.bz2 -# Source0-md5: b7c3523b3bbc6f29ce61e6650cd9a428 +Source0: http://www.festvox.org/flite/packed/flite-2.1/%{name}-%{version}-release.tar.bz2 +# Source0-md5: 915ac91068fc962f4a0e8aa26164cc8a # ALT Linux patches: Patch0: %{name}-link.patch Patch1: %{name}-fix-readonly-assignments.patch @@ -22,7 +22,6 @@ Patch1: %{name}-fix-readonly-assignments.patch Patch2: %{name}-doc.patch Patch3: %{name}-version.patch # -Patch4: %{name}-DESTDIR.patch Patch5: %{name}-fix-audiodriver-setup.patch Patch6: texinfo5.patch URL: http://cmuflite.org/ @@ -95,7 +94,6 @@ Statyczna biblioteka flite - małego, szybkiego silnika syntezy mowy. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 @@ -128,7 +126,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc ACKNOWLEDGEMENTS COPYING README doc/html +%doc ACKNOWLEDGEMENTS COPYING README.md 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 @@ -140,6 +138,14 @@ rm -rf $RPM_BUILD_ROOT %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_grapheme_lang.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libflite_cmu_grapheme_lang.so.1 +%attr(755,root,root) %{_libdir}/libflite_cmu_grapheme_lex.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libflite_cmu_grapheme_lex.so.1 +%attr(755,root,root) %{_libdir}/libflite_cmu_indic_lang.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libflite_cmu_indic_lang.so.1 +%attr(755,root,root) %{_libdir}/libflite_cmu_indic_lex.so.*.* +%attr(755,root,root) %ghost %{_libdir}/libflite_cmu_indic_lex.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.*.* @@ -163,6 +169,10 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libflite.so +%attr(755,root,root) %{_libdir}/libflite_cmu_grapheme_lang.so +%attr(755,root,root) %{_libdir}/libflite_cmu_grapheme_lex.so +%attr(755,root,root) %{_libdir}/libflite_cmu_indic_lang.so +%attr(755,root,root) %{_libdir}/libflite_cmu_indic_lex.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 @@ -176,6 +186,10 @@ rm -rf $RPM_BUILD_ROOT %files static %defattr(644,root,root,755) %{_libdir}/libflite.a +%{_libdir}/libflite_cmu_grapheme_lang.a +%{_libdir}/libflite_cmu_grapheme_lex.a +%{_libdir}/libflite_cmu_indic_lang.a +%{_libdir}/libflite_cmu_indic_lex.a %{_libdir}/libflite_cmu_time_awb.a %{_libdir}/libflite_cmu_us_awb.a %{_libdir}/libflite_cmu_us_kal.a -- 2.44.0