summaryrefslogtreecommitdiffstats
path: root/toolkit
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-05-20 10:19:04 +0000
committerMoonchild <moonchild@palemoon.org>2020-05-20 14:04:17 +0000
commit99c2e698d2a3c56649e42d8d2133706cd8c9501e (patch)
tree85be449d772eb57860f0f386efb4bc1e790fd498 /toolkit
parent15ac4021b06d549e47c9e2efc9364a9eb96bfe82 (diff)
downloadUXP-99c2e698d2a3c56649e42d8d2133706cd8c9501e.tar
UXP-99c2e698d2a3c56649e42d8d2133706cd8c9501e.tar.gz
UXP-99c2e698d2a3c56649e42d8d2133706cd8c9501e.tar.lz
UXP-99c2e698d2a3c56649e42d8d2133706cd8c9501e.tar.xz
UXP-99c2e698d2a3c56649e42d8d2133706cd8c9501e.zip
Issue #1538 - remove speech recognition engine
This removes speech recognition, pocketsphinx, training models and the speech automated test interface. This also re-establishes proper use of MOZ_WEBSPEECH to work for the speech API (synthesis part only) that was a broken mess before, with some synth parts being always built, some parts being built only with it enabled and recognition parts being dependent on it. I'm pretty sure it'd be totally busted if you'd ever have tried building without MOZ_WEBPEECH before. Tested that synthesis still works as-intended. This resolves #1538
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/content/license.html47
-rw-r--r--toolkit/moz.configure34
2 files changed, 1 insertions, 80 deletions
diff --git a/toolkit/content/license.html b/toolkit/content/license.html
index 7221a8ae2..1041ec42f 100644
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -128,9 +128,6 @@
<li><a href="about:license#openaes">OpenAES License</a></li>
<li><a href="about:license#openvision">OpenVision License</a></li>
<li><a href="about:license#pbkdf2-sha256">pbkdf2_sha256 License</a></li>
-#ifdef MOZ_WEBSPEECH_POCKETSPHINX
- <li><a href="about:license#pocketsphinx">Pocketsphinx License</a></li>
-#endif
<li><a href="about:license#praton">praton License</a></li>
<li><a href="about:license#qcms">qcms License</a></li>
<li><a href="about:license#qrcode-generator">QR Code Generator License</a></li>
@@ -4481,50 +4478,6 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
</pre>
-#ifdef MOZ_WEBSPEECH_POCKETSPHINX
-
- <hr>
-
- <h1><a id="pocketsphinx"></a>Pocketsphinx License</h1>
-
- <p>This license applies to files in the directories
- <span class="path">media/pocketsphinx/</span> and
- <span class="path">media/sphinxbase/</span>.
- </p>
-
-<pre>
-Copyright (c) 1999-2014 Carnegie Mellon University. All rights
-reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
-This work was supported in part by funding from the Defense Advanced
-Research Projects Agency and the National Science Foundation of the
-United States of America, and the CMU Sphinx Speech Consortium.
-
-THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND
-ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
-NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-</pre>
-#endif
<hr>
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index fe14cb567..863327751 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -495,7 +495,7 @@ set_config('MOZ_SYNTH_SPEECHD',
# Speech API
# ==============================================================
-option('--disable-webspeech', help='Disable support for HTML Speech API')
+option('--disable-webspeech', help='Disable support for HTML Speech synthesis API')
@depends('--disable-webspeech', '--help')
def webspeech(value, _):
@@ -506,38 +506,6 @@ set_config('MOZ_WEBSPEECH', webspeech)
set_define('MOZ_WEBSPEECH', webspeech)
add_old_configure_assignment('MOZ_WEBSPEECH', webspeech)
-# Speech API pocketsphinx backend
-# ==============================================================
-@depends(build_project, milestone, webspeech)
-def webspeech_pocketsphinx(build_project, milestone, webspeech):
- if webspeech and milestone.is_nightly and build_project == 'b2g':
- return True
-
-set_config('MOZ_WEBSPEECH_POCKETSPHINX', webspeech_pocketsphinx)
-set_define('MOZ_WEBSPEECH_POCKETSPHINX', webspeech_pocketsphinx)
-
-# Speech API models
-# ==============================================================
-@depends(build_project, milestone, webspeech)
-def webspeech_models(build_project, milestone, webspeech):
- if webspeech and milestone.is_nightly and build_project == 'b2g':
- return True
-
-set_config('MOZ_WEBSPEECH_MODELS', webspeech_models)
-set_define('MOZ_WEBSPEECH_MODELS', webspeech_models)
-
-# Speech API test backend
-# ==============================================================
-option('--enable-webspeechtestbackend', default=webspeech,
- help='Enable support for HTML Speech API Test Backend')
-
-@depends_if('--enable-webspeechtestbackend')
-def webspeech_test_backend(value):
- return True
-
-set_config('MOZ_WEBSPEECH_TEST_BACKEND', webspeech_test_backend)
-set_define('MOZ_WEBSPEECH_TEST_BACKEND', webspeech_test_backend)
-
# Enable IPDL's "expensive" unit tests
# ==============================================================
option('--enable-ipdl-tests', help='Enable expensive IPDL tests')