Merge pull request #10136 from heitbaum/espeak

espeak-ng: update to githash a06074c and use cmake

distributions/LibreELEC/options

@@ -119,7 +119,7 @@
   PIPEWIRE_SUPPORT="no"
 
 # build and install eSpeak-NG support (yes / no)
-  ESPEAK_SUPPORT="no"
+  ESPEAK_SUPPORT="yes"
 
 # build and install with BluRay support (yes / no)
   KODI_BLURAY_SUPPORT="yes"

packages/audio/espeak-ng/package.mk

@@ -2,37 +2,29 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="espeak-ng"
-PKG_VERSION="1.52.0"
+PKG_VERSION="a06074c8fd80f2fd3632164dc01ebf1135395e11"
-PKG_SHA256="bb4338102ff3b49a81423da8a1a158b420124b055b60fa76cfb4b18677130a23"
+PKG_SHA256="6e5ab2c975b46ad126f74f57de9b0a543f301b42d97965710ba81105a6d75232"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/espeak-ng/espeak-ng"
-PKG_URL="https://github.com/espeak-ng/espeak-ng/archive/refs/tags/${PKG_VERSION}.tar.gz"
+PKG_URL="https://github.com/espeak-ng/espeak-ng/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="gcc:host"
 PKG_DEPENDS_TARGET="toolchain espeak-ng:host"
 PKG_LONGDESC="eSpeak NG is an open source speech synthesizer that supports more than a hundred languages and accents"
-PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="+pic"
 
-make_host() {
+PKG_CMAKE_OPTS_HOST="-DBUILD_SHARED_LIBS=OFF \
-  mkdir phsource dictsource
+                     -DCOMPILE_INTONATIONS=ON \
-  (
+                     -DENABLE_TESTS=OFF"
-    cd dictsource
-    ln -s ../../dictsource/* .
-  )
-  (
-    cd phsource
-    ln -s ../../phsource/* .
-  )
-  cp -aP ../espeak-ng-data .
-  make DESTDIR=$(pwd) -j1
-}
 
-make_target() {
+PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=ON \
-  make src/espeak-ng src/speak-ng
+                       -DCOMPILE_INTONATIONS=OFF \
-}
+                       -DENABLE_TESTS=OFF"
+
+post_makeinstall_target() {
+  safe_remove ${INSTALL}/usr/share/vim
 
-makeinstall_target() {
-  make src/espeak-ng src/speak-ng
-  make install-exec DESTDIR=${INSTALL}
   mkdir -p ${INSTALL}/usr/share/espeak-ng-data
   cp -prf ${TOOLCHAIN}/share/espeak-ng-data ${INSTALL}/usr/share
+  # add symlink for backwards compatibility with old programs
+  ln -sf espeak-ng ${INSTALL}/usr/bin/espeak
 }

packages/audio/espeak-ng/patches/espeak-ng-0001-allow-build-of-intonations.patch

@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt	2025-05-31 11:45:48.000000000 +0000
++++ b/CMakeLists.txt	2025-06-09 11:10:14.439292321 +0000
+@@ -15,7 +15,7 @@
+ include(cmake/deps.cmake)
+ include(cmake/config.cmake)
+ add_subdirectory(src)
+-if (COMPILE_INTONATIONS AND NOT CMAKE_CROSSCOMPILING)
++if (COMPILE_INTONATIONS)
+   include(cmake/data.cmake)
+ endif()
+ include(cmake/docs.cmake)
+@@ -23,7 +23,7 @@
+ include(cmake/package.cmake)
+ include(CPack)
+ 
+-if(ENABLE_TESTS AND NOT CMAKE_CROSSCOMPILING)
++if(ENABLE_TESTS)
+   add_subdirectory(tests)
+ endif()
+ 

packages/audio/espeak-ng/patches/espeak-ng-0002-find-and-link-pthread.patch

@@ -0,0 +1,38 @@
+diff --git a/cmake/deps.cmake b/cmake/deps.cmake
+index b63ced21ba89..95498cdb32d5 100644
+--- a/cmake/deps.cmake
++++ b/cmake/deps.cmake
+@@ -2,14 +2,15 @@ find_library(SONIC_LIB sonic)
+ find_path(SONIC_INC "sonic.h")
+ find_library(PCAUDIO_LIB pcaudio)
+ find_path(PCAUDIO_INC "pcaudiolib/audio.h")
+-find_library(PTHREAD_LIB pthread)
++set(THREADS_PREFER_PTHREAD_FLAG ON)
++find_package(Threads)
+ find_program(MBROLA_BIN mbrola)
+ 
+ include(FetchContent)
+ 
+-if (PTHREAD_LIB)
++if (CMAKE_USE_PTHREADS_INIT)
+   set(HAVE_PTHREAD ON)
+-endif(PTHREAD_LIB)
++endif(CMAKE_USE_PTHREADS_INIT)
+ if (MBROLA_BIN)
+   set(HAVE_MBROLA ON)
+ endif(MBROLA_BIN)
+diff --git a/src/libespeak-ng/CMakeLists.txt b/src/libespeak-ng/CMakeLists.txt
+index dd01aeb2d7c8..bb39dc281ca8 100644
+--- a/src/libespeak-ng/CMakeLists.txt
++++ b/src/libespeak-ng/CMakeLists.txt
+@@ -109,6 +109,10 @@ if (HAVE_LIBPCAUDIO AND USE_LIBPCAUDIO)
+   endif()
+ endif()
+ 
++if (HAVE_PTHREAD)
++  target_link_libraries(espeak-ng PRIVATE Threads::Threads)
++endif()
++
+ target_link_libraries(espeak-ng PRIVATE espeak-ng-config ucd)
+ if (NOT MSVC)
+   target_link_libraries(espeak-ng PRIVATE m)