* [PR PATCH] new package: espeak-ng-1.50
@ 2020-12-16 8:34 joey-commits
2020-12-16 9:04 ` [PR PATCH] [Updated] " joey-commits
` (51 more replies)
0 siblings, 52 replies; 53+ messages in thread
From: joey-commits @ 2020-12-16 8:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 827 bytes --]
There is a new pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9060 bytes --]
From b37f4d91cadc31f9541e623ac599599849e40b04 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 54 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 -----
srcpkgs/espeak/template | 41 ----------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 60 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..baa4df9f621 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..957a7d1626c
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,54 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+
+pre_configure() {
+ ./autogen.sh
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From 091d46ce599f6f947045da5770bb3ab5c380d08e Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From a0917b9c3c808103c35c375e1ae90684c07b63f9 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..27c1c943e9f 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,13 +1,13 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
+revision=2
short_desc="A lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
license="GPL-3"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
+makedepends="libespeak-ng-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
build_style="gnu-makefile"
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Updated] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
@ 2020-12-16 9:04 ` joey-commits
2020-12-16 9:42 ` joey-commits
` (50 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-16 9:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
There is an updated pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9230 bytes --]
From 4449d43733cc56712376b14ecbd820df1c7e3ab6 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 57 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 -----
srcpkgs/espeak/template | 41 ----------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 63 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..baa4df9f621 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..6a3a0acf3fb
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,57 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+
+pre_configure() {
+ makejobs="-j1"
+ ./autogen.sh
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From 45e6cc52535cee5547d83df338ac2a9b0be1b35c Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From 8369a78f1f0e8e164b9064d79c36689f78533931 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..27c1c943e9f 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,13 +1,13 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
+revision=2
short_desc="A lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
license="GPL-3"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
+makedepends="libespeak-ng-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
build_style="gnu-makefile"
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Updated] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
2020-12-16 9:04 ` [PR PATCH] [Updated] " joey-commits
@ 2020-12-16 9:42 ` joey-commits
2020-12-16 16:13 ` joey-commits
` (49 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-16 9:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
There is an updated pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9083 bytes --]
From b92cba804df0737dc9a1daf9561cff4d1c191001 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 55 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 -----
srcpkgs/espeak/template | 41 ----------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 61 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..baa4df9f621 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..7c3b7360c2e
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,55 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+make_build_args="-j1"
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+
+pre_configure() {
+ ./autogen.sh
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From ac778a5457060a831c565173746dcea27fbfa19b Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From d7b4182040930265618a136558d563a1fe2ff888 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..27c1c943e9f 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,13 +1,13 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
+revision=2
short_desc="A lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
license="GPL-3"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
+makedepends="libespeak-ng-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
build_style="gnu-makefile"
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Updated] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
2020-12-16 9:04 ` [PR PATCH] [Updated] " joey-commits
2020-12-16 9:42 ` joey-commits
@ 2020-12-16 16:13 ` joey-commits
2020-12-16 16:46 ` joey-commits
` (48 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-16 16:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
There is an updated pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9239 bytes --]
From 9c9546c27c874f217fd8102d490e3ac49c2768fe Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 61 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 -----
srcpkgs/espeak/template | 41 ---------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 67 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..baa4df9f621 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..ff1ee3ec868
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,61 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+make_build_args="-j1"
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+
+pre_configure() {
+ ./autogen.sh
+}
+
+post_configure() {
+ #some tests are broken
+ sed -i "/tests\/translate.check /d" Makefile
+ sed -i "/tests\/language-pronunciation.check /d" Makefile
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From c35f5dfb2dac430807b0adc2a306a8e43e982471 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From 8344208d26f8b09f41536d2ca7aedba3703d0e16 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..27c1c943e9f 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,13 +1,13 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
+revision=2
short_desc="A lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
license="GPL-3"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
+makedepends="libespeak-ng-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
build_style="gnu-makefile"
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (2 preceding siblings ...)
2020-12-16 16:13 ` joey-commits
@ 2020-12-16 16:46 ` joey-commits
2020-12-16 17:12 ` ericonr
` (47 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-16 16:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 479 bytes --]
New comment by joey-commits on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-746612391
Comment:
I am not sure how to fix the builds on non-intel arches. I guess its failing because its trying to execute the non-intel binaries on the intel builder as part of the build process. I will do some research and would also appreciate any help if someone has time. I'll try to figure this out but cross compiling is new territory for me.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (3 preceding siblings ...)
2020-12-16 16:46 ` joey-commits
@ 2020-12-16 17:12 ` ericonr
2020-12-16 17:15 ` ericonr
` (46 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: ericonr @ 2020-12-16 17:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 722 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-746656701
Comment:
Please fix the xlint complaints:
```
Run common/travis/xlint.sh
Linting srcpkgs/espeak-ng/template...
srcpkgs/espeak-ng/template: Place checksum= after homepage=
Linting srcpkgs/espeakup/template...
srcpkgs/espeakup/template: Place checksum= after build_style=
srcpkgs/espeakup/template: Place distfiles= after makedepends=
srcpkgs/espeakup/template:5: short_desc should not start with an article
srcpkgs/espeakup/template:7: use SPDX id for 'GPL-3' license or see Manual.md
Linting srcpkgs/speech-dispatcher/template...
Error: Process completed with exit code 1.
```
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (4 preceding siblings ...)
2020-12-16 17:12 ` ericonr
@ 2020-12-16 17:15 ` ericonr
2020-12-16 17:52 ` [PR PATCH] [Updated] " joey-commits
` (45 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: ericonr @ 2020-12-16 17:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 279 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-746662246
Comment:
Argh, solving this might be a bit complicated, but definitely required, since espeak did cross build previously. I will try to poke at it.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Updated] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (5 preceding siblings ...)
2020-12-16 17:15 ` ericonr
@ 2020-12-16 17:52 ` joey-commits
2020-12-16 18:12 ` joey-commits
` (44 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-16 17:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
There is an updated pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9239 bytes --]
From 980ff8f8a2100ed58973840b69f76bea6532333a Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 61 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 -----
srcpkgs/espeak/template | 41 ---------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 67 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..baa4df9f621 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..ef58cb3d902
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,61 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+make_build_args="-j1"
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+
+pre_configure() {
+ ./autogen.sh
+}
+
+post_configure() {
+ #some tests are broken
+ sed -i "/tests\/translate.check /d" Makefile
+ sed -i "/tests\/language-pronunciation.check /d" Makefile
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From 4df458004bfd3c6cc7aebb04e9782f7d3eea4f74 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From 21847624298d4814d2d118e7af7b1cb7e45980cb Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 4 ++--
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..27c1c943e9f 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,13 +1,13 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
+revision=2
short_desc="A lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
license="GPL-3"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
+makedepends="libespeak-ng-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
build_style="gnu-makefile"
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Updated] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (6 preceding siblings ...)
2020-12-16 17:52 ` [PR PATCH] [Updated] " joey-commits
@ 2020-12-16 18:12 ` joey-commits
2020-12-16 19:13 ` joey-commits
` (43 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-16 18:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
There is an updated pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9396 bytes --]
From 980ff8f8a2100ed58973840b69f76bea6532333a Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 61 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 -----
srcpkgs/espeak/template | 41 ---------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 67 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..baa4df9f621 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..ef58cb3d902
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,61 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+make_build_args="-j1"
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+
+pre_configure() {
+ ./autogen.sh
+}
+
+post_configure() {
+ #some tests are broken
+ sed -i "/tests\/translate.check /d" Makefile
+ sed -i "/tests\/language-pronunciation.check /d" Makefile
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From 4df458004bfd3c6cc7aebb04e9782f7d3eea4f74 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From e70094de40f9a4c3e479838b19dc5c8a1a39bd84 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 11 ++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..1a956c73007 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,15 +1,16 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
-short_desc="A lightweight connector for espeak and speakup"
+revision=2
+short_desc="Lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
-license="GPL-3"
+
+makedepends="libespeak-ng-devel"
+build_style="gnu-makefile"
+license="GPL-3.0-or-later"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
-build_style="gnu-makefile"
post_install() {
vsv espeakup
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (7 preceding siblings ...)
2020-12-16 18:12 ` joey-commits
@ 2020-12-16 19:13 ` joey-commits
2020-12-16 19:30 ` ericonr
` (42 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-16 19:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 573 bytes --]
New comment by joey-commits on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-746856482
Comment:
I was looking at the data built by the binaries and it doesn't seem to be archetecture specific. I need to look at a bit more to be sure. I am wondering if I could make a nocross package to build the data files and then pull it in for the real espeak-ng package with hostmakedepends. Then it could be coppied to the build directory before the build and the Makefile would detect that the voice dictionaries are already built.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (8 preceding siblings ...)
2020-12-16 19:13 ` joey-commits
@ 2020-12-16 19:30 ` ericonr
2020-12-16 21:04 ` [PR PATCH] [Updated] " joey-commits
` (41 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: ericonr @ 2020-12-16 19:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 670 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-746883248
Comment:
> I am wondering if I could make a nocross package to build the data files and then pull it in for the real espeak-ng package with hostmakedepends. Then it could be coppied to the build directory before the build and the Makefile would detect that the voice dictionaries are already built.
Doesn't even need to be nocross. I've done exactly this for the `sdcc` package. Something like:
```
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" espeak-ng"
fi
pre_build() {
if [ "$CROSS_BUILD" ]; then
cp -r ....
fi
}
```
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Updated] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (9 preceding siblings ...)
2020-12-16 19:30 ` ericonr
@ 2020-12-16 21:04 ` joey-commits
2020-12-16 21:38 ` joey-commits
` (40 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-16 21:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
There is an updated pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9546 bytes --]
From 2ea32fafdd5a3b9cdc6c7aea07762b1e70b24572 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 68 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 ----
srcpkgs/espeak/template | 41 -------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 74 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..baa4df9f621 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..5892b38dceb
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,68 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+make_build_args="-j1"
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+="espeak-ng"
+fi
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vcopy /usr/share/espeak-ng-data ${xbps_builddir}
+ fi
+ ./autogen.sh
+}
+
+post_configure() {
+ #some tests are broken
+ sed -i "/tests\/translate.check /d" Makefile
+ sed -i "/tests\/language-pronunciation.check /d" Makefile
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From 145f5f8ce78eb539475f1daa6ca4c457a216dba4 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From 90c1bd44dee8f36ae3459124b054d3833a0d81d5 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 11 ++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..1a956c73007 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,15 +1,16 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
-short_desc="A lightweight connector for espeak and speakup"
+revision=2
+short_desc="Lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
-license="GPL-3"
+
+makedepends="libespeak-ng-devel"
+build_style="gnu-makefile"
+license="GPL-3.0-or-later"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
-build_style="gnu-makefile"
post_install() {
vsv espeakup
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Updated] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (10 preceding siblings ...)
2020-12-16 21:04 ` [PR PATCH] [Updated] " joey-commits
@ 2020-12-16 21:38 ` joey-commits
2020-12-16 21:48 ` joey-commits
` (39 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-16 21:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
There is an updated pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9458 bytes --]
From 54e3ad648bd308a662561cb2ad9cad1c9acf988b Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 67 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 ----
srcpkgs/espeak/template | 41 -------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 73 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..baa4df9f621 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..4c1b32cb949
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,67 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+make_build_args="-j1"
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+="espeak-ng"
+fi
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vcopy /usr/share/espeak-ng-data ${xbps_builddir}
+ fi
+ ./autogen.sh
+}
+
+do_check() {
+ #disableall checks because of breakage
+ return
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From 1f42639cf11a181995accef8332c25341a53ad36 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From ea370a31d4956e227611988d2e106565cadab2a5 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 11 ++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..1a956c73007 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,15 +1,16 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
-short_desc="A lightweight connector for espeak and speakup"
+revision=2
+short_desc="Lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
-license="GPL-3"
+
+makedepends="libespeak-ng-devel"
+build_style="gnu-makefile"
+license="GPL-3.0-or-later"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
-build_style="gnu-makefile"
post_install() {
vsv espeakup
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Updated] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (11 preceding siblings ...)
2020-12-16 21:38 ` joey-commits
@ 2020-12-16 21:48 ` joey-commits
2020-12-16 21:59 ` joey-commits
` (38 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-16 21:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
There is an updated pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9459 bytes --]
From 2c9a7ad625f8a618b74baa6daa1da578030e4d5b Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 67 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 ----
srcpkgs/espeak/template | 41 -------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 73 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..baa4df9f621 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..e1db7c9ba18
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,67 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+make_build_args="-j1"
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" espeak-ng"
+fi
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vcopy /usr/share/espeak-ng-data ${xbps_builddir}
+ fi
+ ./autogen.sh
+}
+
+do_check() {
+ #disableall checks because of breakage
+ return
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From ab923c12a584934f46f1d3039136457acb76984e Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From b76fbe8d376fde16f71a1c22c9b1a36cf37b6ed9 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 11 ++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..1a956c73007 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,15 +1,16 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
-short_desc="A lightweight connector for espeak and speakup"
+revision=2
+short_desc="Lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
-license="GPL-3"
+
+makedepends="libespeak-ng-devel"
+build_style="gnu-makefile"
+license="GPL-3.0-or-later"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
-build_style="gnu-makefile"
post_install() {
vsv espeakup
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Updated] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (12 preceding siblings ...)
2020-12-16 21:48 ` joey-commits
@ 2020-12-16 21:59 ` joey-commits
2020-12-17 6:45 ` joey-commits
` (37 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-16 21:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
There is an updated pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9461 bytes --]
From 6c492cfcb2762c7e4721acff337bc5d32224b49b Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 67 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 ----
srcpkgs/espeak/template | 41 -------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 73 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..baa4df9f621 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..66dd5a0eab0
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,67 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+make_build_args="-j1"
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" espeak-ng"
+fi
+
+pre_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vcopy /usr/share/espeak-ng-data "${xbps_builddir}"
+ fi
+ ./autogen.sh
+}
+
+do_check() {
+ #disableall checks because of breakage
+ return
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From acac0e8afa3675e47223eb81e781bcc471fc5d6e Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From 3beb8a71355dbaac67b88f4c25beea26fb218b35 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 11 ++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..1a956c73007 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,15 +1,16 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
-short_desc="A lightweight connector for espeak and speakup"
+revision=2
+short_desc="Lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
-license="GPL-3"
+
+makedepends="libespeak-ng-devel"
+build_style="gnu-makefile"
+license="GPL-3.0-or-later"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
-build_style="gnu-makefile"
post_install() {
vsv espeakup
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Updated] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (13 preceding siblings ...)
2020-12-16 21:59 ` joey-commits
@ 2020-12-17 6:45 ` joey-commits
2020-12-17 14:44 ` [PR REVIEW] " Piraty
` (36 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-17 6:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
There is an updated pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9464 bytes --]
From 83fc2be69fbd8af1011ce1eb067ce70ef4c1713c Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 70 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 ----
srcpkgs/espeak/template | 41 -------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 76 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..baa4df9f621 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..d59a1f32a69
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,70 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+make_build_args="-j1"
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" espeak-ng"
+fi
+
+pre_build() {
+ if [ "$CROSS_BUILD" ]; then
+ cp -r /usr/share/espeak-ng-data .
+ fi
+}
+
+pre_configure() {
+ ./autogen.sh
+}
+
+do_check() {
+ #disableall checks because of breakage
+ return
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From d7d4354405b8f3ea942175ffae78887f2c9140ae Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From 9cb3e6da14b972bcab2fb11d77239b74fb1a2f1e Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 11 ++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..1a956c73007 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,15 +1,16 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
-short_desc="A lightweight connector for espeak and speakup"
+revision=2
+short_desc="Lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
-license="GPL-3"
+
+makedepends="libespeak-ng-devel"
+build_style="gnu-makefile"
+license="GPL-3.0-or-later"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
-build_style="gnu-makefile"
post_install() {
vsv espeakup
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR REVIEW] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (14 preceding siblings ...)
2020-12-17 6:45 ` joey-commits
@ 2020-12-17 14:44 ` Piraty
2020-12-17 14:45 ` Piraty
` (35 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: Piraty @ 2020-12-17 14:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 172 bytes --]
New review comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#discussion_r545117812
Comment:
please xlint this template
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (15 preceding siblings ...)
2020-12-17 14:44 ` [PR REVIEW] " Piraty
@ 2020-12-17 14:45 ` Piraty
2020-12-17 14:55 ` [PR PATCH] [Updated] " joey-commits
` (34 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: Piraty @ 2020-12-17 14:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-747481096
Comment:
if you'd be so kind to ensure arcan's tts build option will work with your changeset
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Updated] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (16 preceding siblings ...)
2020-12-17 14:45 ` Piraty
@ 2020-12-17 14:55 ` joey-commits
2020-12-17 15:05 ` [PR REVIEW] " ericonr
` (33 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-17 14:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
There is an updated pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9631 bytes --]
From aed74cd0262252358bf8a7ba4882e43349479b27 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 72 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 ----
srcpkgs/espeak/template | 41 ------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 78 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..baa4df9f621 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..6cf3c2b5081
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,72 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+make_build_args="-j1"
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" espeak-ng"
+fi
+
+pre_configure() {
+ ./autogen.sh
+}
+
+post_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ sed -i '2785,2818 s_src/espeak-ng_/usr/bin/espeak-ng_' Makefile
+ sed -i '2819,$ s_../src/espeak-ng_/usr/bin/espeak-ng_' Makefile
+ sed -i '3244,$ s_src/espeak-ng_/usr/bin/espeak-ng_' Makefile
+ fi
+}
+
+do_check() {
+ #disableall checks because of breakage
+ return
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From ceb3465f5e0f914306f5248ad65241e65ad19784 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From a7c2299c9f81f4487aa2dddd0d76383aaee1ac0d Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 11 ++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..1a956c73007 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,15 +1,16 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
-short_desc="A lightweight connector for espeak and speakup"
+revision=2
+short_desc="Lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
-license="GPL-3"
+
+makedepends="libespeak-ng-devel"
+build_style="gnu-makefile"
+license="GPL-3.0-or-later"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
-build_style="gnu-makefile"
post_install() {
vsv espeakup
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR REVIEW] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (17 preceding siblings ...)
2020-12-17 14:55 ` [PR PATCH] [Updated] " joey-commits
@ 2020-12-17 15:05 ` ericonr
2020-12-17 15:15 ` joey-commits
` (32 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: ericonr @ 2020-12-17 15:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 394 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#discussion_r545159854
Comment:
I guess just putting the files there didn't work? This is quite unfortunate.
Having numbered seds is quite fragile, though, so ideally we could come up with a patch for it.
Also, indentation of the last `sed` line is too far right by 2 tabs.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (18 preceding siblings ...)
2020-12-17 15:05 ` [PR REVIEW] " ericonr
@ 2020-12-17 15:15 ` joey-commits
2020-12-17 15:21 ` joey-commits
` (31 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-17 15:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 459 bytes --]
New comment by joey-commits on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-747500791
Comment:
I am just glad its building. Gives me hope. Sorry about the indentation issues. I am trying to get better about this, however, indentation is tricky when using a screen reader. It makes me wonder how many other people are actually packaging and programming with Orca instead of a screen. I don't know anyone else.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (19 preceding siblings ...)
2020-12-17 15:15 ` joey-commits
@ 2020-12-17 15:21 ` joey-commits
2020-12-17 15:31 ` ericonr
` (30 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-17 15:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 273 bytes --]
New comment by joey-commits on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-747504325
Comment:
I can definitely do a patch instead. Are you ok with me patching the Makefile after running configure like I am doing with sed?
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (20 preceding siblings ...)
2020-12-17 15:21 ` joey-commits
@ 2020-12-17 15:31 ` ericonr
2020-12-17 15:35 ` joey-commits
` (29 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: ericonr @ 2020-12-17 15:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 667 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-747511409
Comment:
> I am trying to get better about this, however, indentation is tricky when using a screen reader.
I can imagine. If you need any help for the fiinal clean up, I can do a final once over. Thanks for contributing :)
> I can definitely do a patch instead. Are you ok with me patching the Makefile after running configure like I am doing with sed?
Hmm that is indeed not ideal, since it can change dependending on the environment. Can you show me the part you're trying to delete? We can try to come up with a solution.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (21 preceding siblings ...)
2020-12-17 15:31 ` ericonr
@ 2020-12-17 15:35 ` joey-commits
2020-12-17 15:37 ` joey-commits
` (28 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-17 15:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 405 bytes --]
New comment by joey-commits on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-747514345
Comment:
The main problem is that the Makefile calls espeak-ng in a bunch of places. I am simply redirecting it to usr/bin in all those cases so that it runs the copy from the x86_64 package. I am really sorry. i don't know enough about autotools to fix this properly.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (22 preceding siblings ...)
2020-12-17 15:35 ` joey-commits
@ 2020-12-17 15:37 ` joey-commits
2020-12-17 15:48 ` [PR PATCH] [Updated] " joey-commits
` (27 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-17 15:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 270 bytes --]
New comment by joey-commits on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-747515154
Comment:
After espeak-ng is compiled, the binary is used to compile the dictionaries and phoneme data as a part of the make process..
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Updated] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (23 preceding siblings ...)
2020-12-17 15:37 ` joey-commits
@ 2020-12-17 15:48 ` joey-commits
2020-12-17 15:53 ` ericonr
` (26 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-17 15:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
There is an updated pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9626 bytes --]
From 4e731ed6feadf4f42360488d8645ac01cad7f9a6 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 72 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 ----
srcpkgs/espeak/template | 41 ------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 78 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..baa4df9f621 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..bf8bbe74aff
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,72 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+make_build_args="-j1"
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" espeak-ng"
+fi
+
+pre_configure() {
+ ./autogen.sh
+}
+
+post_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ sed -i '2785,2818 s_src/espeak-ng_/usr/bin/espeak-ng_' Makefile
+ sed -i '2819,$ s_../src/espeak-ng_/usr/bin/espeak-ng_' Makefile
+ sed -i '3244,$ s_src/espeak-ng_/usr/bin/espeak-ng_' Makefile
+ fi
+}
+
+do_check() {
+ #disableall checks because of breakage
+ return
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From 28f813b78f4cbffb11e858b456c20cbe6e11e56d Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From 22982a80a7a26de75fbad471948cf5fb1207b044 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 10 +++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..965347b3a6b 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,15 +1,15 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
-short_desc="A lightweight connector for espeak and speakup"
+revision=2
+short_desc="Lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
-license="GPL-3"
+makedepends="libespeak-ng-devel"
+build_style="gnu-makefile"
+license="GPL-3.0-or-later"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
-build_style="gnu-makefile"
post_install() {
vsv espeakup
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (24 preceding siblings ...)
2020-12-17 15:48 ` [PR PATCH] [Updated] " joey-commits
@ 2020-12-17 15:53 ` ericonr
2020-12-17 15:53 ` ericonr
` (25 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: ericonr @ 2020-12-17 15:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 533 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-747526479
Comment:
Ah! Got it.
I think if we can make the rules a bit more specific, it won't be necessary to specify the line numbers. I will try to build it locally to see if I can come up with one, but I think `vsed -e "s_\ts_src/espeak-ng_/usr/bin/espeak-ng_" -i Makefile` might do the trick (plus a rule with `../s_src/espeak-ng`.
By the way, do you think we could use a symlink in `/usr/bin/espeak`?
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (25 preceding siblings ...)
2020-12-17 15:53 ` ericonr
@ 2020-12-17 15:53 ` ericonr
2020-12-17 15:53 ` ericonr
` (24 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: ericonr @ 2020-12-17 15:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 548 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-747526479
Comment:
Ah! Got it.
I think if we can make the rules a bit more specific, it won't be necessary to specify the line numbers. I will try to build it locally to see if I can come up with one, but I think
```
vsed -e "s_\ts_src/espeak-ng_/usr/bin/espeak-ng_" -i Makefile
```
might do the trick (plus a rule with `../s_src/espeak-ng`.
By the way, do you think we could use a symlink in `/usr/bin/espeak`?
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (26 preceding siblings ...)
2020-12-17 15:53 ` ericonr
@ 2020-12-17 15:53 ` ericonr
2020-12-17 15:54 ` [PR PATCH] [Updated] " joey-commits
` (23 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: ericonr @ 2020-12-17 15:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 549 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-747526479
Comment:
Ah! Got it.
I think if we can make the rules a bit more specific, it won't be necessary to specify the line numbers. I will try to build it locally to see if I can come up with one, but I think
```
vsed -e "s_\ts_src/espeak-ng_/usr/bin/espeak-ng_" -i Makefile
```
might do the trick (plus a rule with `../s_src/espeak-ng`).
By the way, do you think we could use a symlink in `/usr/bin/espeak`?
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Updated] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (27 preceding siblings ...)
2020-12-17 15:53 ` ericonr
@ 2020-12-17 15:54 ` joey-commits
2020-12-17 16:10 ` joey-commits
` (22 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-17 15:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
There is an updated pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9626 bytes --]
From 4e731ed6feadf4f42360488d8645ac01cad7f9a6 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 72 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 ----
srcpkgs/espeak/template | 41 ------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 78 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..baa4df9f621 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..bf8bbe74aff
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,72 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+make_build_args="-j1"
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" espeak-ng"
+fi
+
+pre_configure() {
+ ./autogen.sh
+}
+
+post_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ sed -i '2785,2818 s_src/espeak-ng_/usr/bin/espeak-ng_' Makefile
+ sed -i '2819,$ s_../src/espeak-ng_/usr/bin/espeak-ng_' Makefile
+ sed -i '3244,$ s_src/espeak-ng_/usr/bin/espeak-ng_' Makefile
+ fi
+}
+
+do_check() {
+ #disableall checks because of breakage
+ return
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From 28f813b78f4cbffb11e858b456c20cbe6e11e56d Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From 72ad066c58252aaa833a3993175c52d718d29f6e Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 10 +++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..6cbc9d0da55 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,15 +1,15 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
-short_desc="A lightweight connector for espeak and speakup"
+revision=2
+build_style="gnu-makefile"
+makedepends="libespeak-ng-devel"
+short_desc="Lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
-build_style="gnu-makefile"
post_install() {
vsv espeakup
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (28 preceding siblings ...)
2020-12-17 15:54 ` [PR PATCH] [Updated] " joey-commits
@ 2020-12-17 16:10 ` joey-commits
2020-12-17 16:48 ` joey-commits
` (21 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-17 16:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
New comment by joey-commits on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-747538711
Comment:
I think a simlink pointing from /usr/bin/espeak to /usr/bin/espeak-ng could be nice. I will add that to the espeak-ng package. Thanks so much for your help with this. Espeak-ng works so much better with my reader and it will be nice to have it in the repositories.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (29 preceding siblings ...)
2020-12-17 16:10 ` joey-commits
@ 2020-12-17 16:48 ` joey-commits
2020-12-17 16:54 ` joey-commits
` (20 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-17 16:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 417 bytes --]
New comment by joey-commits on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-747561510
Comment:
@piraty Is there any way you could help me test Arcan? It looks like an alternative display server. I think my screen reader depends on Xorg and may not run in Arcan. From what I can tell, it ships with its own desktop and I think Orca only supports Gnome, Mate and XFCE.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (30 preceding siblings ...)
2020-12-17 16:48 ` joey-commits
@ 2020-12-17 16:54 ` joey-commits
2020-12-17 21:30 ` Piraty
` (19 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-17 16:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 289 bytes --]
New comment by joey-commits on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-747565209
Comment:
A quick grep of the Arcan sources shows that it uses a header that espeak-ng ships for backwards compatibility. I would think it would work ok.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (31 preceding siblings ...)
2020-12-17 16:54 ` joey-commits
@ 2020-12-17 21:30 ` Piraty
2020-12-17 21:32 ` Piraty
` (18 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: Piraty @ 2020-12-17 21:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 301 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-747713799
Comment:
for now it's enough if arcan builds and correctly links the espeak-ng, as it's just an opt-in build option it's for custom use cases anyway. thanks for you work!
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (32 preceding siblings ...)
2020-12-17 21:30 ` Piraty
@ 2020-12-17 21:32 ` Piraty
2020-12-18 7:55 ` [PR PATCH] [Updated] " joey-commits
` (17 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: Piraty @ 2020-12-17 21:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 390 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-747713799
Comment:
for now it's enough if arcan builds and correctly links the espeak-ng, as it's just an opt-in build option it's for custom use cases anyway. in case it breaks the build option, you don't need to care for now and i can take over. thanks for your work!
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Updated] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (33 preceding siblings ...)
2020-12-17 21:32 ` Piraty
@ 2020-12-18 7:55 ` joey-commits
2020-12-18 9:19 ` joey-commits
` (16 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-18 7:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
There is an updated pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9645 bytes --]
From 7c432684daf3b8ccafa1929983b20dd1f704a1ae Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 72 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 ----
srcpkgs/espeak/template | 41 ------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 78 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index 76b3f458b15..baa4df9f621 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..800da8e01d5
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,72 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+make_build_args="-j1"
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" espeak-ng"
+fi
+
+pre_configure() {
+ ./autogen.sh
+}
+
+post_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i '\_dict:\ src/espeak-ng_ s_src/espeak-ng_/usr/bin/espeak-ng_' Makefile
+ vsed -i "s_../src/espeak-ng_/usr/bin/espeak-ng_" -i Makefile
+ vsed -i '\_--compile_ s_src/espeak-ng_/usr/bin/espeak-ng_' Makefile
+ fi
+}
+
+do_check() {
+ #disableall checks because of breakage
+ return
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From 93ac5a6ae64d6f4ec239bf553bed0e5e90e9b6e3 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From 453bfd4fef2dcfabd4a2867dc4e9bed62c94979f Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 10 +++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..6cbc9d0da55 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,15 +1,15 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
-short_desc="A lightweight connector for espeak and speakup"
+revision=2
+build_style="gnu-makefile"
+makedepends="libespeak-ng-devel"
+short_desc="Lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
-build_style="gnu-makefile"
post_install() {
vsv espeakup
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Updated] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (34 preceding siblings ...)
2020-12-18 7:55 ` [PR PATCH] [Updated] " joey-commits
@ 2020-12-18 9:19 ` joey-commits
2020-12-18 14:34 ` joey-commits
` (15 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-18 9:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
There is an updated pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9645 bytes --]
From b8d618388edb7216287228f41169cc93bb4034aa Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 72 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 ----
srcpkgs/espeak/template | 41 ------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 78 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index f94a891d6fd..438701aeb55 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..800da8e01d5
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,72 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+make_build_args="-j1"
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" espeak-ng"
+fi
+
+pre_configure() {
+ ./autogen.sh
+}
+
+post_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i '\_dict:\ src/espeak-ng_ s_src/espeak-ng_/usr/bin/espeak-ng_' Makefile
+ vsed -i "s_../src/espeak-ng_/usr/bin/espeak-ng_" -i Makefile
+ vsed -i '\_--compile_ s_src/espeak-ng_/usr/bin/espeak-ng_' Makefile
+ fi
+}
+
+do_check() {
+ #disableall checks because of breakage
+ return
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From 62048abcd6005b89afc85257907b50b40612f4f2 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From bd026e5d60819fe0220cc9fe0b4a444d8afd22e6 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 10 +++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..6cbc9d0da55 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,15 +1,15 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
-short_desc="A lightweight connector for espeak and speakup"
+revision=2
+build_style="gnu-makefile"
+makedepends="libespeak-ng-devel"
+short_desc="Lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
-build_style="gnu-makefile"
post_install() {
vsv espeakup
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (35 preceding siblings ...)
2020-12-18 9:19 ` joey-commits
@ 2020-12-18 14:34 ` joey-commits
2020-12-18 14:46 ` joey-commits
` (14 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-18 14:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 417 bytes --]
New comment by joey-commits on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-748116121
Comment:
Hey, I was wondering if there are any further changes you think we would need before this can enter the repo. I think the tests failed du to pulseaudio 14 tests. I replaced the line numbers with searches and substitutions like we discussed. Thanks again for all the help!
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (36 preceding siblings ...)
2020-12-18 14:34 ` joey-commits
@ 2020-12-18 14:46 ` joey-commits
2020-12-18 20:06 ` ericonr
` (13 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-18 14:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
New comment by joey-commits on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-748122747
Comment:
I mean the packages failed to build due to pulseaudio tests failing not my packages not building.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (37 preceding siblings ...)
2020-12-18 14:46 ` joey-commits
@ 2020-12-18 20:06 ` ericonr
2020-12-18 20:17 ` joey-commits
` (12 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: ericonr @ 2020-12-18 20:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-748294730
Comment:
I'm re-running all CI jobs, then. How can I test the package?
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (38 preceding siblings ...)
2020-12-18 20:06 ` ericonr
@ 2020-12-18 20:17 ` joey-commits
2020-12-18 22:04 ` [PR PATCH] [Updated] " joey-commits
` (11 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-18 20:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 376 bytes --]
New comment by joey-commits on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-748299028
Comment:
You can test espeak-ng by typing:
espeak-ng "testing testing"
which will play speech through your sound card.
Alternatively:
espeak-ng "testing testing" -w output.wav
will generate a PCM audio file with the speech.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Updated] new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (39 preceding siblings ...)
2020-12-18 20:17 ` joey-commits
@ 2020-12-18 22:04 ` joey-commits
2020-12-18 23:47 ` joey-commits
` (10 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-18 22:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 832 bytes --]
There is an updated pull request by joey-commits against master on the void-packages repository
https://github.com/joey-commits/void-packages espeak-ng-final
https://github.com/void-linux/void-packages/pull/27193
new package: espeak-ng-1.50
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
A patch file from https://github.com/void-linux/void-packages/pull/27193.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-espeak-ng-final-27193.patch --]
[-- Type: text/x-diff, Size: 9645 bytes --]
From a2944613df9db460e8ce91bf2913e0d7bee2295e Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 17:56:52 -0500
Subject: [PATCH 1/3] New package: espeak-ng-1.50
Add dummy packages for espeak for a smooth upgrade to espeak-ng
---
common/shlibs | 2 +-
srcpkgs/espeak | 1 +
srcpkgs/espeak-ng/template | 72 ++++++++++++++++++++++
srcpkgs/espeak/patches/fix-narrowing.patch | 12 ----
srcpkgs/espeak/template | 41 ------------
srcpkgs/libespeak | 2 +-
srcpkgs/libespeak-devel | 2 +-
srcpkgs/libespeak-ng | 1 +
srcpkgs/libespeak-ng-devel | 1 +
9 files changed, 78 insertions(+), 56 deletions(-)
create mode 120000 srcpkgs/espeak
create mode 100644 srcpkgs/espeak-ng/template
delete mode 100644 srcpkgs/espeak/patches/fix-narrowing.patch
delete mode 100644 srcpkgs/espeak/template
create mode 120000 srcpkgs/libespeak-ng
create mode 120000 srcpkgs/libespeak-ng-devel
diff --git a/common/shlibs b/common/shlibs
index f94a891d6fd..438701aeb55 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2121,7 +2121,7 @@ libuniconf.so.4.6 wvstreams-4.6.1_2
libwvbase.so.4.6 wvstreams-4.6.1_1
libwvutils.so.4.6 wvstreams-4.6.1_1
libwvstreams.so.4.6 wvstreams-4.6.1_1
-libespeak.so.1 libespeak-1.48.04_1
+libespeak-ng.so.1 libespeak-ng-1.50_1
libKF5Plotting.so.5 kplotting-5.26.0_1
libpgf.so.6 libpgf-6.14.12_1
libqhull_p.so.7 libqhull-2015.2_1
diff --git a/srcpkgs/espeak b/srcpkgs/espeak
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/espeak
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/espeak-ng/template b/srcpkgs/espeak-ng/template
new file mode 100644
index 00000000000..800da8e01d5
--- /dev/null
+++ b/srcpkgs/espeak-ng/template
@@ -0,0 +1,72 @@
+# Template file for 'espeak-ng'
+pkgname=espeak-ng
+version=1.50
+revision=1
+build_style=gnu-configure
+make_build_args="-j1"
+hostmakedepends="automake libtool which pkg-config"
+makedepends="pcaudiolib-devel libsonic-devel"
+short_desc="Text to Speech engine"
+maintainer="Joey <joey@imap.cc>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/espeak-ng/espeak-ng/"
+distfiles="https://github.com/espeak-ng/espeak-ng/archive/${version}.tar.gz"
+checksum=5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
+
+if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" espeak-ng"
+fi
+
+pre_configure() {
+ ./autogen.sh
+}
+
+post_configure() {
+ if [ "$CROSS_BUILD" ]; then
+ vsed -i '\_dict:\ src/espeak-ng_ s_src/espeak-ng_/usr/bin/espeak-ng_' Makefile
+ vsed -i "s_../src/espeak-ng_/usr/bin/espeak-ng_" -i Makefile
+ vsed -i '\_--compile_ s_src/espeak-ng_/usr/bin/espeak-ng_' Makefile
+ fi
+}
+
+do_check() {
+ #disableall checks because of breakage
+ return
+}
+
+libespeak-ng_package() {
+ short_desc+=" - runtime libraries"
+ pkg_install() {
+ vmove "usr/lib/*.so.*"
+ vmove usr/share/espeak-ng-data
+ }
+}
+
+libespeak-ng-devel_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove "usr/lib/*.a"
+ vmove "usr/lib/*.so"
+ vmove "/usr/lib/pkgconfig"
+ }
+}
+
+espeak_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak_package() {
+ depends="libespeak-ng>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
+
+libespeak-devel_package() {
+ depends="libespeak-ng-devel>=${version}_${revision}"
+ build_style=meta
+ short_desc+=" (transitional dummy package)"
+}
diff --git a/srcpkgs/espeak/patches/fix-narrowing.patch b/srcpkgs/espeak/patches/fix-narrowing.patch
deleted file mode 100644
index 20ffb58d8d1..00000000000
--- a/srcpkgs/espeak/patches/fix-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/tr_languages.cpp
-+++ src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore
- 0x200d, 1, // zero width joiner
- 0, 0 };
-
--const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8
-
-
- static Translator* NewTranslator(void)
-
diff --git a/srcpkgs/espeak/template b/srcpkgs/espeak/template
deleted file mode 100644
index 354ae5d6988..00000000000
--- a/srcpkgs/espeak/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'espeak'
-pkgname=espeak
-version=1.48.04
-revision=5
-wrksrc="${pkgname}-${version}-source"
-build_wrksrc=src
-build_style=gnu-makefile
-hostmakedepends="unzip"
-makedepends="pulseaudio-devel portaudio-devel"
-short_desc="Text to Speech engine"
-maintainer="Martin Riese <grauehaare@gmx.de>"
-license="GPL-3.0-or-later"
-homepage="http://espeak.sourceforge.net"
-distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.zip"
-checksum=bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659
-
-pre_configure() {
- cp portaudio19.h portaudio.h
-}
-
-do_build() {
- make CXX=$CXX CXXFLAGS="$CXXFLAGS" AUDIO=runtime
-}
-
-libespeak_package() {
- short_desc+=" - runtime libraries"
- pkg_install() {
- vmove "usr/lib/*.so.*"
- vmove usr/share/espeak-data
- }
-}
-
-libespeak-devel_package() {
- depends="${makedepends} libespeak>=${version}_${revision}"
- short_desc+=" - development files"
- pkg_install() {
- vmove usr/include
- vmove "usr/lib/*.a"
- vmove "usr/lib/*.so"
- }
-}
diff --git a/srcpkgs/libespeak b/srcpkgs/libespeak
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak
+++ b/srcpkgs/libespeak
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-devel b/srcpkgs/libespeak-devel
index d2da11f512f..95020f74cea 120000
--- a/srcpkgs/libespeak-devel
+++ b/srcpkgs/libespeak-devel
@@ -1 +1 @@
-espeak
\ No newline at end of file
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng b/srcpkgs/libespeak-ng
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
diff --git a/srcpkgs/libespeak-ng-devel b/srcpkgs/libespeak-ng-devel
new file mode 120000
index 00000000000..95020f74cea
--- /dev/null
+++ b/srcpkgs/libespeak-ng-devel
@@ -0,0 +1 @@
+espeak-ng
\ No newline at end of file
From deca339246ee02bae52dcae873eabaaa17c77425 Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Mon, 14 Dec 2020 18:11:28 -0500
Subject: [PATCH 2/3] speech-dispatcher: Rebuild and switch to espeak-ng
---
srcpkgs/speech-dispatcher/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/speech-dispatcher/template b/srcpkgs/speech-dispatcher/template
index 5bc0921f263..810692a434b 100644
--- a/srcpkgs/speech-dispatcher/template
+++ b/srcpkgs/speech-dispatcher/template
@@ -1,7 +1,7 @@
# Template file for 'speech-dispatcher'
pkgname=speech-dispatcher
version=0.10.1
-revision=2
+revision=3
wrksrc="speechd-${version}"
build_style=gnu-configure
# Disable support for sundry non-free TTS systems (said support causes
@@ -10,7 +10,8 @@ configure_args="--disable-static --without-kali --without-ibmtts --without-barat
hostmakedepends="automake libtool gettext-devel
pkg-config intltool python3-devel texinfo"
makedepends="libltdl-devel glib-devel dotconf-devel
- libsndfile-devel libespeak-devel libao-devel python3-devel"
+ libsndfile-devel libespeak-ng-devel libao-devel python3-devel
+ libsonic-devel pulseaudio-devel"
depends="python3"
short_desc="High-level device independent layer for speech synthesis interface"
maintainer="Orphaned <orphan@voidlinux.org>"
From bf4e2e89d0792ce8847405e1ac9fb0ea685f957e Mon Sep 17 00:00:00 2001
From: joey <joey@imap.cc>
Date: Tue, 15 Dec 2020 22:34:45 -0500
Subject: [PATCH 3/3] espeakup: fix makefile and rebuild for espeak-ng
---
srcpkgs/espeakup/patches/use-with-espeak-ng.patch | 11 +++++++++++
srcpkgs/espeakup/template | 10 +++++-----
2 files changed, 16 insertions(+), 5 deletions(-)
create mode 100644 srcpkgs/espeakup/patches/use-with-espeak-ng.patch
diff --git a/srcpkgs/espeakup/patches/use-with-espeak-ng.patch b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
new file mode 100644
index 00000000000..c974d99a66f
--- /dev/null
+++ b/srcpkgs/espeakup/patches/use-with-espeak-ng.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig 2020-12-15 20:40:30.660983776 -0500
++++ Makefile 2020-12-15 20:41:07.473982625 -0500
+@@ -6,7 +6,7 @@
+ WARNFLAGS = -Wall
+ CFLAGS += ${DEPFLAGS} ${WARNFLAGS}
+
+-LDLIBS = -lespeak -lpthread
++LDLIBS = -lespeak-ng -lpthread
+
+ INSTALL = install
+ BINMODE = 0755
diff --git a/srcpkgs/espeakup/template b/srcpkgs/espeakup/template
index aa5e2036295..6cbc9d0da55 100644
--- a/srcpkgs/espeakup/template
+++ b/srcpkgs/espeakup/template
@@ -1,15 +1,15 @@
# Template file for 'espeakup'
pkgname=espeakup
version=0.80
-revision=1
-short_desc="A lightweight connector for espeak and speakup"
+revision=2
+build_style="gnu-makefile"
+makedepends="libespeak-ng-devel"
+short_desc="Lightweight connector for espeak and speakup"
maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
-license="GPL-3"
+license="GPL-3.0-or-later"
homepage="https://github.com/williamh/espeakup"
distfiles="https://github.com/williamh/espeakup/archive/v${version}.tar.gz"
-makedepends="libespeak-devel"
checksum="4de284e30b6bdb0f9dee9c8ea02d13a3d20a61415b812338446b8b381e997ef4"
-build_style="gnu-makefile"
post_install() {
vsv espeakup
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (40 preceding siblings ...)
2020-12-18 22:04 ` [PR PATCH] [Updated] " joey-commits
@ 2020-12-18 23:47 ` joey-commits
2020-12-19 3:02 ` ericonr
` (9 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-18 23:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
New comment by joey-commits on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-748376200
Comment:
Looks like this is passing since pulse 14 hit the repos. That is good news.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (41 preceding siblings ...)
2020-12-18 23:47 ` joey-commits
@ 2020-12-19 3:02 ` ericonr
2020-12-19 3:08 ` ericonr
` (8 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: ericonr @ 2020-12-19 3:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 538 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-748409797
Comment:
@joey-commits
Another espeak user (over IRC) asked that we keep both espeak and espeak-ng as options, since they had heard that espeak-ng had some issues with latency. What are your thoughts on that? If you think it's ok but don't want to work on the template, I can try to get it going. I believe it would be possible to have both available, including as a build option for speech-dispatcher.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (42 preceding siblings ...)
2020-12-19 3:02 ` ericonr
@ 2020-12-19 3:08 ` ericonr
2020-12-19 3:20 ` joey-commits
` (7 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: ericonr @ 2020-12-19 3:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 244 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-748410358
Comment:
I'd imagine it doesn't integrate nearly as well, but have you tried `mimic`? It sounds reasonably good.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (43 preceding siblings ...)
2020-12-19 3:08 ` ericonr
@ 2020-12-19 3:20 ` joey-commits
2020-12-19 3:23 ` joey-commits
` (6 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-19 3:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 841 bytes --]
New comment by joey-commits on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-748411709
Comment:
I would be ok with keeping espeak but I would be very interested to learn the use case. Since espeak is not maintained any more, I would much rather keep espeak around until we can fix all issues and then migrate. I certainly wouldn't want to break someones workflow.
I know that speech dispatcher has been less latent with espeak-ng for a long time. I also applied patches to pcaudilib to ensure that espeak-ng would be less latent with espeakup. The patches that I applied fix two problems with espeakup which are latency and overlapping audio. I tested espeakup for a while today to ensure that it was reliable since I actually have friends who use it even though I am mostly an Orca user.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (44 preceding siblings ...)
2020-12-19 3:20 ` joey-commits
@ 2020-12-19 3:23 ` joey-commits
2020-12-19 3:25 ` joey-commits
` (5 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-19 3:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 728 bytes --]
New comment by joey-commits on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-748411980
Comment:
The problem with keeping both around is that you can only build espeakup against one or the other. I have been thinking about wanting to migrate to espeak-ng for a long time but I knew about the espeakup issues. I didn't want to make a pull request until I was sure those issues were solved. One of the accessibility folks who works on the debian project solved the accessibility issues with espeakup.. If there is another thing though that is broken that I don't know about, lets the use case and wait to migrate until we can be sure it is solved. Having both around will be messy.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (45 preceding siblings ...)
2020-12-19 3:23 ` joey-commits
@ 2020-12-19 3:25 ` joey-commits
2020-12-19 3:47 ` ericonr
` (4 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: joey-commits @ 2020-12-19 3:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 bytes --]
New comment by joey-commits on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-748412151
Comment:
Could the user comment on the pull request here? I think it would be good to keep a record of the issues people have on this pull request so that we can think about and solve them.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (46 preceding siblings ...)
2020-12-19 3:25 ` joey-commits
@ 2020-12-19 3:47 ` ericonr
2020-12-19 21:36 ` CMB
` (3 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: ericonr @ 2020-12-19 3:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 630 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-748413947
Comment:
> One of the accessibility folks who works on the debian project solved the accessibility issues with espeakup..
That's nice to hear!
What I was considering was adding a new espeak-ng package which doesn't replace espeak, and adding a build option to espeakup to allow it to be built with either, but make espeak-ng the default. The only disadvantage is that an espeak user who hasn't heard about espeak-ng won't get an update.
I asked them to comment, but haven't heard back yet.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (47 preceding siblings ...)
2020-12-19 3:47 ` ericonr
@ 2020-12-19 21:36 ` CMB
2020-12-19 21:57 ` CMB
` (2 subsequent siblings)
51 siblings, 0 replies; 53+ messages in thread
From: CMB @ 2020-12-19 21:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 230 bytes --]
New comment by CMB on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-748528802
Comment:
I've been testing this PR. There are no latency issues anymore. I
whole-heartedly approve.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (48 preceding siblings ...)
2020-12-19 21:36 ` CMB
@ 2020-12-19 21:57 ` CMB
2020-12-19 22:27 ` ericonr
2020-12-20 19:30 ` [PR PATCH] [Closed]: " Piraty
51 siblings, 0 replies; 53+ messages in thread
From: CMB @ 2020-12-19 21:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New comment by CMB on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-748530640
Comment:
BTW this is teiresias from freenode.
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (49 preceding siblings ...)
2020-12-19 21:57 ` CMB
@ 2020-12-19 22:27 ` ericonr
2020-12-20 19:30 ` [PR PATCH] [Closed]: " Piraty
51 siblings, 0 replies; 53+ messages in thread
From: ericonr @ 2020-12-19 22:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27193#issuecomment-748533466
Comment:
Yay! Thank you very much for checking :)
^ permalink raw reply [flat|nested] 53+ messages in thread
* Re: [PR PATCH] [Closed]: new package: espeak-ng-1.50
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
` (50 preceding siblings ...)
2020-12-19 22:27 ` ericonr
@ 2020-12-20 19:30 ` Piraty
51 siblings, 0 replies; 53+ messages in thread
From: Piraty @ 2020-12-20 19:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 658 bytes --]
There's a closed pull request on the void-packages repository
new package: espeak-ng-1.50
https://github.com/void-linux/void-packages/pull/27193
Description:
Speech Dispatcher and espeakup were also corrected to build against the new espeak-ng
I used dummy packages to replace Espeak on installed machines. The idea was gained from polkit-elogind, however, I am open to doing something else if it is prefered. Apparently, the author of espeak could not be contacted and espeak-ng was created a few years ago to continue development.
I have been using these packages with my screen readers for a few hours and everything seems like its working so far.
^ permalink raw reply [flat|nested] 53+ messages in thread
end of thread, other threads:[~2020-12-20 19:30 UTC | newest]
Thread overview: 53+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-16 8:34 [PR PATCH] new package: espeak-ng-1.50 joey-commits
2020-12-16 9:04 ` [PR PATCH] [Updated] " joey-commits
2020-12-16 9:42 ` joey-commits
2020-12-16 16:13 ` joey-commits
2020-12-16 16:46 ` joey-commits
2020-12-16 17:12 ` ericonr
2020-12-16 17:15 ` ericonr
2020-12-16 17:52 ` [PR PATCH] [Updated] " joey-commits
2020-12-16 18:12 ` joey-commits
2020-12-16 19:13 ` joey-commits
2020-12-16 19:30 ` ericonr
2020-12-16 21:04 ` [PR PATCH] [Updated] " joey-commits
2020-12-16 21:38 ` joey-commits
2020-12-16 21:48 ` joey-commits
2020-12-16 21:59 ` joey-commits
2020-12-17 6:45 ` joey-commits
2020-12-17 14:44 ` [PR REVIEW] " Piraty
2020-12-17 14:45 ` Piraty
2020-12-17 14:55 ` [PR PATCH] [Updated] " joey-commits
2020-12-17 15:05 ` [PR REVIEW] " ericonr
2020-12-17 15:15 ` joey-commits
2020-12-17 15:21 ` joey-commits
2020-12-17 15:31 ` ericonr
2020-12-17 15:35 ` joey-commits
2020-12-17 15:37 ` joey-commits
2020-12-17 15:48 ` [PR PATCH] [Updated] " joey-commits
2020-12-17 15:53 ` ericonr
2020-12-17 15:53 ` ericonr
2020-12-17 15:53 ` ericonr
2020-12-17 15:54 ` [PR PATCH] [Updated] " joey-commits
2020-12-17 16:10 ` joey-commits
2020-12-17 16:48 ` joey-commits
2020-12-17 16:54 ` joey-commits
2020-12-17 21:30 ` Piraty
2020-12-17 21:32 ` Piraty
2020-12-18 7:55 ` [PR PATCH] [Updated] " joey-commits
2020-12-18 9:19 ` joey-commits
2020-12-18 14:34 ` joey-commits
2020-12-18 14:46 ` joey-commits
2020-12-18 20:06 ` ericonr
2020-12-18 20:17 ` joey-commits
2020-12-18 22:04 ` [PR PATCH] [Updated] " joey-commits
2020-12-18 23:47 ` joey-commits
2020-12-19 3:02 ` ericonr
2020-12-19 3:08 ` ericonr
2020-12-19 3:20 ` joey-commits
2020-12-19 3:23 ` joey-commits
2020-12-19 3:25 ` joey-commits
2020-12-19 3:47 ` ericonr
2020-12-19 21:36 ` CMB
2020-12-19 21:57 ` CMB
2020-12-19 22:27 ` ericonr
2020-12-20 19:30 ` [PR PATCH] [Closed]: " Piraty
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).