From 9d5f9a3efe01a06c101f43dd288df91132dc622b Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 13 Sep 2020 18:47:42 +0200 Subject: [PATCH 1/4] distro: remove espeak --- distributions/LibreELEC/options | 3 --- 1 file changed, 3 deletions(-) diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options index 7b4bfb6efe..bbcb00d8ac 100644 --- a/distributions/LibreELEC/options +++ b/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" From 064d5b94cf460ae59dcb9a40777467f95c7cc279 Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 13 Sep 2020 22:16:57 +0200 Subject: [PATCH 2/4] ARM: remove espeak --- projects/ARM/options | 3 --- 1 file changed, 3 deletions(-) diff --git a/projects/ARM/options b/projects/ARM/options index e9b2b7e588..09baedc076 100644 --- a/projects/ARM/options +++ b/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" From 0d2e34a8dc80a4b50c6024637532be676a9a20ea Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 13 Sep 2020 22:17:07 +0200 Subject: [PATCH 3/4] kodi: remove espeak --- packages/mediacenter/kodi/package.mk | 4 ---- 1 file changed, 4 deletions(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index c97ff37395..5553402e1f 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/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" From 236a8e12bbf104e0845c2519372b83d8329a4083 Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 13 Sep 2020 22:17:43 +0200 Subject: [PATCH 4/4] espeak: remove package --- packages/audio/espeak/package.mk | 31 ------------------- .../patches/espeak-1.47-ftbs-ld-libm.patch | 23 -------------- .../patches/espeak-1.47-wav-close.patch | 23 -------------- .../patches/espeak-1.48-gcc-6-fix.patch | 12 ------- 4 files changed, 89 deletions(-) delete mode 100644 packages/audio/espeak/package.mk delete mode 100644 packages/audio/espeak/patches/espeak-1.47-ftbs-ld-libm.patch delete mode 100644 packages/audio/espeak/patches/espeak-1.47-wav-close.patch delete mode 100644 packages/audio/espeak/patches/espeak-1.48-gcc-6-fix.patch diff --git a/packages/audio/espeak/package.mk b/packages/audio/espeak/package.mk deleted file mode 100644 index 8fbccc15c2..0000000000 --- a/packages/audio/espeak/package.mk +++ /dev/null @@ -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 -} diff --git a/packages/audio/espeak/patches/espeak-1.47-ftbs-ld-libm.patch b/packages/audio/espeak/patches/espeak-1.47-ftbs-ld-libm.patch deleted file mode 100644 index 446493fb40..0000000000 --- a/packages/audio/espeak/patches/espeak-1.47-ftbs-ld-libm.patch +++ /dev/null @@ -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 - diff --git a/packages/audio/espeak/patches/espeak-1.47-wav-close.patch b/packages/audio/espeak/patches/espeak-1.47-wav-close.patch deleted file mode 100644 index d0550d9458..0000000000 --- a/packages/audio/espeak/patches/espeak-1.47-wav-close.patch +++ /dev/null @@ -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); - } diff --git a/packages/audio/espeak/patches/espeak-1.48-gcc-6-fix.patch b/packages/audio/espeak/patches/espeak-1.48-gcc-6-fix.patch deleted file mode 100644 index 6e59c7892f..0000000000 --- a/packages/audio/espeak/patches/espeak-1.48-gcc-6-fix.patch +++ /dev/null @@ -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)