From 0ddc3ff982af0e139569a552f0380b0f026aae34 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Sun, 6 Jan 2008 10:54:39 +0000 Subject: 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 --- packages/flite/flite.inc | 2 -- 1 file changed, 2 deletions(-) (limited to 'packages/flite/flite.inc') diff --git a/packages/flite/flite.inc b/packages/flite/flite.inc index 59373ba60d..4c0e9de35c 100644 --- a/packages/flite/flite.inc +++ b/packages/flite/flite.inc @@ -11,8 +11,6 @@ S = "${WORKDIR}/flite-${PV}-release" inherit autotools -EXTRA_OECONF = "--with-audio=alsa --enable-shared" - PACKAGES += "lib${PN} lib${PN}-vox8 lib${PN}-vox16" FILES_${PN} = "${bindir}" -- cgit v1.2.3 From eb7952a208f1b5a00ab119984e31d811dbec83a4 Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Sun, 6 Jan 2008 12:55:28 +0000 Subject: flite: fix staging * headers have to go into ${STAGING_INCDIR}/flite --- packages/flite/flite.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages/flite/flite.inc') diff --git a/packages/flite/flite.inc b/packages/flite/flite.inc index 4c0e9de35c..64108c8390 100644 --- a/packages/flite/flite.inc +++ b/packages/flite/flite.inc @@ -30,9 +30,10 @@ do_install() { oe_runmake INSTALLBINDIR="${D}${bindir}" INSTALLLIBDIR="${D}${libdir}" INSTALLINCDIR="${D}${includedir}" install } - do_stage () { - install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/ + install -d ${STAGING_INCDIR}/flite + install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/flite/ + oe_libinstall -C lib -a -so libflite ${STAGING_LIBDIR} oe_libinstall -C lib -a -so libflite_cmu_time_awb ${STAGING_LIBDIR} oe_libinstall -C lib -a -so libflite_cmulex ${STAGING_LIBDIR} -- cgit v1.2.3