diff --git a/common/shlibs b/common/shlibs index d22e78c0051..079e0ebe5d0 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2118,7 +2118,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 " +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 " -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