CVS commit: pkgsrc/audio/espeak-ng

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Dec 26 11:45:01 UTC 2024

Modified Files:
        pkgsrc/audio/espeak-ng: Makefile PLIST distinfo
        pkgsrc/audio/espeak-ng/patches: patch-src_include_compat_wctype.h
            patch-src_libespeak-ng_speech.c

Log Message:
espeak-ng: update to 1.52.0.

### 1.52.0

attention! this is the last release witch support the autoconf build system. use cmake to compile espeak-ng.

*  added cmake build system  -- djphoenix
*  Added stress marks to phoneme events -- Rotem Dan

bug fixes:
*  a meny fixes to core C code -- djphoenix

android:
*  Added directBoot support -- beqabeqa473
*  Integrated ndk-build step into main gradle pipeline

updated languages:
*  ba (Bashkir) -- Andiv06
*  be (Belarusian) -- Andiv06, bespsm, Alaksiej Stankievič
*  cmn (Mandarin) -- Cameron Wong
*  en (English) -- Bill Dengler
*  es (Spanish) -- Sukil Etxenike, Rmcpantoja, gregodejesus
*  fa (Persian) -- MH
*  gn (Guarani) -- Andiv06
*  he (Hebrew) -- Omer I.S, Andiv06
*  it (Italian) -- Christian Leo Mameli
*  ja (Japanese) -- Karl Eick
*  kl (Greenlandic) -- Andiv06
*  ky (Kyrgyz) -- Andiv06, Valdis Vitolins
*  lv (Latvian) -- Valdis Vitolins
*  nog (Nogai) -- Andiv06, boracasli98
*  qdb (Lang Belta) -- Andiv06
*  qya (Quenya) -- Andiv06
*  quc (K'iche') -- Andiv06
*  ro (Romanian) -- Andiv06
*  ru (Russian) -- Kirill-jjj, a11cf0
*  shn (Shan Tay Yai) -- ronaldaug
*  tk (Turkmen) -- Andiv06
*  tr (Turkish) -- Gurbuzguven, Qchristensen
*  uk (Ukrainian) -- Andrij Mizyk
*  uz (Uzbek) -- Andiv06

new languages:
*  en-Shaw (English, Shavian script) -- Luna Rose
*  ti (Tigrinya) -- Biniam Gebremichael
*  mto (Totontepec Mixe) -- Bill Dengler, Elizabeth Resendiz
*  fo (Faroese) -- Andras Eliassen, iSolveIT ApS and Setur.fo/Ravnur
*  kaa (Karakalpak) -- atabekm
*  xex (Xextan) -- Filomena Rocca


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/espeak-ng/Makefile \
    pkgsrc/audio/espeak-ng/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/espeak-ng/PLIST
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/audio/espeak-ng/patches/patch-src_include_compat_wctype.h \
    pkgsrc/audio/espeak-ng/patches/patch-src_libespeak-ng_speech.c

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

Modified files:

Index: pkgsrc/audio/espeak-ng/Makefile
diff -u pkgsrc/audio/espeak-ng/Makefile:1.2 pkgsrc/audio/espeak-ng/Makefile:1.3
--- pkgsrc/audio/espeak-ng/Makefile:1.2 Mon Mar 25 17:18:35 2024
+++ pkgsrc/audio/espeak-ng/Makefile     Thu Dec 26 11:45:00 2024
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2024/03/25 17:18:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2024/12/26 11:45:00 wiz Exp $
 
-DISTNAME=      espeak-ng-1.51
+DISTNAME=      espeak-ng-1.52.0
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=espeak-ng/}
-GITHUB_TAG=    refs/tags/1.51
+GITHUB_TAG=    ${PKGVERSION_NOREV}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/espeak-ng/espeak-ng/
@@ -32,12 +32,6 @@ CONFIGURE_ARGS+=     CFLAGS=${CFLAGS:M*:Q}
 
 PKGCONFIG_OVERRIDE+=   espeak-ng.pc.in
 
-SUBST_CLASSES+=                mbrola
-SUBST_STAGE.mbrola=    pre-configure
-SUBST_FILES.mbrola=    src/libespeak-ng/synth_mbrola.c
-SUBST_SED.mbrola=      -e s,/usr/share/mbrola/%s/%s,${PREFIX}/share/mbrola/voices/%s/%s,g
-SUBST_MESSAGE.mbrola=  Fixing hardcoded mbrola path.
-
 # Makefile.am: error: required file './AUTHORS' not found
 pre-configure:
        set -e; cd ${WRKSRC} && touch AUTHORS NEWS && autoreconf -fi
Index: pkgsrc/audio/espeak-ng/distinfo
diff -u pkgsrc/audio/espeak-ng/distinfo:1.2 pkgsrc/audio/espeak-ng/distinfo:1.3
--- pkgsrc/audio/espeak-ng/distinfo:1.2 Mon Mar 25 17:18:08 2024
+++ pkgsrc/audio/espeak-ng/distinfo     Thu Dec 26 11:45:00 2024
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.2 2024/03/25 17:18:08 jperkin Exp $
+$NetBSD: distinfo,v 1.3 2024/12/26 11:45:00 wiz Exp $
 
-BLAKE2s (espeak-ng-1.51.tar.gz) = 7e95a1f9619984f4b349c48146a4a7a3f50f359d7043366edb1c447089b1e383
-SHA512 (espeak-ng-1.51.tar.gz) = 6c29275706d21de2d5fa393702d2f173fc05d2ce4e2f46f3bf9a2742b0a8f294177663df0d079188e31cc2541f2c21a64e09e8afffe95befab667a4d00429fd2
-Size (espeak-ng-1.51.tar.gz) = 14260788 bytes
+BLAKE2s (espeak-ng-1.52.0.tar.gz) = 84417ee04860dd7242871a7df724e547641bfd6d128df493cb7f1051d8b12fd7
+SHA512 (espeak-ng-1.52.0.tar.gz) = 28793503f2be00505c3fe1dada8197a4e2d3af0d143e31ef883130fe2685d048ae9dee8efab637cdbe972461d95e210d2277b8e8fed4ae580d0cca8b505b0662
+Size (espeak-ng-1.52.0.tar.gz) = 17739803 bytes
 SHA1 (patch-Makefile.am) = 734c3e1cc914cf9236eadf0e372ad7438845faa8
-SHA1 (patch-src_include_compat_wctype.h) = bfbea130635fe0f1368969e3eb5c406aa3f73bdc
-SHA1 (patch-src_libespeak-ng_spect.c) = 33f69d7ba5621796628477f5596e147db76e38e1
-SHA1 (patch-src_libespeak-ng_speech.c) = e4f906157b1fce54c19a740274573310b3f276fb
+SHA1 (patch-src_include_compat_wctype.h) = 747a271c5f8e431cf3a02a7d3ea29eda8870e354
+SHA1 (patch-src_libespeak-ng_speech.c) = 9424174bc4bc2f9947f6a280f4b3a16daf81670a

Index: pkgsrc/audio/espeak-ng/PLIST
diff -u pkgsrc/audio/espeak-ng/PLIST:1.1 pkgsrc/audio/espeak-ng/PLIST:1.2
--- pkgsrc/audio/espeak-ng/PLIST:1.1    Mon Mar 11 08:03:45 2024
+++ pkgsrc/audio/espeak-ng/PLIST        Thu Dec 26 11:45:00 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2024/03/11 08:03:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2024/12/26 11:45:00 wiz Exp $
 bin/espeak
 bin/espeak-ng
 bin/speak
@@ -38,6 +38,7 @@ share/espeak-ng-data/et_dict
 share/espeak-ng-data/eu_dict
 share/espeak-ng-data/fa_dict
 share/espeak-ng-data/fi_dict
+share/espeak-ng-data/fo_dict
 share/espeak-ng-data/fr_dict
 share/espeak-ng-data/ga_dict
 share/espeak-ng-data/gd_dict
@@ -61,6 +62,7 @@ share/espeak-ng-data/it_dict
 share/espeak-ng-data/ja_dict
 share/espeak-ng-data/jbo_dict
 share/espeak-ng-data/ka_dict
+share/espeak-ng-data/kaa_dict
 share/espeak-ng-data/kk_dict
 share/espeak-ng-data/kl_dict
 share/espeak-ng-data/kn_dict
@@ -82,6 +84,7 @@ share/espeak-ng-data/lang/art/py
 share/espeak-ng-data/lang/art/qdb
 share/espeak-ng-data/lang/art/qya
 share/espeak-ng-data/lang/art/sjn
+share/espeak-ng-data/lang/art/xex
 share/espeak-ng-data/lang/azc/nci
 share/espeak-ng-data/lang/bat/lt
 share/espeak-ng-data/lang/bat/ltg
@@ -100,6 +103,7 @@ share/espeak-ng-data/lang/dra/te
 share/espeak-ng-data/lang/esx/kl
 share/espeak-ng-data/lang/eu
 share/espeak-ng-data/lang/gmq/da
+share/espeak-ng-data/lang/gmq/fo
 share/espeak-ng-data/lang/gmq/is
 share/espeak-ng-data/lang/gmq/nb
 share/espeak-ng-data/lang/gmq/sv
@@ -111,6 +115,7 @@ share/espeak-ng-data/lang/gmw/en-GB-scot
 share/espeak-ng-data/lang/gmw/en-GB-x-gbclan
 share/espeak-ng-data/lang/gmw/en-GB-x-gbcwmd
 share/espeak-ng-data/lang/gmw/en-GB-x-rp
+share/espeak-ng-data/lang/gmw/en-Shaw
 share/espeak-ng-data/lang/gmw/en-US
 share/espeak-ng-data/lang/gmw/en-US-nyc
 share/espeak-ng-data/lang/gmw/lb
@@ -141,6 +146,7 @@ share/espeak-ng-data/lang/itc/la
 share/espeak-ng-data/lang/jpx/ja
 share/espeak-ng-data/lang/ko
 share/espeak-ng-data/lang/map/haw
+share/espeak-ng-data/lang/miz/mto
 share/espeak-ng-data/lang/myn/quc
 share/espeak-ng-data/lang/poz/id
 share/espeak-ng-data/lang/poz/mi
@@ -148,6 +154,9 @@ share/espeak-ng-data/lang/poz/ms
 share/espeak-ng-data/lang/qu
 share/espeak-ng-data/lang/roa/an
 share/espeak-ng-data/lang/roa/ca
+share/espeak-ng-data/lang/roa/ca-ba
+share/espeak-ng-data/lang/roa/ca-nw
+share/espeak-ng-data/lang/roa/ca-va
 share/espeak-ng-data/lang/roa/es
 share/espeak-ng-data/lang/roa/es-419
 share/espeak-ng-data/lang/roa/fr
@@ -164,6 +173,7 @@ share/espeak-ng-data/lang/sem/am
 share/espeak-ng-data/lang/sem/ar
 share/espeak-ng-data/lang/sem/he
 share/espeak-ng-data/lang/sem/mt
+share/espeak-ng-data/lang/sem/ti
 share/espeak-ng-data/lang/sit/cmn
 share/espeak-ng-data/lang/sit/cmn-Latn-pinyin
 share/espeak-ng-data/lang/sit/hak
@@ -175,6 +185,7 @@ share/espeak-ng-data/lang/tai/th
 share/espeak-ng-data/lang/trk/az
 share/espeak-ng-data/lang/trk/ba
 share/espeak-ng-data/lang/trk/cv
+share/espeak-ng-data/lang/trk/kaa
 share/espeak-ng-data/lang/trk/kk
 share/espeak-ng-data/lang/trk/ky
 share/espeak-ng-data/lang/trk/nog
@@ -190,6 +201,7 @@ share/espeak-ng-data/lang/urj/smj
 share/espeak-ng-data/lang/zle/be
 share/espeak-ng-data/lang/zle/ru
 share/espeak-ng-data/lang/zle/ru-LV
+share/espeak-ng-data/lang/zle/ru-cl
 share/espeak-ng-data/lang/zle/uk
 share/espeak-ng-data/lang/zls/bg
 share/espeak-ng-data/lang/zls/bs
@@ -243,8 +255,11 @@ share/espeak-ng-data/mbrola_ph/nl_phtran
 share/espeak-ng-data/mbrola_ph/nz1_phtrans
 share/espeak-ng-data/mbrola_ph/pl1_phtrans
 share/espeak-ng-data/mbrola_ph/pt1_phtrans
+share/espeak-ng-data/mbrola_ph/ptbr2xex_phtrans
 share/espeak-ng-data/mbrola_ph/ptbr4_phtrans
+share/espeak-ng-data/mbrola_ph/ptbr4xex_phtrans
 share/espeak-ng-data/mbrola_ph/ptbr_phtrans
+share/espeak-ng-data/mbrola_ph/ptbrxex_phtrans
 share/espeak-ng-data/mbrola_ph/ro1_phtrans
 share/espeak-ng-data/mbrola_ph/sv2_phtrans
 share/espeak-ng-data/mbrola_ph/sv_phtrans
@@ -259,6 +274,7 @@ share/espeak-ng-data/ml_dict
 share/espeak-ng-data/mr_dict
 share/espeak-ng-data/ms_dict
 share/espeak-ng-data/mt_dict
+share/espeak-ng-data/mto_dict
 share/espeak-ng-data/my_dict
 share/espeak-ng-data/nci_dict
 share/espeak-ng-data/ne_dict
@@ -297,6 +313,7 @@ share/espeak-ng-data/sw_dict
 share/espeak-ng-data/ta_dict
 share/espeak-ng-data/te_dict
 share/espeak-ng-data/th_dict
+share/espeak-ng-data/ti_dict
 share/espeak-ng-data/tk_dict
 share/espeak-ng-data/tn_dict
 share/espeak-ng-data/tr_dict
@@ -327,6 +344,7 @@ share/espeak-ng-data/voices/!v/Michael
 share/espeak-ng-data/voices/!v/Mike
 share/espeak-ng-data/voices/!v/Mr serious
 share/espeak-ng-data/voices/!v/Nguyen
+share/espeak-ng-data/voices/!v/Reed
 share/espeak-ng-data/voices/!v/RicishayMax
 share/espeak-ng-data/voices/!v/RicishayMax2
 share/espeak-ng-data/voices/!v/RicishayMax3
@@ -357,6 +375,7 @@ share/espeak-ng-data/voices/!v/fast
 share/espeak-ng-data/voices/!v/grandma
 share/espeak-ng-data/voices/!v/grandpa
 share/espeak-ng-data/voices/!v/gustave
+share/espeak-ng-data/voices/!v/ian
 share/espeak-ng-data/voices/!v/iven
 share/espeak-ng-data/voices/!v/iven2
 share/espeak-ng-data/voices/!v/iven3
@@ -382,6 +401,7 @@ share/espeak-ng-data/voices/!v/marcelo
 share/espeak-ng-data/voices/!v/max
 share/espeak-ng-data/voices/!v/michel
 share/espeak-ng-data/voices/!v/miguel
+share/espeak-ng-data/voices/!v/mike2
 share/espeak-ng-data/voices/!v/norbert
 share/espeak-ng-data/voices/!v/pablo
 share/espeak-ng-data/voices/!v/paul
@@ -412,9 +432,13 @@ share/espeak-ng-data/voices/mb/mb-af1-en
 share/espeak-ng-data/voices/mb/mb-ar1
 share/espeak-ng-data/voices/mb/mb-ar2
 share/espeak-ng-data/voices/mb/mb-br1
+share/espeak-ng-data/voices/mb/mb-br1-xex
 share/espeak-ng-data/voices/mb/mb-br2
+share/espeak-ng-data/voices/mb/mb-br2-xex
 share/espeak-ng-data/voices/mb/mb-br3
+share/espeak-ng-data/voices/mb/mb-br3-xex
 share/espeak-ng-data/voices/mb/mb-br4
+share/espeak-ng-data/voices/mb/mb-br4-xex
 share/espeak-ng-data/voices/mb/mb-ca1
 share/espeak-ng-data/voices/mb/mb-ca2
 share/espeak-ng-data/voices/mb/mb-cn1
@@ -497,6 +521,7 @@ share/espeak-ng-data/voices/mb/mb-us1
 share/espeak-ng-data/voices/mb/mb-us2
 share/espeak-ng-data/voices/mb/mb-us3
 share/espeak-ng-data/voices/mb/mb-vz1
+share/espeak-ng-data/xex_dict
 share/espeak-ng-data/yue_dict
 share/vim/addons/ftdetect/espeakfiletype.vim
 share/vim/addons/syntax/espeaklist.vim

Index: pkgsrc/audio/espeak-ng/patches/patch-src_include_compat_wctype.h
diff -u pkgsrc/audio/espeak-ng/patches/patch-src_include_compat_wctype.h:1.1 pkgsrc/audio/espeak-ng/patches/patch-src_include_compat_wctype.h:1.2
--- pkgsrc/audio/espeak-ng/patches/patch-src_include_compat_wctype.h:1.1        Mon Mar 25 17:18:08 2024
+++ pkgsrc/audio/espeak-ng/patches/patch-src_include_compat_wctype.h    Thu Dec 26 11:45:00 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-src_include_compat_wctype.h,v 1.1 2024/03/25 17:18:08 jperkin Exp $
+$NetBSD: patch-src_include_compat_wctype.h,v 1.2 2024/12/26 11:45:00 wiz Exp $
 
 Avoid breaking wctypes on illumos.
 
---- src/include/compat/wctype.h.orig   2024-03-25 17:06:14.205256009 +0000
+--- src/include/compat/wctype.h.orig   2024-12-12 13:28:01.000000000 +0000
 +++ src/include/compat/wctype.h
 @@ -32,6 +32,7 @@
  
@@ -12,10 +12,11 @@ Avoid breaking wctypes on illumos.
  #define iswalnum  ucd_isalnum
  #define iswalpha  ucd_isalpha
  #define iswblank  ucd_isblank
-@@ -44,5 +45,6 @@
+@@ -44,6 +45,7 @@
  #define iswspace  ucd_isspace
  #define iswupper  ucd_isupper
  #define iswxdigit ucd_isxdigit
+ #define tolower ucd_tolower
+ #define toupper udc_toupper
 +#endif
  
- #endif
Index: pkgsrc/audio/espeak-ng/patches/patch-src_libespeak-ng_speech.c
diff -u pkgsrc/audio/espeak-ng/patches/patch-src_libespeak-ng_speech.c:1.1 pkgsrc/audio/espeak-ng/patches/patch-src_libespeak-ng_speech.c:1.2
--- pkgsrc/audio/espeak-ng/patches/patch-src_libespeak-ng_speech.c:1.1  Mon Mar 11 08:03:45 2024
+++ pkgsrc/audio/espeak-ng/patches/patch-src_libespeak-ng_speech.c      Thu Dec 26 11:45:00 2024
@@ -1,26 +1,29 @@
-$NetBSD: patch-src_libespeak-ng_speech.c,v 1.1 2024/03/11 08:03:45 wiz Exp $
+$NetBSD: patch-src_libespeak-ng_speech.c,v 1.2 2024/12/26 11:45:00 wiz Exp $
 
 * 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.orig     2024-12-12 13:28:01.000000000 +0000
 +++ src/libespeak-ng/speech.c
-@@ -881,15 +881,14 @@ ESPEAK_API const char *espeak_TextToPhon
+@@ -872,17 +872,17 @@ ESPEAK_API const char *espeak_TextToPhon
  
  ESPEAK_NG_API espeak_ng_STATUS espeak_ng_Cancel(void)
  {
--#ifdef USE_ASYNC
+-#if USE_ASYNC
 -      fifo_stop();
 -      event_clear_all();
 -#endif
 -
- #ifdef HAVE_PCAUDIOLIB_AUDIO_H
+ #if USE_LIBPCAUDIO
        if ((my_mode & ENOUTPUT_MODE_SPEAK_AUDIO) == ENOUTPUT_MODE_SPEAK_AUDIO)
                audio_object_flush(my_audio);
  #endif
-+#ifdef USE_ASYNC
+       embedded_value[EMBED_T] = 0; // reset echo for pronunciation announcements
+ 
++#if 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++)
+               SetParameter(i, saved_parameters[i], 0);
+