# HG changeset patch
# User Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
# Date 1479100149 28800
# Node ID 95f9efb22a512339a7553b3e8472b10327b4ae55
# Parent  85747fa32c932f7c4b7e9f4747413834383e5aab
23245468 Move espeak 1.44.05 to Userland
15512181 Invalid RUNPATH and RPATH in binaries from SUNWespeak

diff -r 85747fa32c93 -r 95f9efb22a51 components/desktop/espeak/Makefile
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/espeak/Makefile	Sun Nov 13 21:09:09 2016 -0800
@@ -0,0 +1,81 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+BUILD_BITS=		64
+# For now, all things built for C++11 require gcc.
+COMPILER =		gcc
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		espeak
+COMPONENT_VERSION=	1.44.05
+IPS_COMPONENT_VERSION=	1.44.0.5
+COMPONENT_PROJECT_URL=	http://espeak.sourceforge.net/
+COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)-source
+COMPONENT_ARCHIVE=	$(COMPONENT_SRC).zip
+COMPONENT_ARCHIVE_HASH= \
+	sha256:89c37e69a7348d638c859ea492958145a790d0d57a057b29f2f5d913541f8ef9
+COMPONENT_ARCHIVE_URL=	http://sourceforge.net/projects/espeak/files/$(COMPONENT_NAME)/$(COMPONENT_NAME)-$(basename $(COMPONENT_VERSION))/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	gnome/accessibility
+
+TPNO=	 		7478
+
+BUILD_STYLE = justmake
+TEST_TARGET = $(NO_TESTS)
+
+include $(WS_MAKE_RULES)/common.mk
+
+COMPONENT_PRE_CONFIGURE_ACTION += ($(CLONEY) $(SOURCE_DIR) $(@D)) ;
+
+CPPFLAGS.sparc += -DBYTE_ORDER=BIG_ENDIAN
+CPPFLAGS += $(CPPFLAGS.$(MACH))
+
+# wave_sada.cpp won't build without -fpermissive
+CXXFLAGS += -fpermissive
+
+COMPONENT_BUILD_ARGS += AUDIO="sada"
+COMPONENT_BUILD_ARGS += CC="$(CC)"
+COMPONENT_BUILD_ARGS += CFLAGS="$(CPPFLAGS) $(CFLAGS)"
+COMPONENT_BUILD_ARGS += CXX="$(CXX)"
+COMPONENT_BUILD_ARGS += CXXFLAGS="$(CPPFLAGS) $(CXXFLAGS)"
+COMPONENT_BUILD_ARGS += EXTRA_LIBS="-lm"
+
+COMPONENT_PRE_BUILD_ACTION.sparc += \
+	(cd $(@D)/platforms/big_endian ; $(ENV) $(COMPONENT_BUILD_ENV) \
+	 $(GMAKE) $(COMPONENT_BUILD_ARGS) $(COMPONENT_BUILD_TARGETS) ; \
+	 ./espeak-phoneme-data $(SOURCE_DIR)/espeak-data ../../espeak-data ) ;
+COMPONENT_PRE_BUILD_ACTION += $(COMPONENT_PRE_BUILD_ACTION.$(MACH))
+
+# Need to override defaults from justmake.mk to cd into src subdirectory
+COMPONENT_BUILD_ACTION = \
+	cd $(@D)/src; $(ENV) $(COMPONENT_BUILD_ENV) \
+	 $(GMAKE) $(COMPONENT_BUILD_ARGS) $(COMPONENT_BUILD_TARGETS)
+COMPONENT_INSTALL_ACTION = \
+	cd $(@D)/src ; $(ENV) $(COMPONENT_INSTALL_ENV) \
+	 $(GMAKE) $(COMPONENT_INSTALL_ARGS) $(COMPONENT_INSTALL_TARGETS)
+
+COMPONENT_INSTALL_ARGS += $(COMPONENT_BUILD_ARGS)
+COMPONENT_INSTALL_ARGS += LIBDIR=$(USRLIB)
+
+REQUIRED_PACKAGES += system/library/math
diff -r 85747fa32c93 -r 95f9efb22a51 components/desktop/espeak/espeak.p5m
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/espeak/espeak.p5m	Sun Nov 13 21:09:09 2016 -0800
@@ -0,0 +1,246 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+<transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+set name=pkg.fmri \
+    value=pkg:/library/speech/espeak@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="eSpeak - compact open source software speech synthesizer"
+set name=pkg.human-version value=$(DQ)$(COMPONENT_VERSION)$(DQ)
+set name=com.oracle.info.description value="eSpeak speech synthesizer"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value="org.opensolaris.category.2008:Applications/Universal Access"
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=LSARC/2008/536
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/bin/espeak
+file path=usr/include/espeak/speak_lib.h
+link path=usr/lib/$(MACH64)/libespeak.so target=libespeak.so.1
+link path=usr/lib/$(MACH64)/libespeak.so.1 target=libespeak.so.1.1.44
+file path=usr/lib/$(MACH64)/libespeak.so.1.1.44
+file path=usr/share/espeak-data/af_dict
+file path=usr/share/espeak-data/ca_dict
+file path=usr/share/espeak-data/config
+file path=usr/share/espeak-data/cs_dict
+file path=usr/share/espeak-data/cy_dict
+file path=usr/share/espeak-data/da_dict
+file path=usr/share/espeak-data/de_dict
+file path=usr/share/espeak-data/el_dict
+file path=usr/share/espeak-data/en_dict
+file path=usr/share/espeak-data/eo_dict
+file path=usr/share/espeak-data/es_dict
+file path=usr/share/espeak-data/fi_dict
+file path=usr/share/espeak-data/fr_dict
+file path=usr/share/espeak-data/grc_dict
+file path=usr/share/espeak-data/hbs_dict
+file path=usr/share/espeak-data/hi_dict
+file path=usr/share/espeak-data/hu_dict
+file path=usr/share/espeak-data/hy_dict
+file path=usr/share/espeak-data/id_dict
+file path=usr/share/espeak-data/intonations
+file path=usr/share/espeak-data/is_dict
+file path=usr/share/espeak-data/it_dict
+file path=usr/share/espeak-data/jbo_dict
+file path=usr/share/espeak-data/ku_dict
+file path=usr/share/espeak-data/la_dict
+file path=usr/share/espeak-data/lv_dict
+file path=usr/share/espeak-data/mbrola_ph/af1_phtrans
+file path=usr/share/espeak-data/mbrola_ph/ca1_phtrans
+file path=usr/share/espeak-data/mbrola_ph/cr1_phtrans
+file path=usr/share/espeak-data/mbrola_ph/cs_phtrans
+file path=usr/share/espeak-data/mbrola_ph/de2_phtrans
+file path=usr/share/espeak-data/mbrola_ph/de4_phtrans
+file path=usr/share/espeak-data/mbrola_ph/de6_phtrans
+file path=usr/share/espeak-data/mbrola_ph/en1_phtrans
+file path=usr/share/espeak-data/mbrola_ph/es_phtrans
+file path=usr/share/espeak-data/mbrola_ph/fr1_phtrans
+file path=usr/share/espeak-data/mbrola_ph/gr2_phtrans
+file path=usr/share/espeak-data/mbrola_ph/grc-de6_phtrans
+file path=usr/share/espeak-data/mbrola_ph/hu1_phtrans
+file path=usr/share/espeak-data/mbrola_ph/ic1_phtrans
+file path=usr/share/espeak-data/mbrola_ph/id1_phtrans
+file path=usr/share/espeak-data/mbrola_ph/in1_phtrans
+file path=usr/share/espeak-data/mbrola_ph/it3_phtrans
+file path=usr/share/espeak-data/mbrola_ph/la1_phtrans
+file path=usr/share/espeak-data/mbrola_ph/nl_phtrans
+file path=usr/share/espeak-data/mbrola_ph/pl1_phtrans
+file path=usr/share/espeak-data/mbrola_ph/pt1_phtrans
+file path=usr/share/espeak-data/mbrola_ph/pt_phtrans
+file path=usr/share/espeak-data/mbrola_ph/ptbr4_phtrans
+file path=usr/share/espeak-data/mbrola_ph/ptbr_phtrans
+file path=usr/share/espeak-data/mbrola_ph/ro1_phtrans
+file path=usr/share/espeak-data/mbrola_ph/sv2_phtrans
+file path=usr/share/espeak-data/mbrola_ph/sv_phtrans
+file path=usr/share/espeak-data/mbrola_ph/tr1_phtrans
+file path=usr/share/espeak-data/mbrola_ph/us3_phtrans
+file path=usr/share/espeak-data/mbrola_ph/us_phtrans
+file path=usr/share/espeak-data/mk_dict
+file path=usr/share/espeak-data/nci_dict
+file path=usr/share/espeak-data/nl_dict
+file path=usr/share/espeak-data/no_dict
+file path=usr/share/espeak-data/pap_dict
+file path=usr/share/espeak-data/phondata
+file path=usr/share/espeak-data/phonindex
+file path=usr/share/espeak-data/phontab
+file path=usr/share/espeak-data/pl_dict
+file path=usr/share/espeak-data/pt_dict
+file path=usr/share/espeak-data/ro_dict
+file path=usr/share/espeak-data/ru_dict
+file path=usr/share/espeak-data/sk_dict
+file path=usr/share/espeak-data/sq_dict
+file path=usr/share/espeak-data/sv_dict
+file path=usr/share/espeak-data/sw_dict
+file path=usr/share/espeak-data/ta_dict
+file path=usr/share/espeak-data/tr_dict
+file path=usr/share/espeak-data/vi_dict
+file path=usr/share/espeak-data/voices/!v/croak
+file path=usr/share/espeak-data/voices/!v/f1
+file path=usr/share/espeak-data/voices/!v/f2
+file path=usr/share/espeak-data/voices/!v/f3
+file path=usr/share/espeak-data/voices/!v/f4
+file path=usr/share/espeak-data/voices/!v/f5
+file path=usr/share/espeak-data/voices/!v/fast
+file path=usr/share/espeak-data/voices/!v/klatt
+file path=usr/share/espeak-data/voices/!v/klatt2
+file path=usr/share/espeak-data/voices/!v/klatt3
+file path=usr/share/espeak-data/voices/!v/m1
+file path=usr/share/espeak-data/voices/!v/m2
+file path=usr/share/espeak-data/voices/!v/m3
+file path=usr/share/espeak-data/voices/!v/m4
+file path=usr/share/espeak-data/voices/!v/m5
+file path=usr/share/espeak-data/voices/!v/m6
+file path=usr/share/espeak-data/voices/!v/m7
+file path=usr/share/espeak-data/voices/!v/whisper
+file path=usr/share/espeak-data/voices/!v/whisperf
+file path=usr/share/espeak-data/voices/af
+file path=usr/share/espeak-data/voices/bs
+file path=usr/share/espeak-data/voices/ca
+file path=usr/share/espeak-data/voices/cs
+file path=usr/share/espeak-data/voices/cy
+file path=usr/share/espeak-data/voices/da
+file path=usr/share/espeak-data/voices/de
+file path=usr/share/espeak-data/voices/default
+file path=usr/share/espeak-data/voices/el
+file path=usr/share/espeak-data/voices/en/en
+file path=usr/share/espeak-data/voices/en/en-n
+file path=usr/share/espeak-data/voices/en/en-rp
+file path=usr/share/espeak-data/voices/en/en-sc
+file path=usr/share/espeak-data/voices/en/en-us
+file path=usr/share/espeak-data/voices/en/en-wi
+file path=usr/share/espeak-data/voices/en/en-wm
+file path=usr/share/espeak-data/voices/eo
+file path=usr/share/espeak-data/voices/es
+file path=usr/share/espeak-data/voices/es-la
+file path=usr/share/espeak-data/voices/fi
+file path=usr/share/espeak-data/voices/fr
+file path=usr/share/espeak-data/voices/fr-be
+file path=usr/share/espeak-data/voices/hi
+file path=usr/share/espeak-data/voices/hr
+file path=usr/share/espeak-data/voices/hu
+file path=usr/share/espeak-data/voices/hy
+file path=usr/share/espeak-data/voices/hy-west
+file path=usr/share/espeak-data/voices/id
+file path=usr/share/espeak-data/voices/is
+file path=usr/share/espeak-data/voices/it
+file path=usr/share/espeak-data/voices/ku
+file path=usr/share/espeak-data/voices/la
+file path=usr/share/espeak-data/voices/lv
+file path=usr/share/espeak-data/voices/mb/mb-af1
+file path=usr/share/espeak-data/voices/mb/mb-af1-en
+file path=usr/share/espeak-data/voices/mb/mb-br1
+file path=usr/share/espeak-data/voices/mb/mb-br3
+file path=usr/share/espeak-data/voices/mb/mb-br4
+file path=usr/share/espeak-data/voices/mb/mb-cr1
+file path=usr/share/espeak-data/voices/mb/mb-cz2
+file path=usr/share/espeak-data/voices/mb/mb-de2
+file path=usr/share/espeak-data/voices/mb/mb-de4
+file path=usr/share/espeak-data/voices/mb/mb-de4-en
+file path=usr/share/espeak-data/voices/mb/mb-de5
+file path=usr/share/espeak-data/voices/mb/mb-de5-en
+file path=usr/share/espeak-data/voices/mb/mb-de6
+file path=usr/share/espeak-data/voices/mb/mb-de6-grc
+file path=usr/share/espeak-data/voices/mb/mb-de7
+file path=usr/share/espeak-data/voices/mb/mb-en1
+file path=usr/share/espeak-data/voices/mb/mb-es1
+file path=usr/share/espeak-data/voices/mb/mb-es2
+file path=usr/share/espeak-data/voices/mb/mb-fr1
+file path=usr/share/espeak-data/voices/mb/mb-fr1-en
+file path=usr/share/espeak-data/voices/mb/mb-fr4
+file path=usr/share/espeak-data/voices/mb/mb-fr4-en
+file path=usr/share/espeak-data/voices/mb/mb-gr2
+file path=usr/share/espeak-data/voices/mb/mb-gr2-en
+file path=usr/share/espeak-data/voices/mb/mb-hu1
+file path=usr/share/espeak-data/voices/mb/mb-hu1-en
+file path=usr/share/espeak-data/voices/mb/mb-ic1
+file path=usr/share/espeak-data/voices/mb/mb-id1
+file path=usr/share/espeak-data/voices/mb/mb-it3
+file path=usr/share/espeak-data/voices/mb/mb-it4
+file path=usr/share/espeak-data/voices/mb/mb-la1
+file path=usr/share/espeak-data/voices/mb/mb-nl2
+file path=usr/share/espeak-data/voices/mb/mb-nl2-en
+file path=usr/share/espeak-data/voices/mb/mb-pl1
+file path=usr/share/espeak-data/voices/mb/mb-pl1-en
+file path=usr/share/espeak-data/voices/mb/mb-pt1
+file path=usr/share/espeak-data/voices/mb/mb-ro1
+file path=usr/share/espeak-data/voices/mb/mb-ro1-en
+file path=usr/share/espeak-data/voices/mb/mb-sw1
+file path=usr/share/espeak-data/voices/mb/mb-sw1-en
+file path=usr/share/espeak-data/voices/mb/mb-sw2
+file path=usr/share/espeak-data/voices/mb/mb-sw2-en
+file path=usr/share/espeak-data/voices/mb/mb-tr1
+file path=usr/share/espeak-data/voices/mb/mb-tr2
+file path=usr/share/espeak-data/voices/mb/mb-us1
+file path=usr/share/espeak-data/voices/mb/mb-us2
+file path=usr/share/espeak-data/voices/mb/mb-us3
+file path=usr/share/espeak-data/voices/mk
+file path=usr/share/espeak-data/voices/nl
+file path=usr/share/espeak-data/voices/no
+file path=usr/share/espeak-data/voices/pl
+file path=usr/share/espeak-data/voices/pt
+file path=usr/share/espeak-data/voices/pt-pt
+file path=usr/share/espeak-data/voices/ro
+file path=usr/share/espeak-data/voices/ru
+file path=usr/share/espeak-data/voices/sk
+file path=usr/share/espeak-data/voices/sq
+file path=usr/share/espeak-data/voices/sr
+file path=usr/share/espeak-data/voices/sv
+file path=usr/share/espeak-data/voices/sw
+file path=usr/share/espeak-data/voices/ta
+dir  path=usr/share/espeak-data/voices/test
+file path=usr/share/espeak-data/voices/test/grc
+file path=usr/share/espeak-data/voices/test/jbo
+file path=usr/share/espeak-data/voices/test/nci
+file path=usr/share/espeak-data/voices/test/pap
+file path=usr/share/espeak-data/voices/tr
+file path=usr/share/espeak-data/voices/vi
+file path=usr/share/espeak-data/voices/zh
+file path=usr/share/espeak-data/voices/zh-yue
+file path=usr/share/espeak-data/zh_dict
+file path=usr/share/espeak-data/zhy_dict
+file files/espeak.1 path=usr/share/man/man1/espeak.1
+file files/libespeak.3lib path=usr/share/man/man3lib/libespeak.3lib
+license License.txt license=GPLv3
diff -r 85747fa32c93 -r 95f9efb22a51 components/desktop/espeak/files/espeak.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/espeak/files/espeak.1	Sun Nov 13 21:09:09 2016 -0800
@@ -0,0 +1,133 @@
+.TH espeak 1 "13 Nov 2016" "SunOS 5.12" "User Commands"
+.SH "NAME"
+espeak \- a compact open source software speech synthesizer
+.SH "SYNOPSIS"
+.PP
+\fBespeak\fR [\fB\fIoption\&.\&.\&.\fR\fR] [\fB\fIwords\fR\fR]
+.SH "DESCRIPTION"
+.PP
+\fBespeak\fR is a compact open source software speech synthesizer\&.
+It can run as a command line program to speak text from a file or from
+\fBstdin\fR\&.
+.PP
+Main features of \fBespeak\fR:
+.IP \(bu 2
+Includes different voices, whose characteristics can be altered\&.
+.IP \(bu 2
+Can produce speech output as a WAV file\&.
+.IP \(bu 2
+Supports SSML (Speech Synthesis Markup Language - not complete)
+.IP \(bu 2
+Supports HTML\&.
+.IP \(bu 2
+Is compact in size\&.
+.IP \(bu 2
+Can translate text to phoneme codes, so it could be adapted as a front end
+for another speech synthesis engine\&.
+.IP \(bu 2
+Is written in C++\&.
+.fi
+.SH "OPTIONS"
+.PP
+The following options are supported:
+.TP 24
+.B -a \fIinteger\fR
+Amplitude as an \fIinteger\fR in the
+range from 0 to 200, default is 100\&.
+.TP 24
+.B -b
+Input text is 8-bit encoded\&.
+.TP 24
+.B -f \fItext_file\fR
+Speak text from \fItext_file\fR\&.
+.TP 24
+.B -g \fIinteger\fR
+Specify the word gap, or the pause between words, as an
+\fIinteger\fR\&.   Units of 10mS at the default speed\&.
+.TP 24
+.B -k \fIinteger\fR
+Indicate how to speak capital letters as an
+\fIinteger\fR\&.  The argument can have the following
+values: 1=sound, 2=the word "capitals", higher values=a pitch increase (try
+-\fBk\fR 20)\&.
+.TP 24
+.B -l \fIinteger\fR
+Line length as an \fIinteger\fR\&. If not
+zero (which is the default), consider lines less than this length as
+end-of-clause\&.
+.TP 24
+.B -m
+Interpret SSML markup, and ignore other < > tags\&.
+.TP 24
+.B -p \fIinteger\fR
+Pitch adjustment as an \fIinteger\fR in
+the range from 0 to 99, default is 50\&.
+.TP 24
+.B -q
+Quiet, do not produce any speech (may be useful with
+-\fBx\fR)\&.
+.TP 24
+.B -s \fIinteger\fR
+Speed as an \fIinteger\fR meaning
+words per minute\&.  Values can be from 80 to 370, default is 170\&.
+.TP 24
+.B -v \fIvoice_file\fR
+Use specified \fIvoice_file\fR\&.
+.TP 24
+.B -w \fIfilename\fR
+Write output to the specified
+\fIfilename\fR, in WAV format,
+rather than speaking it directly\&.
+.TP 24
+.B -x
+Write phoneme mnemonics to \fBstdout\fR\&.
+.TP 24
+.B -X
+Write phonemes mnemonics and translation trace to
+\fBstdout\fR\&.
+.TP 24
+.B -z
+No final sentence pause at the end of the text\&.
+.TP 24
+.B --compile=\fIvoice_name\fR
+Compile the pronunciation rules and dictionary in the
+current directory\&. The \fIvoice_name\fR value is optional
+and specifies which language to use\&.
+.TP 24
+.B --punct="\fIcharacters\fR"
+Speak the names of punctuation
+\fIcharacters\fR while speaking\&.  If the
+\fIcharacters\fR value is omitted, all punctuation is
+spoken\&.
+.TP 24
+.B --split=\fIminutes\fR
+Starts a new WAV file every \fIminutes\fR\&.  Used with -\fBw\fR\&.
+.TP 24
+.B --stdin
+Read text input from \fBstdin\fR instead of a
+file\&.
+.TP 24
+.B --stdout
+Write speech output to \fBstdout\fR\&.
+.TP 24
+.B --voices=\fIlanguage\fR
+List the available voices for the specified
+\fIlanguage\fR\&.  If \fIlanguage\fR is
+omitted, then list all voices\&.
+.SH "FILES"
+.PP
+The following files are used by espeak:
+.TP 26
+.B /usr/lib/64/libespeak\&.so
+Library for espeak speech synthesis
+.TP 26
+.B /usr/share/espeak-data
+Directory of voice language and data files
+.SH "NOTES"
+.PP
+espeak was written by Jonathan Duddington\&.
+.SH "SEE ALSO"
+.PP
+\fBorca\fR(1),
+\fBlibespeak\fR(3),
+\fBattributes\fR(7)
diff -r 85747fa32c93 -r 95f9efb22a51 components/desktop/espeak/files/libespeak.3lib
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/espeak/files/libespeak.3lib	Sun Nov 13 21:09:09 2016 -0800
@@ -0,0 +1,26 @@
+.TH libespeak 3lib "13 Nov 2016" "SunOS 5.12" "Interface Libraries"
+.SH "NAME"
+libespeak \- C++ bindings
+for espeak speech synthesis
+.SH "DESCRIPTION"
+.PP
+\fBlibespeak\fR is a set of C++ bindings to speech synthesis
+services for use by client applications and assistive
+technologies\&.
+.SH "FILES"
+.PP
+The following files are used by this library:
+.TP 28
+.B /usr/lib/64/libespeak\&.so
+Library for espeak speech synthesis
+.TP 28
+.B /usr/share/espeak-data
+Directory of voice language and data files
+.TP 28
+.B /usr/include/espeak/speak_lib\&.h
+Header file for development purposes
+.SH "SEE ALSO"
+.PP
+\fBespeak\fR(1),
+\fBorca\fR(1),
+\fBattributes\fR(7)
diff -r 85747fa32c93 -r 95f9efb22a51 components/desktop/espeak/patches/01-wave_sada.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/desktop/espeak/patches/01-wave_sada.patch	Sun Nov 13 21:09:09 2016 -0800
@@ -0,0 +1,22 @@
+Patch imported from Desktop gate, where it was listed as:
+# date:2010-10-27 owner:yippi type:bug
+
+Fixes build error:
+wave_sada.cpp: In function 'void wave_init(int)':
+wave_sada.cpp:86:2: error: 'wave_samplerate' was not declared in this scope
+  wave_samplerate = srate;
+  ^
+
+Fix has already been integrated upstream:
+https://sourceforge.net/p/espeak/code/257/tree//trunk/src/wave_sada.cpp?diff=248
+
+--- espeak-1.44.05-source/src/wave_sada.cpp-orig	2010-10-27 23:38:38.475656462 -0500
++++ espeak-1.44.05-source/src/wave_sada.cpp	2010-10-27 23:40:35.828458218 -0500
+@@ -63,6 +63,7 @@ static uint32_t total_samples_skipped;
+ //
+ static uint32_t last_play_position=0;
+ 
++static uint32_t wave_samplerate;
+ //>
+ // wave_init 
+ //
diff -r 85747fa32c93 -r 95f9efb22a51 components/meta-packages/incorporation-cache
--- a/components/meta-packages/incorporation-cache	Tue Nov 15 22:27:05 2016 -0800
+++ b/components/meta-packages/incorporation-cache	Sun Nov 13 21:09:09 2016 -0800
@@ -65,5 +65,4 @@
 consolidation/userland/userland-incorporation:library/libunique@1.1.6-5.12.0.0.0.92.0
 consolidation/userland/userland-incorporation:library/python/python-gnome-desktop-27@2.30.2-5.12.0.0.0.92.0
 consolidation/userland/userland-incorporation:library/python/python-xdg-27@0.25-5.12.0.0.0.92.0
-consolidation/userland/userland-incorporation:library/speech/espeak@1.44.0.5-5.12.0.0.0.92.0
 consolidation/userland/userland-incorporation:service/postrun@1.0-5.12.0.0.0.92.0