UPDATE: audio/flite

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

UPDATE: audio/flite

Deanna Phillips-3
This updates audio/flite to 1.3, which provides speed
improvements, bugfixes and a higher quality default voice.

Tested on i386 and amd64, more testing and ok's appreciated.

'flite doc/alice' to test text-to-speech.

'flite doc/alice /tmp/alice.wav' to test tts->audio file
conversion.

Thanks.

Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/flite/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 28 Dec 2006 11:47:23 -0000 1.8
+++ Makefile 13 Jan 2007 17:57:49 -0000
@@ -6,15 +6,15 @@ COMMENT= "text to speech utility"
 BROKEN= "gcc hang compiling cmu_us_kal_diphone.c"
 .endif
 
-VERSION= 1.2
+VERSION= 1.3
 DISTNAME= flite-${VERSION}-release
-PKGNAME= flite-${VERSION}p1
-SHARED_LIBS= flite 1.2 \
- flite_cmu_time_awb 1.2 \
- flite_cmu_us_kal 1.2 \
- flite_cmu_us_kal16 1.2 \
- flite_cmulex 1.2 \
- flite_usenglish 1.2
+PKGNAME= flite-${VERSION}
+SHARED_LIBS= flite 1.3 \
+ flite_cmu_time_awb 1.3 \
+ flite_cmu_us_kal 1.3 \
+ flite_cmu_us_kal16 1.3 \
+ flite_cmulex 1.3 \
+ flite_usenglish 1.3
 
 MAKE_FLAGS= LIBlibflite.so_VERSION=${LIBflite_VERSION} \
  LIBlibflite_cmu_time_awb.so_VERSION=${LIBflite_cmu_time_awb_VERSION} \
@@ -39,7 +39,7 @@ WANTLIB= c m
 MASTER_SITES= http://www.speech.cs.cmu.edu/flite/packed/flite-${VERSION}/
 
 CONFIGURE_STYLE= gnu dest
-CONFIGURE_ARGS= ${CONFIGURE_SHARED}
+CONFIGURE_ARGS= ${CONFIGURE_SHARED} --with-vox=cmu_us_kal16
 
 USE_GMAKE= Yes
 NO_REGRESS= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/flite/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 5 Jan 2005 15:47:06 -0000 1.2
+++ distinfo 13 Jan 2007 17:57:49 -0000
@@ -1,4 +1,4 @@
-MD5 (flite-1.2-release.tar.gz) = 359e6a36c1b4789c099a23c731c27ca9
-RMD160 (flite-1.2-release.tar.gz) = 923b7e2781d086b1ed9cf660074157dddd6f4f56
-SHA1 (flite-1.2-release.tar.gz) = 64f85b5c4e77034fdfe41e11231c34171db7c3a0
-SIZE (flite-1.2-release.tar.gz) = 11815669
+MD5 (flite-1.3-release.tar.gz) = ae0aca1cb7b4801f4372f3a75a9e52b5
+RMD160 (flite-1.3-release.tar.gz) = a908acfd196754783ee4665ac84ea860d54bcf80
+SHA1 (flite-1.3-release.tar.gz) = 233144a772de72741ae1aa2292f672c30224afb3
+SIZE (flite-1.3-release.tar.gz) = 10663835
Index: patches/patch-Makefile
===================================================================
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile 13 Jan 2007 17:57:49 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.orig Tue Jan  2 11:07:48 2007
++++ Makefile Tue Jan  2 11:08:12 2007
+@@ -41,7 +41,7 @@
+ ###########################################################################
+ TOP=.
+ DIRNAME=
+-BUILD_DIRS = include src lang doc
++BUILD_DIRS = include src lang lib doc
+ ALL_DIRS=config $(BUILD_DIRS) testsuite sapi palm tools main
+ CONFIG=configure configure.in config.sub config.guess \
+        missing install-sh mkinstalldirs
Index: patches/patch-config_common_make_rules
===================================================================
RCS file: /cvs/ports/audio/flite/patches/patch-config_common_make_rules,v
retrieving revision 1.2
diff -u -p -r1.2 patch-config_common_make_rules
--- patches/patch-config_common_make_rules 24 Dec 2005 16:01:55 -0000 1.2
+++ patches/patch-config_common_make_rules 13 Jan 2007 17:57:49 -0000
@@ -1,18 +1,63 @@
-$OpenBSD: patch-config_common_make_rules,v 1.2 2005/12/24 16:01:55 espie Exp $
---- config/common_make_rules.orig Tue Feb 18 17:17:21 2003
-+++ config/common_make_rules Sat Dec 24 16:54:14 2005
-@@ -86,11 +86,10 @@ nothing:
- %.so: %.shared.a
+$OpenBSD$
+--- config/common_make_rules.orig Sun Dec 19 17:20:43 2004
++++ config/common_make_rules Tue Jan  2 13:34:55 2007
+@@ -59,27 +59,34 @@ BUILDDIR=$(TOP)/build/$(TARGET_PLATFORM)
+ endif
+ OBJDIR=$(BUILDDIR)/obj/$(DIRNAME)
+ BINDIR=$(BUILDDIR)/bin
++LIBDIR=$(BUILDDIR)/lib
+ ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
+ BINDIR=$(TOP)/bin
++LIBDIR=$(TOP)/lib
+ endif
+
+-LIBDIR=$(BUILDDIR)/lib
+ BUILDDIRS=$(OBJDIR) $(BINDIR) $(LIBDIR)
+
+-FLITELIBS = $(BUILDDIR)/lib/libflite.a
+-LDFLAGS += -L$(BUILDDIR)/lib -lflite -lm $(AUDIOLIBS) $(OTHERLIBS)
++ifdef SHFLAGS
++FLITELIBS = $(LIBDIR)/libflite.so $(LIBDIR)/libflite.a
++else
++FLITELIBS = $(LIBDIR)/libflite.a
++endif
++LDFLAGS += -L$(LIBDIR) -lflite -lm $(AUDIOLIBS) $(OTHERLIBS)
+
+ FULLOBJS = $(OBJS:%=$(OBJDIR)/%)
+ ifdef SHFLAGS
+ SOOBJS = $(OBJS:.o=.os)
+-FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%)
++FULLSOOBJS = $(SOOBJS:%=$(OBJDIR)/%)
+ ifdef LIBNAME
+ ALL += $(OBJDIR)/.build_so
++ALL += $(OBJDIR)/.build_lib
+ endif
+-endif
++else
+ ifdef LIBNAME
+ ALL += $(OBJDIR)/.build_lib
+ endif
++endif
+ # Only do some directories when you are not cross compiling
+ ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
+ OTHER_BUILD_DIRS = $(HOST_ONLY_DIRS)
+@@ -117,14 +124,14 @@ $(OBJDIR)/.build_so: $(FULLSOOBJS)
+ @ touch $(OBJDIR)/.build_so
+
+ # Used in the lib/ directory and in building new voices
+-$(OBJDIR)/%.so: %.shared.a
++%.so: %.shared.a
  @ echo making $@
  @ rm -rf shared_os && mkdir shared_os
 - @ rm -f $@ $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
-+ @ rm -f $@ $(LIBDIR)/$@.${LIB$@_VERSION}
++ @ rm -f $@ $@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
  @ (cd shared_os && ar x ../$<)
 - @ (cd shared_os && $(CC) -shared -Wl,-soname,$@.${PROJECT_SHLIB_VERSION} -o ../$@.${PROJECT_VERSION} *.os)
 - @ ln -s $(LIBDIR)/$@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
 - @ ln -s $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
-+ @ (cd shared_os && $(CC) -shared -o ../$@.${LIB$@_VERSION} *.os)
-+ @ ln -s $(LIBDIR)/$@.${LIB$@_VERSION} $(LIBDIR)/$@
++ @ (cd shared_os && $(CC) -shared -o ../$@.${PROJECT_VERSION} *.os)
++ @ ln -s $@.${PROJECT_VERSION} $(LIBDIR)/$@.${PROJECT_SHLIB_VERSION}
++ @ ln -s $@.${PROJECT_SHLIB_VERSION} $(LIBDIR)/$@
  @ rm -rf shared_os
 
- .make_build_dirs:
+ $(OBJDIR)/.make_build_dirs:
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/audio/flite/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- patches/patch-configure 23 Apr 2003 05:33:19 -0000 1.1.1.1
+++ patches/patch-configure 13 Jan 2007 17:57:49 -0000
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2003/04/23 05:33:19 jason Exp $
---- configure.orig Sun Apr 20 23:05:35 2003
-+++ configure Sun Apr 20 23:04:27 2003
-@@ -1120,6 +1120,9 @@ if test "$shared" = true; then
+$OpenBSD$
+--- configure.orig Sat Aug 13 07:43:21 2005
++++ configure Mon Jan  1 20:42:14 2007
+@@ -2779,6 +2779,9 @@ if test "$shared" = true; then
  SHFLAGS="-fPIC"
  OTHERLIBS="-lsocket -ldl"
          ;;
Index: patches/patch-configure_in
===================================================================
RCS file: patches/patch-configure_in
diff -N patches/patch-configure_in
--- patches/patch-configure_in 23 Apr 2003 05:33:19 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.1.1.1 2003/04/23 05:33:19 jason Exp $
---- configure.in.orig Sun Apr 20 23:05:32 2003
-+++ configure.in Sun Apr 20 23:04:58 2003
-@@ -68,6 +68,9 @@ if test "$shared" = true; then
- SHFLAGS="-fPIC"
- OTHERLIBS="-lsocket -ldl"
-         ;;
-+ openbsd*)
-+ SHFLAGS="-shared -fPIC"
-+ ;;
- *)
- ;;
-    esac
Index: patches/patch-lang_usenglish_us_text_c
===================================================================
RCS file: patches/patch-lang_usenglish_us_text_c
diff -N patches/patch-lang_usenglish_us_text_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lang_usenglish_us_text_c 13 Jan 2007 17:57:49 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- lang/usenglish/us_text.c.orig Sat Jan 13 08:47:49 2007
++++ lang/usenglish/us_text.c Sat Jan 13 08:50:20 2007
+@@ -759,7 +759,7 @@ static cst_val *us_tokentowords_one(cst_
+    cst_free(aaa);
+ }
+     }
+-    else if (name[strlen(name)-1] == '%')
++    else if (strlen(name) > 0 && name[strlen(name)-1] == '%')
+     {
+ aaa = cst_strdup(name);
+ aaa[strlen(aaa)-1] = '\0';
Index: patches/patch-lib_Makefile
===================================================================
RCS file: /cvs/ports/audio/flite/patches/patch-lib_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-lib_Makefile
--- patches/patch-lib_Makefile 24 Dec 2005 16:01:55 -0000 1.2
+++ patches/patch-lib_Makefile 13 Jan 2007 17:57:49 -0000
@@ -1,23 +1,72 @@
-$OpenBSD: patch-lib_Makefile,v 1.2 2005/12/24 16:01:55 espie Exp $
---- lib/Makefile.orig Tue Feb 18 17:50:46 2003
-+++ lib/Makefile Sat Dec 24 16:59:35 2005
-@@ -47,6 +47,13 @@ SHAREDLIBS = $(LIBNAMES:%=lib%.so)
- VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION}) \
-                     $(SHAREDLIBS:%=%.${PROJECT_SHLIB_VERSION})
- ALL_LIBS = $(STATICLIBS) $(SHAREDLIBS) $(VERSIONSHAREDLIBS)
-+INSTLIBS = $(STATICLIBS) \
-+ libflite.so.${LIBlibflite.so_VERSION} \
-+ libflite_cmu_time_awb.so.${LIBlibflite_cmu_time_awb.so_VERSION} \
-+ libflite_cmu_us_kal.so.${LIBlibflite_cmu_us_kal.so_VERSION} \
-+ libflite_cmu_us_kal16.so.${LIBlibflite_cmu_us_kal16.so_VERSION} \
-+ libflite_cmulex.so.${LIBlibflite_cmulex.so_VERSION} \
-+ libflite_usenglish.so.${LIBlibflite_usenglish.so_VERSION}
-
- ALL = shared_libs
-
-@@ -61,4 +68,4 @@ shared_libs: nothing
- endif
-
- install:
-- @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -)
-+ @ tar cvf - $(INSTLIBS) | ( cd $(INSTALLLIBDIR) && tar xf -)
+$OpenBSD$
+--- lib/Makefile.orig Tue Jan  2 12:53:05 2007
++++ lib/Makefile Tue Jan  2 12:52:07 2007
+@@ -0,0 +1,68 @@
++###########################################################################
++##                                                                       ##
++##                  Language Technologies Institute                      ##
++##                     Carnegie Mellon University                        ##
++##                        Copyright (c) 1999                             ##
++##                        All Rights Reserved.                           ##
++##                                                                       ##
++##  Permission is hereby granted, free of charge, to use and distribute  ##
++##  this software and its documentation without restriction, including   ##
++##  without limitation the rights to use, copy, modify, merge, publish,  ##
++##  distribute, sublicense, and/or sell copies of this work, and to      ##
++##  permit persons to whom this work is furnished to do so, subject to   ##
++##  the following conditions:                                            ##
++##   1. The code must retain the above copyright notice, this list of    ##
++##      conditions and the following disclaimer.                         ##
++##   2. Any modifications must be clearly marked as such.                ##
++##   3. Original authors' names are not deleted.                         ##
++##   4. The authors' names are not used to endorse or promote products   ##
++##      derived from this software without specific prior written        ##
++##      permission.                                                      ##
++##                                                                       ##
++##  CARNEGIE MELLON UNIVERSITY AND THE CONTRIBUTORS TO THIS WORK         ##
++##  DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING      ##
++##  ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT   ##
++##  SHALL CARNEGIE MELLON UNIVERSITY NOR THE CONTRIBUTORS BE LIABLE      ##
++##  FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES    ##
++##  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN   ##
++##  AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,          ##
++##  ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF       ##
++##  THIS SOFTWARE.                                                       ##
++##                                                                       ##
++###########################################################################
++##                                                                       ##
++##    FLITE libraries                                                    ##
++##                                                                       ##
++###########################################################################
++TOP=..
++DIRNAME=lib
++BUILD_DIRS =
++ALL_DIRS=
++FILES = Makefile
++LIBNAMES = flite flite_cmulex flite_usenglish \
++           flite_cmu_us_kal flite_cmu_us_kal16 flite_cmu_time_awb
++
++STATICLIBS= $(LIBNAMES:%=lib%.a)
++SHAREDARLIBS= $(LIBNAMES:%=lib%.shared.a)
++SHAREDLIBS = $(SHAREDARLIBS:%.shared.a=%.so)
++VERSIONSHAREDLIBS = $(SHAREDLIBS:%=%.${PROJECT_VERSION})
++
++ALL_LIBS = $(STATICLIBS) $(VERSIONSHAREDLIBS)
++
++ALL = shared_libs
++
++LOCAL_CLEAN=*.a *.so *.so.${PROJECT_VERSION} *.so.${PROJECT_SHLIB_VERSION}
++
++include $(TOP)/config/common_make_rules
++
++ifdef SHFLAGS
++shared_libs: $(SHAREDLIBS)
++else
++shared_libs: nothing
++endif
++
++install:
++ @ $(MAKE) shared_libs
++ @ echo ARLIBS: $(SHAREDARLIBS)
++ @ echo SHARLIBS: $(SHAREDLIBS)
++ @ tar cvf - $(ALL_LIBS) | ( cd $(INSTALLLIBDIR) && tar xf -)
Index: patches/patch-main_Makefile
===================================================================
RCS file: patches/patch-main_Makefile
diff -N patches/patch-main_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-main_Makefile 13 Jan 2007 17:57:49 -0000
@@ -0,0 +1,17 @@
+$OpenBSD$
+--- main/Makefile.orig Tue Jan  2 11:04:01 2007
++++ main/Makefile Tue Jan  2 11:07:19 2007
+@@ -50,11 +50,11 @@ ALL = $(BINDIR)/flite$(EXEEXT) $(BINDIR)
+
+ flite_LIBS = flite_$(FL_VOX) flite_$(FL_LANG) flite_$(FL_LEX)
+ flite_LIBS_flags = -L$(LIBDIR) $(flite_LIBS:%=-l%)
+-flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.a)
++flite_LIBS_deps = $(flite_LIBS:%=$(LIBDIR)/lib%.so)
+
+ flite_time_LIBS = flite_cmu_time_awb flite_$(FL_LANG) flite_$(FL_LEX)
+ flite_time_LIBS_flags = -L$(LIBDIR) $(flite_time_LIBS:%=-l%)
+-flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.a)
++flite_time_LIBS_deps = $(flite_time_LIBS:%=$(LIBDIR)/lib%.so)
+
+ include $(TOP)/config/common_make_rules
+
Index: patches/patch-main_flite_main_c
===================================================================
RCS file: /cvs/ports/audio/flite/patches/patch-main_flite_main_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-main_flite_main_c
--- patches/patch-main_flite_main_c 28 Dec 2006 11:47:23 -0000 1.1
+++ patches/patch-main_flite_main_c 13 Jan 2007 17:57:49 -0000
@@ -1,10 +1,10 @@
 $OpenBSD: patch-main_flite_main_c,v 1.1 2006/12/28 11:47:23 espie Exp $
---- main/flite_main.c.orig Thu Dec 28 12:45:59 2006
-+++ main/flite_main.c Thu Dec 28 12:46:57 2006
-@@ -58,6 +58,8 @@ static void flite_version()
+--- main/flite_main.c.orig Tue Oct 25 16:20:25 2005
++++ main/flite_main.c Sat Jan  6 14:39:10 2007
+@@ -60,6 +60,8 @@ static void flite_version()
    FLITE_PROJECT_STATE,
    FLITE_PROJECT_DATE);
-     printf("  CMU Copyright 1999-2003, all rights reserved\n");
+     printf("  CMU Copyright 1999-2005, all rights reserved\n");
 +    printf("  Modified from the original for the OpenBSD project\n");
 +    printf("  See http://www.openbsd.org/cgi-bin/cvsweb/ports/audio/flite/patches/\n");
  }
Index: patches/patch-tools_find_sts_main_c
===================================================================
RCS file: /cvs/ports/audio/flite/patches/patch-tools_find_sts_main_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-tools_find_sts_main_c
--- patches/patch-tools_find_sts_main_c 13 Dec 2004 11:59:48 -0000 1.1
+++ patches/patch-tools_find_sts_main_c 13 Jan 2007 17:57:49 -0000
@@ -1,7 +1,16 @@
 $OpenBSD: patch-tools_find_sts_main_c,v 1.1 2004/12/13 11:59:48 espie Exp $
---- tools/find_sts_main.c.orig Mon Dec 13 12:55:55 2004
-+++ tools/find_sts_main.c Mon Dec 13 12:58:01 2004
-@@ -75,6 +75,11 @@ cst_sts *find_sts(cst_wave *sig, cst_tra
+--- tools/find_sts_main.c.orig Sat Jan  1 09:04:43 2005
++++ tools/find_sts_main.c Mon Jan  1 16:54:33 2007
+@@ -40,6 +40,8 @@
+ #include <stdio.h>
+ #include <math.h>
+ #include <string.h>
++#include <unistd.h>
++#include <stdlib.h>
+
+ /* To allow some normally const fields to manipulated during building */
+ #define const
+@@ -73,6 +75,11 @@ cst_sts *find_sts(cst_wave *sig, cst_tra
      double *resd;
      int size,start,end;
      short *sigplus;
@@ -12,8 +21,8 @@ $OpenBSD: patch-tools_find_sts_main_c,v
 +    } *stsw;
 
      sts = cst_alloc(cst_sts,lpc->num_frames);
-     start = 0;
-@@ -93,14 +98,16 @@ cst_sts *find_sts(cst_wave *sig, cst_tra
+     sigplus = cst_alloc(short,sig->num_samples+lpc->num_channels);
+@@ -99,14 +106,16 @@ cst_sts *find_sts(cst_wave *sig, cst_tra
  lpc->frames[i],lpc->num_channels,
  resd,
  size);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/flite/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 5 Aug 2004 03:28:12 -0000 1.2
+++ pkg/PLIST 13 Jan 2007 17:57:49 -0000
@@ -17,6 +17,7 @@ include/flite/cst_item.h
 include/flite/cst_lexicon.h
 include/flite/cst_lts.h
 include/flite/cst_lts_rewrites.h
+include/flite/cst_math.h
 include/flite/cst_phoneset.h
 include/flite/cst_regex.h
 include/flite/cst_relation.h