From 134f1b005605a940004f4d3140f09f77ff13b88b Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Wed, 11 Jun 2025 10:30:50 +0000
Subject: [PATCH] espeak-ng: update to githash 348599e and use upstreamed
 patches

- https://github.com/espeak-ng/espeak-ng pull 2223
- https://github.com/espeak-ng/espeak-ng pull 2224
---
 packages/audio/espeak-ng/package.mk           | 13 +++----
 ...k-ng-0001-allow-build-of-intonations.patch | 20 ----------
 ...espeak-ng-0002-find-and-link-pthread.patch | 38 -------------------
 3 files changed, 6 insertions(+), 65 deletions(-)
 delete mode 100644 packages/audio/espeak-ng/patches/espeak-ng-0001-allow-build-of-intonations.patch
 delete mode 100644 packages/audio/espeak-ng/patches/espeak-ng-0002-find-and-link-pthread.patch

diff --git a/packages/audio/espeak-ng/package.mk b/packages/audio/espeak-ng/package.mk
index ea89a3d37c..bd070246e5 100644
--- a/packages/audio/espeak-ng/package.mk
+++ b/packages/audio/espeak-ng/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="espeak-ng"
-PKG_VERSION="a06074c8fd80f2fd3632164dc01ebf1135395e11"
-PKG_SHA256="6e5ab2c975b46ad126f74f57de9b0a543f301b42d97965710ba81105a6d75232"
+PKG_VERSION="348599e02bf0db105ac6fd07693e4047f614a58e"
+PKG_SHA256="f12884158f1e6c3727bcc340f2459a0a5481f8e02f7c35dbd69dae936f064d1c"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/espeak-ng/espeak-ng"
 PKG_URL="https://github.com/espeak-ng/espeak-ng/archive/${PKG_VERSION}.tar.gz"
@@ -13,18 +13,17 @@ PKG_LONGDESC="eSpeak NG is an open source speech synthesizer that supports more
 PKG_BUILD_FLAGS="+pic"
 
 PKG_CMAKE_OPTS_HOST="-DBUILD_SHARED_LIBS=OFF \
-                     -DCOMPILE_INTONATIONS=ON \
+                     -DCOMPILE_INTONATIONS=OFF \
                      -DENABLE_TESTS=OFF"
 
 PKG_CMAKE_OPTS_TARGET="-DBUILD_SHARED_LIBS=ON \
-                       -DCOMPILE_INTONATIONS=OFF \
-                       -DENABLE_TESTS=OFF"
+                       -DCOMPILE_INTONATIONS=ON \
+                       -DENABLE_TESTS=OFF \
+                       -DNativeBuild_DIR=${TOOLCHAIN}/bin"
 
 post_makeinstall_target() {
   safe_remove ${INSTALL}/usr/share/vim
 
-  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
 }
diff --git a/packages/audio/espeak-ng/patches/espeak-ng-0001-allow-build-of-intonations.patch b/packages/audio/espeak-ng/patches/espeak-ng-0001-allow-build-of-intonations.patch
deleted file mode 100644
index 9ead87699b..0000000000
--- a/packages/audio/espeak-ng/patches/espeak-ng-0001-allow-build-of-intonations.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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()
- 
diff --git a/packages/audio/espeak-ng/patches/espeak-ng-0002-find-and-link-pthread.patch b/packages/audio/espeak-ng/patches/espeak-ng-0002-find-and-link-pthread.patch
deleted file mode 100644
index 78eeac8e71..0000000000
--- a/packages/audio/espeak-ng/patches/espeak-ng-0002-find-and-link-pthread.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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)