Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update espeak #7385

Merged
merged 12 commits into from Sep 11, 2017
Merged

Update espeak #7385

merged 12 commits into from Sep 11, 2017

Conversation

@feerrenrut
Copy link
Member

@feerrenrut feerrenrut commented Jul 12, 2017

Note:

If you notice a problem with Espeak on next (or master), please open a new issue to discuss this.

Summary of the issue:

In order to more quickly spot and report issues on Espeak, we are regularly updating espeak to the latest master on our next branch. When this gets to stable we can merge back to nvda master.

Description of how this pull request fixes the issue:

This updates the espeak submodule to the latest espeak-ng master commit and fixes any build errors.

In depth discussion of the changes:

Compiling mbrowrap was causing an issue, and we dont use mbrola anyway, so this was removed. It was noticed that a bunch of mbrola voices were listed in espeak but did not seem to do anything. The sconscript has been modified to exclude the 'espeak-ng-data/voice/mb' directory. This means that we can no longer recursively install espeak-ng-data and must instead manually install the files, and then recursive install for lang and voices/!v subfolders.

Removed lines from recursive install that seem unnecessary. glob path/*.* should not add anything to glob path/*

Allow unicode characters in espeak language names. Fixes part of #7167 - selecting Norwegian Bokmål no longer causes an error.

Added compilation of several missing files, and commented on why we dont compile other files. Tried to make the list of compiled files match the files listed in the automake used in espeak-ng

Testing performed:

  • Ensure that it builds locally and on appveyor.
  • Ensure that the list of voices and variants for espeak look correct in NVDA
  • Ensure that espeak can be used

Known issues with pull request:

None

Change log entry:

For now none. But perhaps eventually:

Espeak-ng has been updated to commit 01919cd48a566cdf34347784b2e74554b376e900
@feerrenrut feerrenrut requested a review from michaelDCurran Jul 12, 2017
feerrenrut added 12 commits Apr 7, 2017
This is to see if it resolves issues with pronunciation in Italian
zhy has been excluded as it wont compile.
Update to commit eb3c9a9bbd186ec3ead40059fbe865eed1cd3772 of Espeak-ng

See
https://github.com/espeak-ng/espeak-ng/commits/eb3c9a9bbd186ec3ead40059fbe865eed1cd3772
Fixes part of #7167
selecting Norwegian Bokmål no longer causes an error.
Clarified comment
To commit c5afdbe0d1292a6f1d95e3794b62e4be93d7a6cd
Update to espeak-ng commit f946c6e2278d6b76f7a3c59cf1aa3753365527f8
had to exclude dictionary 'an' since it was causing a crash in python
when building nvda.
Compiling mbrowrap was causing an issue, and we dont use mbrola anyway,
so this was removed. It was noticed that a bunch of mbrola voices were
listed in espeak but did not seem to do anything. The sconscript has
been modified to exclude the 'espeak-ng-data/voice/mb' directory. This
means that we can no longer recursively install espeak-ng-data and must
instead manually install the files, and then recursive install for lang
and voices/!v subfolders.
Espeak-ng has been updated to 01919cd48a566cdf34347784b2e74554b376e900
This fixes several issues with compiling dictionary files.
See espeak-ng/espeak-ng#287
@feerrenrut feerrenrut force-pushed the updateEspeak branch from 62b7527 to a546abb Aug 1, 2017
@nvaccess nvaccess locked and limited conversation to collaborators Aug 1, 2017
@feerrenrut
Copy link
Member Author

@feerrenrut feerrenrut commented Aug 1, 2017

Locking the comments on this PR, since this is expected to be a long running PR. The goal is to regularly integrate the newest espeak-ng changes into the next branch. When espeak-ng reaches the next release, merge to master. This allows espeak-ng to be tested more regularly by users of next.

If you encounter a problem with espeak-ng or this PR, please raise a separate issue.

@feerrenrut
Copy link
Member Author

@feerrenrut feerrenrut commented Aug 23, 2017

Incubated with commit: 6e730ad

@feerrenrut feerrenrut merged commit fe6b2ec into master Sep 11, 2017
@nvaccessAuto nvaccessAuto added this to the 2017.4 milestone Sep 11, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants