From 2ea32fafdd5a3b9cdc6c7aea07762b1e70b24572 Mon Sep 17 00:00:00 2001 From: joey 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 " +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 " -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 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 " From 90c1bd44dee8f36ae3459124b054d3833a0d81d5 Mon Sep 17 00:00:00 2001 From: joey 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 " -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