espeak-ng: port ready to be imported to Pkgsrc.

[adr <adr%sdf.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	adr <adr%sdf.org@localhost>
Pushed By:	adr
Date:		Mon Mar 11 01:15:55 2024 +0000
Changeset:	7cb5512f63c825862a12d1caa4790a139666c99b

Modified Files:
	espeak-ng/buildlink3.mk
	espeak-ng/distinfo
	espeak-ng/patches/patch-src_libespeak-ng_spect.c
Added Files:
	espeak-ng/patches/patch-src_libespeak-ng_speech.c

Log Message:
espeak-ng: port ready to be imported to Pkgsrc.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=7cb5512f63c825862a12d1caa4790a139666c99b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 espeak-ng/buildlink3.mk                           |  2 +-
 espeak-ng/distinfo                                |  3 ++-
 espeak-ng/patches/patch-src_libespeak-ng_spect.c  |  2 +-
 espeak-ng/patches/patch-src_libespeak-ng_speech.c | 26 +++++++++++++++++++++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diffs:
diff --git a/espeak-ng/buildlink3.mk b/espeak-ng/buildlink3.mk
index 9dd3a99754..45211427cc 100644
--- a/espeak-ng/buildlink3.mk
+++ b/espeak-ng/buildlink3.mk
@@ -14,7 +14,7 @@ BUILDLINK_INCDIRS.espeak-ng?=		include/espeak-ng
 
 pkgbase := espeak-ng
 .include "../../mk/pkg-build-options.mk"
-.if !empty(PKG_BUILD_OPTIONS.espeak-ng:Msonic)
+.if ${PKG_BUILD_OPTIONS.espeak-ng:Msonic}
 .  include "../../audio/sonic/buildlink3.mk"
 .endif
 
diff --git a/espeak-ng/distinfo b/espeak-ng/distinfo
index 5fb653bde5..5e0036c50c 100644
--- a/espeak-ng/distinfo
+++ b/espeak-ng/distinfo
@@ -3,4 +3,5 @@ $NetBSD$
 BLAKE2s (1.51.tar.gz) = 7e95a1f9619984f4b349c48146a4a7a3f50f359d7043366edb1c447089b1e383
 SHA512 (1.51.tar.gz) = 6c29275706d21de2d5fa393702d2f173fc05d2ce4e2f46f3bf9a2742b0a8f294177663df0d079188e31cc2541f2c21a64e09e8afffe95befab667a4d00429fd2
 Size (1.51.tar.gz) = 14260788 bytes
-SHA1 (patch-src_libespeak-ng_spect.c) = 90204d2c0b53b8e86422b62df0c4c6c851304246
+SHA1 (patch-src_libespeak-ng_spect.c) = 33f69d7ba5621796628477f5596e147db76e38e1
+SHA1 (patch-src_libespeak-ng_speech.c) = e4f906157b1fce54c19a740274573310b3f276fb
diff --git a/espeak-ng/patches/patch-src_libespeak-ng_spect.c b/espeak-ng/patches/patch-src_libespeak-ng_spect.c
index f93c8305cf..7415efd225 100644
--- a/espeak-ng/patches/patch-src_libespeak-ng_spect.c
+++ b/espeak-ng/patches/patch-src_libespeak-ng_spect.c
@@ -9,7 +9,7 @@ Fix endian.h inclusion on NetBSD
  #include <stdlib.h>
  #include <string.h>
 +
-+#ifdef __NetBSD__
++#ifdef HAVE_SYS_ENDIAN_H
 +#include <sys/endian.h>
 +#else
  #include <endian.h>
diff --git a/espeak-ng/patches/patch-src_libespeak-ng_speech.c b/espeak-ng/patches/patch-src_libespeak-ng_speech.c
new file mode 100644
index 0000000000..0f05b56ded
--- /dev/null
+++ b/espeak-ng/patches/patch-src_libespeak-ng_speech.c
@@ -0,0 +1,26 @@
+$NetBSD$
+
+* fifo_stop() creates a noticeable delay, call audio_object_flush() first.
+
+--- src/libespeak-ng/speech.c.orig	2022-04-02 19:24:41.000000000 +0000
++++ src/libespeak-ng/speech.c
+@@ -881,15 +881,14 @@ ESPEAK_API const char *espeak_TextToPhon
+ 
+ ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Cancel(void)
+ {
+-#ifdef USE_ASYNC
+-	fifo_stop();
+-	event_clear_all();
+-#endif
+-
+ #ifdef HAVE_PCAUDIOLIB_AUDIO_H
+ 	if ((my_mode & ENOUTPUT_MODE_SPEAK_AUDIO) == ENOUTPUT_MODE_SPEAK_AUDIO)
+ 		audio_object_flush(my_audio);
+ #endif
++#ifdef USE_ASYNC
++	fifo_stop();
++	event_clear_all();
++#endif
+ 	embedded_value[EMBED_T] = 0; // reset echo for pronunciation announcements
+ 
+ 	for (int i = 0; i < N_SPEECH_PARAM; i++)