[oe-commits] org.oe.dev flite: change default back to oss, native alsa support package named as flite-alsa
xjqian commit
openembedded-commits at lists.openembedded.org
Sun Jan 6 11:09:15 UTC 2008
flite: change default back to oss, native alsa support package named as flite-alsa
* flite does not include working ALSA support, there is a patch made by Lukas Loehrer [1].
* Problem 1, this patch is a one-way street to alsa only. oss can't be build with this patch.
* Problem 2, flite becomes unmaintained, patch won't make upstream. Hence other applications
* using flite shared library doesn't necessarily support flite with native ALSA. e.g. speech-dispatcher.
*
* revert flite packages: --with-audio=oss
* add flite-alsa packages: --with-audio=ass
*
* flite-1.3-Makefile.patch is a patch by Francois Aucamp that makes it possible
* to compile shared libraries of flite 1.3, this patch has already been included in flite-1.3 alsa patch.
*
* configure-with-audio.patch is a patch by Patrick Ohly which works for all versions except flite-alsa-1.2,
* in which au_none.h was not seen by libflite
*
* fix-read-only-assignments.patch was an acknowledged patch by both the original OE flite maintainer
* and Lukas Loehrer (i.e., flite-1.2 alsa patch contains this patch). However, Lukas Loehrer left this patch
* out of his flite-1.3 alsa patch. Leading me to believe this was fixed internally elsewhere in the 1.3 release.
* By the look of it, this seems has to be tested at runtime.
*
* [1] http://homepage.hispeed.ch/loehrer/flite_alsa.html
Author: xjqian at openembedded.org
Branch: org.openembedded.dev
Revision: c10494f1472772667d0b6e757711a713aedd178a
ViewMTN: http://monotone.openembedded.org/revision/info/c10494f1472772667d0b6e757711a713aedd178a
Files:
1
packages/flite/flite-1.2
packages/flite/flite-1.2/configure-with-audio.patch
packages/flite/flite-1.2/fix-read-only-assignments.patch
packages/flite/flite-1.2/flite-1.2-alsa_support-1.2.diff
packages/flite/flite-alsa-1.2/flite-1.2-alsa_support-1.2.diff
packages/flite/flite-1.3
packages/flite/flite-alsa-1.3
packages/flite/flite_1.2.bb
packages/flite/flite-alsa_1.2.bb
packages/flite/flite_1.3.bb
packages/flite/flite-alsa_1.3.bb
packages/flite/flite-alsa-1.2
packages/flite/flite-1.3/flite-1.3-Makefile.patch
packages/flite/flite-1.3/flite-1.3-configure-with-audio.patch
packages/flite/flite-1.3/flite-1.3-fix-read-only-assignments.patch
packages/flite/flite-alsa-1.2/flite-alsa-1.2-configure-with-audio.patch
packages/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch
packages/flite/flite.inc
Diffs:
#
# mt diff -r73e3330d157462c57356d2a900f1720608684829 -rc10494f1472772667d0b6e757711a713aedd178a
#
#
#
# delete "packages/flite/flite-1.2"
#
# delete "packages/flite/flite-1.2/configure-with-audio.patch"
#
# delete "packages/flite/flite-1.2/fix-read-only-assignments.patch"
#
# rename "packages/flite/flite-1.2/flite-1.2-alsa_support-1.2.diff"
# to "packages/flite/flite-alsa-1.2/flite-1.2-alsa_support-1.2.diff"
#
# rename "packages/flite/flite-1.3"
# to "packages/flite/flite-alsa-1.3"
#
# rename "packages/flite/flite_1.2.bb"
# to "packages/flite/flite-alsa_1.2.bb"
#
# rename "packages/flite/flite_1.3.bb"
# to "packages/flite/flite-alsa_1.3.bb"
#
# add_dir "packages/flite/flite-1.2"
#
# add_dir "packages/flite/flite-1.3"
#
# add_dir "packages/flite/flite-alsa-1.2"
#
# add_file "packages/flite/flite-1.2/configure-with-audio.patch"
# content [51281d10af50cb7d69e65c6b59a357490d0b5fc5]
#
# add_file "packages/flite/flite-1.2/fix-read-only-assignments.patch"
# content [13a1266caed6464bcc2d4357d5fb7e7e990f8d6d]
#
# add_file "packages/flite/flite-1.3/flite-1.3-Makefile.patch"
# content [f2208d1dc30d77bc15b330bfc05c8404cca58bc5]
#
# add_file "packages/flite/flite-1.3/flite-1.3-configure-with-audio.patch"
# content [2af7b248ab36843084ea0c656ce6275cddd3a823]
#
# add_file "packages/flite/flite-1.3/flite-1.3-fix-read-only-assignments.patch"
# content [e19d2914968d435bccd36e6b7c9b1cd84fb3d1bc]
#
# add_file "packages/flite/flite-alsa-1.2/flite-alsa-1.2-configure-with-audio.patch"
# content [3a6d9039bab26a16b7fcf80cfdc6837d960f817e]
#
# add_file "packages/flite/flite-alsa-1.3/flite-alsa-1.3-configure-with-audio.patch"
# content [cc03d11902b592fb0607c6c6645f912d0bdfc8cd]
#
# add_file "packages/flite/flite_1.2.bb"
# content [fac9a310745a280887bd23df2385ee2ca30ec7cc]
#
# add_file "packages/flite/flite_1.3.bb"
# content [17b0ab5a15031be7a4b91b3b7719de1b928cab0d]
#
# patch "packages/flite/flite-alsa_1.2.bb"
# from [e32b2aed362684c9c359d98839bc237d62603eef]
# to [6e7ed7ba7b083a410197ea63c513b9e591bde4f7]
#
# patch "packages/flite/flite-alsa_1.3.bb"
# from [363795c4972e7ad5e6d61f99a42533e41f8eaed7]
# to [fdfbf2114a7f37800232fe5d49b79c5e64878a2e]
#
# patch "packages/flite/flite.inc"
# from [85bb5fbc859a7afa126494a7ae04c8024d9e2dd7]
# to [826b9b47e1fb0b32e4a0921494f54ec2327dc5d6]
#
============================================================
--- packages/flite/flite-1.2/configure-with-audio.patch 51281d10af50cb7d69e65c6b59a357490d0b5fc5
+++ packages/flite/flite-1.2/configure-with-audio.patch 51281d10af50cb7d69e65c6b59a357490d0b5fc5
@@ -0,0 +1,20 @@
+*** flite-1.2-release/configure.in~ Tue Feb 18 01:45:45 2003
+--- flite-1.2-release/configure.in Mon Jul 18 22:01:25 2005
+***************
+*** 144,150 ****
+ dnl
+ AC_ARG_WITH( audio,
+ [ --with-audio with specific audio support (none linux freebsd etc) ],
+! AUDIODRIVER=$with_audio )
+
+ if test "x$AUDIODEFS" = x; then
+ case "$AUDIODRIVER" in
+--- 144,151 ----
+ dnl
+ AC_ARG_WITH( audio,
+ [ --with-audio with specific audio support (none linux freebsd etc) ],
+! [AUDIODRIVER=$with_audio
+! AUDIODEFS=])
+
+ if test "x$AUDIODEFS" = x; then
+ case "$AUDIODRIVER" in
============================================================
--- packages/flite/flite-1.2/fix-read-only-assignments.patch 13a1266caed6464bcc2d4357d5fb7e7e990f8d6d
+++ packages/flite/flite-1.2/fix-read-only-assignments.patch 13a1266caed6464bcc2d4357d5fb7e7e990f8d6d
@@ -0,0 +1,16 @@
+diff -urN flite-1.2-release.orig/include/cst_sts.h flite-1.2-release/include/cst_sts.h
+--- flite-1.2-release.orig/include/cst_sts.h 2002-12-23 16:55:05.000000000 +0100
++++ flite-1.2-release/include/cst_sts.h 2004-10-04 21:10:22.000000000 +0200
+@@ -47,9 +47,9 @@
+ /* else where, this information plus the indexes in the Unit relation */
+ /* allow reconstruction of the signal itself */
+ struct cst_sts_struct {
+- const unsigned short *frame;
+- const int size; /* in samples */
+- const unsigned char *residual;
++ unsigned short *frame;
++ int size; /* in samples */
++ unsigned char *residual;
+ };
+ typedef struct cst_sts_struct cst_sts;
+
============================================================
--- packages/flite/flite-1.3/flite-1.3-Makefile.patch f2208d1dc30d77bc15b330bfc05c8404cca58bc5
+++ packages/flite/flite-1.3/flite-1.3-Makefile.patch f2208d1dc30d77bc15b330bfc05c8404cca58bc5
@@ -0,0 +1,405 @@
+Index: lang/usenglish/Makefile
+===================================================================
+--- flite-1.3-release/lang/usenglish/Makefile (.../flite-1.3-orig) (revision 7)
++++ flite-1.3-release/lang/usenglish/Makefile (.../release-1.2) (revision 7)
+@@ -38,6 +38,7 @@
+ DIRNAME=lang/usenglish
+ BUILD_DIRS =
+ ALL_DIRS=
++include $(TOP)/config/config
+ H = usenglish.h us_int_accent_cart.h us_int_tone_cart.h us_durz_cart.h \
+ us_ffeatures.h us_phrasing_cart.h us_text.h us_f0.h us_nums_cart.h
+ SRCS = us_int_accent_cart.c us_int_tone_cart.c us_f0_model.c \
+@@ -45,7 +46,11 @@
+ us_phoneset.c us_ffeatures.c us_phrasing_cart.c \
+ us_gpos.c us_text.c us_expand.c us_postlex.c \
+ us_nums_cart.c us_aswd.c usenglish.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ SCM=
+ FILES = Makefile $(SCM) $(SRCS) $(H)
+ LIBNAME = flite_usenglish
+
+Index: lang/cmu_us_kal/Makefile
+===================================================================
+--- flite-1.3-release/lang/cmu_us_kal/Makefile (.../flite-1.3-orig) (revision 7)
++++ flite-1.3-release/lang/cmu_us_kal/Makefile (.../release-1.2) (revision 7)
+@@ -43,7 +43,12 @@
+ cmu_us_kal_lpc.c \
+ cmu_us_kal_res.c \
+ cmu_us_kal_residx.c
+-OBJS = $(SRCS:.c=.o)
++include $(TOP)/config/config
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ SCM=
+ FILES = Makefile $(SCM) $(SRCS) $(H)
+ LIBNAME = flite_cmu_us_kal
+
+Index: lang/cmu_us_kal16/Makefile
+===================================================================
+--- flite-1.3-release/lang/cmu_us_kal16/Makefile (.../flite-1.3-orig) (revision 7)
++++ flite-1.3-release/lang/cmu_us_kal16/Makefile (.../release-1.2) (revision 7)
+@@ -44,7 +44,12 @@
+ cmu_us_kal16_lpc.c \
+ cmu_us_kal16_res.c \
+ cmu_us_kal16_residx.c
+-OBJS = $(SRCS:.c=.o)
++include $(TOP)/config/config
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ SCM=
+ FILES = Makefile $(SCM) $(SRCS) $(H)
+ LIBNAME = flite_cmu_us_kal16
+
+Index: lang/cmu_time_awb/Makefile
+===================================================================
+--- flite-1.3-release/lang/cmu_time_awb/Makefile (.../flite-1.3-orig) (revision 7)
++++ flite-1.3-release/lang/cmu_time_awb/Makefile (.../release-1.2) (revision 7)
+@@ -45,7 +45,12 @@
+ cmu_time_awb_mcep.c \
+ cmu_time_awb_lpc.c \
+ cmu_time_awb_lex_entry.c
+-OBJS = $(SRCS:.c=.o)
++include $(TOP)/config/config
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ SCM=
+ FILES = Makefile $(SCM) $(SRCS) $(H)
+ LIBNAME = flite_cmu_time_awb
+
+Index: lang/cmulex/Makefile
+===================================================================
+--- flite-1.3-release/lang/cmulex/Makefile (.../flite-1.3-orig) (revision 7)
++++ flite-1.3-release/lang/cmulex/Makefile (.../release-1.2) (revision 7)
+@@ -38,13 +38,20 @@
+ DIRNAME=lang/cmulex
+ BUILD_DIRS =
+ ALL_DIRS=
++
+ H = cmu_lts_model.h cmulex.h
+ SRCS = cmu_lts_rules.c cmu_lts_model.c \
+ cmu_lex.c cmu_lex_entries.c cmu_lex_data.c
+ LEX_DATA_INCLUDES = cmu_lex_data_raw.c cmu_lex_num_bytes.c \
+ cmu_lex_phones_huff_table.c cmu_lex_entries_huff_table.c
+
+-OBJS = $(SRCS:.c=.o)
++include $(TOP)/config/config
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
++
+ SCRIPTS=make_cmulex
+
+ SCM=
+
+Index: src/hrg/Makefile
+===================================================================
+--- flite-1.3-release/src/hrg/Makefile (.../flite-1.3-orig) (revision 7)
++++ flite-1.3-release/src/hrg/Makefile (.../release-1.2) (revision 7)
+@@ -39,9 +39,14 @@
+ BUILD_DIRS =
+ ALL_DIRS=
+ H =
++include $(TOP)/config/config
+ SRCS = cst_utterance.c cst_relation.c cst_item.c cst_ffeature.c \
+ cst_rel_io.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(H) $(SRCS)
+ LIBNAME = flite
+
+Index: src/utils/Makefile
+===================================================================
+--- flite-1.3-release/src/utils/Makefile (.../flite-1.3-orig) (revision 7)
++++ flite-1.3-release/src/utils/Makefile (.../release-1.2) (revision 7)
+@@ -44,8 +44,13 @@
+ cst_tokenstream.c cst_val.c cst_features.c \
+ cst_endian.c cst_socket.c cst_val_const.c \
+ cst_val_user.c cst_args.c
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os) $(MMAPTYPE:%=cst_mmap_%.os) \
++ $(STDIOTYPE:%=cst_file_%.os)
++else
+ OBJS := $(SRCS:.c=.o) $(MMAPTYPE:%=cst_mmap_%.o) \
+ $(STDIOTYPE:%=cst_file_%.o)
++endif
+ FILES = Makefile $(H) $(SRCS) \
+ cst_mmap_posix.c cst_mmap_win32.c cst_mmap_none.c \
+ cst_file_stdio.c cst_file_wince.c cst_file_palmos.c
+
+Index: src/audio/Makefile
+===================================================================
+--- flite-1.3-release/src/audio/Makefile (.../flite-1.3-orig) (revision 7)
++++ flite-1.3-release/src/audio/Makefile (.../release-1.2) (revision 7)
+@@ -43,9 +43,13 @@
+
+ BASESRCS = auclient.c auserver.c audio.c
+ SRCS = $(BASESRCS) $(AUDIODRIVER:%=au_%.c)
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(H) $(BASESRCS) au_command.c au_none.c \
+- au_oss.c au_sun.c au_wince.c au_palmos.c
++ au_oss.c au_sun.c au_wince.c au_palmos.c au_alsa.c
+ LIBNAME = flite
+
+ LOCAL_INCLUDES = -I. $(AUDIODEFS)
+
+Index: src/lexicon/Makefile
+===================================================================
+--- flite-1.3-release/src/lexicon/Makefile (.../flite-1.3-orig) (revision 7)
++++ flite-1.3-release/src/lexicon/Makefile (.../release-1.2) (revision 7)
+@@ -38,8 +38,13 @@
+ DIRNAME=src/lexicon
+ BUILD_DIRS =
+ ALL_DIRS=
++include $(TOP)/config/config
+ SRCS = cst_lexicon.c cst_lts.c cst_lts_rewrites.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(SRCS)
+ LIBNAME = flite
+
+Index: src/synth/Makefile
+===================================================================
+--- flite-1.3-release/src/synth/Makefile (.../flite-1.3-orig) (revision 7)
++++ flite-1.3-release/src/synth/Makefile (.../release-1.2) (revision 7)
+@@ -38,9 +38,14 @@
+ DIRNAME=src/synth
+ BUILD_DIRS =
+ ALL_DIRS=
++include $(TOP)/config/config
+ SRCS = cst_synth.c cst_utt_utils.c cst_voice.c cst_phoneset.c \
+ flite.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(SRCS)
+ LIBNAME = flite
+
+Index: src/speech/Makefile
+===================================================================
+--- flite-1.3-release/src/speech/Makefile (.../flite-1.3-orig) (revision 7)
++++ flite-1.3-release/src/speech/Makefile (.../release-1.2) (revision 7)
+@@ -39,9 +39,14 @@
+ BUILD_DIRS =
+ ALL_DIRS=
+ H =
++include $(TOP)/config/config
+ SRCS = cst_wave.c cst_wave_io.c cst_track.c cst_track_io.c \
+ cst_wave_utils.c cst_lpcres.c rateconv.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(H) $(SRCS)
+ LIBNAME = flite
+
+Index: src/wavesynth/Makefile
+===================================================================
+--- flite-1.3-release/src/wavesynth/Makefile (.../flite-1.3-orig) (revision 7)
++++ flite-1.3-release/src/wavesynth/Makefile (.../release-1.2) (revision 7)
+@@ -38,9 +38,14 @@
+ DIRNAME=src/wavesynth
+ BUILD_DIRS =
+ ALL_DIRS=
++include $(TOP)/config/config
+ SRCS = cst_units.c cst_sigpr.c cst_clunits.c cst_diphone.c \
+ cst_sigprFP.c cst_sts.c cst_reflpc.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ LIBNAME = flite
+ FILES = Makefile $(SRCS)
+
+Index: src/regex/Makefile
+===================================================================
+--- flite-1.3-release/src/regex/Makefile (.../flite-1.3-orig) (revision 7)
++++ flite-1.3-release/src/regex/Makefile (.../release-1.2) (revision 7)
+@@ -42,8 +42,13 @@
+ DIRNAME=src/regex
+ BUILD_DIRS =
+ ALL_DIRS=
++include $(TOP)/config/config
+ SRCS = cst_regex.c regexp.c regsub.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(H) $(SRCS)
+ LIBNAME = flite
+
+Index: src/stats/Makefile
+===================================================================
+--- flite-1.3-release/src/stats/Makefile (.../flite-1.3-orig) (revision 7)
++++ flite-1.3-release/src/stats/Makefile (.../release-1.2) (revision 7)
+@@ -39,8 +39,13 @@
+ BUILD_DIRS =
+ ALL_DIRS=
+ H =
++include $(TOP)/config/config
+ SRCS = cst_cart.c cst_viterbi.c cst_ss.c
+-OBJS = $(SRCS:.c=.o)
++ifdef SHFLAGS
++OBJS := $(SRCS:.c=.os)
++else
++OBJS := $(SRCS:.c=.o)
++endif
+ FILES = Makefile $(H) $(SRCS)
+ LIBNAME = flite
+
+Index: config/common_make_rules
+===================================================================
+--- flite-1.3-release/config/common_make_rules (.../flite-1.3-orig) (revision 7)
++++ flite-1.3-release/config/common_make_rules (.../release-1.2) (revision 7)
+@@ -73,12 +73,13 @@
+ ifdef SHFLAGS
+ SOOBJS = $(OBJS:.o=.os)
+ FULLSHOBJS = $(SOOBJS:%=$(OBJDIR)/%)
+-ifdef LIBNAME
+-ALL += $(OBJDIR)/.build_so
++#ifdef LIBNAME
++#ALL += $(OBJDIR)/.build_so
++#endif
+ endif
+-endif
+ ifdef LIBNAME
+ ALL += $(OBJDIR)/.build_lib
++ALL += $(OBJDIR)/.build_so
+ endif
+ # Only do some directories when you are not cross compiling
+ ifeq ($(HOST_PLATFORM),$(TARGET_PLATFORM))
+@@ -117,14 +118,17 @@
+ @ touch $(OBJDIR)/.build_so
+
+ # Used in the lib/ directory and in building new voices
+-$(OBJDIR)/%.so: %.shared.a
++#$(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}
+ @ (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)/$@
++ #@ 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
+
+ $(OBJDIR)/.make_build_dirs:
+
+Index: lib/Makefile
+===================================================================
+--- flite-1.3-release/lib/Makefile (.../flite-1.3-orig) (revision 0)
++++ flite-1.3-release/lib/Makefile (.../release-1.2) (revision 7)
+@@ -0,0 +1,70 @@
++###########################################################################
++## ##
++## 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 clea%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list