fix(espeak): switch to new src url and update to 1.51

- enable async too: `pthread_cancel` was removed

Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>

packages/espeak/build.sh

@@ -3,44 +3,38 @@ TERMUX_PKG_DESCRIPTION="Compact software speech synthesizer"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
 # Use eSpeak NG as the original eSpeak project is dead.
-# See https://github.com/espeak-ng/espeak-ng/issues/180
+TERMUX_PKG_VERSION="1.51"
-# about cross compilation of espeak-ng.
+TERMUX_PKG_SRCURL="https://github.com/espeak-ng/espeak-ng/archive/${TERMUX_PKG_VERSION}.tar.gz"
-TERMUX_PKG_VERSION=1.50
+TERMUX_PKG_SHA256=f0e028f695a8241c4fa90df7a8c8c5d68dcadbdbc91e758a97e594bbb0a3bdbf
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SRCURL=https://github.com/espeak-ng/espeak-ng/releases/download/$TERMUX_PKG_VERSION/espeak-ng-$TERMUX_PKG_VERSION.tgz
-TERMUX_PKG_SHA256=80ee6cd06fcd61888951ab49362b400e80dd1fac352a8b1131d90cfe8a210edb
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="pcaudiolib"
 TERMUX_PKG_BREAKS="espeak-dev"
 TERMUX_PKG_REPLACES="espeak-dev"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_HOSTBUILD=true
-TERMUX_PKG_RM_AFTER_INSTALL="lib/*ng-test*"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--with-async --with-pcaudiolib"
-# --without-async due to that using pthread_cancel().
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--without-async --with-pcaudiolib"
 
 termux_step_post_get_source() {
 	# Certain packages are not safe to build on device because their
 	# build.sh script deletes specific files in $TERMUX_PREFIX.
-	if $TERMUX_ON_DEVICE_BUILD; then
+	if ${TERMUX_ON_DEVICE_BUILD}; then
-		termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds."
+		termux_error_exit "Package '${TERMUX_PKG_NAME}' is not safe for on-device builds."
 	fi
 
 	./autogen.sh
 }
 
 termux_step_host_build() {
-	cp -Rf $TERMUX_PKG_SRCDIR/* .
+	cd "${TERMUX_PKG_SRCDIR}" || exit 1
-	unset MAKEFLAGS
+	./configure && make
-	./configure --prefix=$TERMUX_PREFIX
-	make -j$TERMUX_MAKE_PROCESSES src/{e,}speak-ng
-
 	# Man pages require the ronn ruby program.
 	#make src/espeak-ng.1
 	#cp src/espeak-ng.1 $TERMUX_PREFIX/share/man/man1
 	#(cd $TERMUX_PREFIX/share/man/man1 && ln -s -f espeak-ng.1 espeak.1)
+}
 
-	make install
+termux_step_make() {
+	make -B src/{e,}speak-ng
 }
 
 termux_step_pre_configure() {
@@ -48,14 +42,9 @@ termux_step_pre_configure() {
 	CFLAGS=${CFLAGS/Oz/Os}
 }
 
-termux_step_make() {
-	# Prevent caching of host build:
-	rm -Rf $TERMUX_PKG_HOSTBUILD_DIR
-	make -j$TERMUX_MAKE_PROCESSES src/{e,}speak-ng
-}
-
 termux_step_make_install() {
-	rm $TERMUX_PREFIX/bin/{e,}speak{,-ng}
+	# Calling make install directly tends to build lang data files again but with cross compiled espeak-ng.
-	cp src/.libs/espeak-ng $TERMUX_PREFIX/bin/espeak
+	# So use make install-data which will install the data files compiled with previously built espeak-ng
-	cp src/.libs/libespeak-ng.so $TERMUX_PREFIX/lib/libespeak-ng.so.1.1.49
+	# in host build step.
+	make install-data install-exec
 }

packages/espeak/compat-stdint.h.patch

@@ -1,12 +0,0 @@
-diff -u -r ../espeak-ng-1.49.1/src/include/compat/stdint.h ./src/include/compat/stdint.h
---- ../espeak-ng-1.49.1/src/include/compat/stdint.h	2017-01-21 21:57:13.000000000 +0100
-+++ ./src/include/compat/stdint.h	2017-02-01 00:28:46.687277703 +0100
-@@ -19,6 +19,8 @@
- #ifndef STDINT_H_COMPAT_SHIM
- #define STDINT_H_COMPAT_SHIM
- 
-+#include "config.h"
-+
- #ifdef _MSC_VER
- 
- #if _MSC_VER >= 1600 // Visual C++ 10 (Visual Studio 2010) and above...