From 8cd760182f69f36944cbd114c7ed0d5b6989bb4d Mon Sep 17 00:00:00 2001 From: Rmys Date: Fri, 21 May 2021 15:23:08 +0300 Subject: [PATCH] espeak-ng rebuild --- multimedia/sound/espeak-ng/actions.py | 10 ++++----- .../espeak-ng/files/espeak-ng-fix-699.patch | 22 +++++++++++++++++++ multimedia/sound/espeak-ng/pspec.xml | 5 +---- 3 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 multimedia/sound/espeak-ng/files/espeak-ng-fix-699.patch diff --git a/multimedia/sound/espeak-ng/actions.py b/multimedia/sound/espeak-ng/actions.py index 5509b562e3..90fff933fa 100644 --- a/multimedia/sound/espeak-ng/actions.py +++ b/multimedia/sound/espeak-ng/actions.py @@ -11,7 +11,7 @@ from pisi.actionsapi import get def setup(): shelltools.system("sh ./autogen.sh") - autotools.configure("--includedir=/usr/include/espeak-ng \ + autotools.configure("--includedir=/usr/include \ --with-extdict-{ru,zh,zhy}") def build(): @@ -21,8 +21,8 @@ def build(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.remove("/usr/bin/speak") - pisitools.remove("/usr/bin/espeak") - - + pisitools.rename("/usr/bin/speak", "speak-ng") + pisitools.rename("/usr/bin/espeak", "espeak-ng") + pisitools.removeDir("/usr/include/espeak") + pisitools.dodoc("AUTHORS", "CHANGELOG*", "COPYING*", "NEWS", "README") diff --git a/multimedia/sound/espeak-ng/files/espeak-ng-fix-699.patch b/multimedia/sound/espeak-ng/files/espeak-ng-fix-699.patch new file mode 100644 index 0000000000..53ff660029 --- /dev/null +++ b/multimedia/sound/espeak-ng/files/espeak-ng-fix-699.patch @@ -0,0 +1,22 @@ +From e11cd42b03d1628f7a0cf45c9406123282e25c63 Mon Sep 17 00:00:00 2001 +From: "Reece H. Dunn" +Date: Thu, 9 Jan 2020 21:11:42 +0000 +Subject: [PATCH] fix #699: avoid samplerate clashing with LTO in gcc 10. + +--- + src/espeak-ng.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/espeak-ng.c b/src/espeak-ng.c +index 10b8a8879..3a7838cf9 100644 +--- a/src/espeak-ng.c ++++ b/src/espeak-ng.c +@@ -117,7 +117,7 @@ static const char *help_text = + "--load Load voice from a file in current directory by name.\n" + "-h, --help Show this help.\n"; + +-int samplerate; ++static int samplerate; + bool quiet = false; + unsigned int samples_total = 0; + unsigned int samples_split = 0; diff --git a/multimedia/sound/espeak-ng/pspec.xml b/multimedia/sound/espeak-ng/pspec.xml index 3892d98301..16c3cedfd8 100644 --- a/multimedia/sound/espeak-ng/pspec.xml +++ b/multimedia/sound/espeak-ng/pspec.xml @@ -21,12 +21,9 @@ Dep4-devel --> -