Merge pull request #4556 from CvH/10.0/espeak

distro: remove espeak

distributions/LibreELEC/options

@@ -87,9 +87,6 @@
 # build and install PulseAudio support (yes / no)
   PULSEAUDIO_SUPPORT="yes"
 
-# build and install espeak support (yes / no)
-  ESPEAK_SUPPORT="yes"
-
 # build and install with BluRay support (yes / no)
   KODI_BLURAY_SUPPORT="yes"
 

packages/audio/espeak/package.mk

@@ -1,31 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-
-PKG_NAME="espeak"
-PKG_VERSION="1.48.04-source"
-PKG_SHA256="bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659"
-PKG_LICENSE="GPL"
-PKG_SITE="http://espeak.sourceforge.net/"
-PKG_URL="http://sourceforge.net/projects/espeak/files/espeak/espeak-1.48/$PKG_NAME-$PKG_VERSION.zip"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="Text to Speech engine for English, with support for other languages"
-PKG_TOOLCHAIN="manual"
-
-pre_make_target() {
-  cp src/portaudio19.h src/portaudio.h
-}
-
-make_target() {
-  make -C src \
-       CXXFLAGS="$CXXFLAGS" \
-       LDFLAGS="$LDFLAGS" \
-       AUDIO=""
-}
-
-makeinstall_target() {
-  make -C src \
-       CXXFLAGS="$CXXFLAGS" \
-       LDFLAGS="$LDFLAGS" \
-       AUDIO="" \
-       DESTDIR=$INSTALL install
-}

packages/audio/espeak/patches/espeak-1.47-ftbs-ld-libm.patch

@@ -1,23 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index f04b4c4..b8d4b19 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -83,15 +83,15 @@ libespeak_SOURCES = speak_lib.cpp compiledict.cpp dictionary.cpp intonation.cpp
- 
- SRCS1=$(speak_SOURCES)
- OBJS1=$(patsubst %.cpp,%.o,$(SRCS1))
--LIBS1=-lstdc++ $(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
-+LIBS1=-lstdc++ -lm $(LIB_AUDIO) -lpthread $(EXTRA_LIBS)
- 
- SRCS2=$(libespeak_SOURCES)
- OBJS2=$(patsubst %.cpp,x_%.o,$(SRCS2))
--LIBS2=-lstdc++ $(LIB_AUDIO) -lpthread
-+LIBS2=-lstdc++ -lm $(LIB_AUDIO) -lpthread
- 
- SRCS3 = espeak.cpp
- OBJS3=$(patsubst %.cpp,%.o,$(SRCS3))
--LIBS3=-lstdc++ -L . -lespeak
-+LIBS3=-lstdc++ -lm -L . -lespeak
- 
- CXXFLAGS=-O2
- 

packages/audio/espeak/patches/espeak-1.47-wav-close.patch

@@ -1,23 +0,0 @@
-diff --git a/src/espeak.cpp b/src/espeak.cpp
-index 00f93c1..4ad42e8 100644
---- a/src/espeak.cpp
-+++ b/src/espeak.cpp
-@@ -281,10 +281,7 @@ static int SynthCallback(short *wav, int numsamples, espeak_EVENT *events)
- 	if(quiet) return(0);  // -q quiet mode
- 
- 	if(wav == NULL)
--	{
--		CloseWavFile();
- 		return(0);
--	}
- 
- 	while(events->type != 0)
- 	{
-@@ -805,5 +802,7 @@ int main (int argc, char **argv)
- 
- 	if(f_phonemes_out != stdout)
- 		fclose(f_phonemes_out);  // needed for WinCE
-+	CloseWavFile();
-+	espeak_Terminate();
- 	return(0);
- }

packages/audio/espeak/patches/espeak-1.48-gcc-6-fix.patch

@@ -1,12 +0,0 @@
-diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp
---- a/src/tr_languages.cpp
-+++ b/src/tr_languages.cpp
-@@ -198,7 +198,7 @@ static const unsigned short chars_ignore_zwnj_hyphen[] = {
- 	0x200d,  1, // zero width joiner
- 	0, 0 };
- 
--const char string_ordinal[] = {0xc2,0xba,0};  // masculine ordinal character, UTF-8
-+const char string_ordinal[] = {'\xc2','\xba',0};  // masculine ordinal character, UTF-8
- 
- 
- static Translator* NewTranslator(void)

packages/mediacenter/kodi/package.mk

@@ -60,10 +60,6 @@ configure_package() {
     KODI_PULSEAUDIO="-DENABLE_PULSEAUDIO=OFF"
   fi
 
-  if [ "$ESPEAK_SUPPORT" = yes ]; then
-    PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET espeak"
-  fi
-
   if [ "$CEC_SUPPORT" = yes ]; then
     PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libcec"
     KODI_CEC="-DENABLE_CEC=ON"

projects/ARM/options

@@ -33,9 +33,6 @@
   # build and install PulseAudio support (yes / no)
     PULSEAUDIO_SUPPORT="yes"
 
-  # build and install espeak support (yes / no)
-    ESPEAK_SUPPORT="no"
-
   # build and install with BluRay support (yes / no)
     KODI_BLURAY_SUPPORT="no"