Accepting request 972411 from science

- added fix-configure-1171.patch to fix configure step
- remove no longer needed patches:
  - espeak-ng-1.49.2-fix_no_return_nonvoid-in-configure.patch
  - espeak-ng-1.50-fix_gcc10_no_common.patch
  - espeak-ng-1.50-fix_gcc10_no_common_2.patch
- update to version 1.51:
 -  Add support for speechPlayer.
 -  Add more tests to check the various parts of espeak-ng.
 -  Various changes to clean up the codebase (Juho Hiltunen)
 -  Remove support for l_length_mods language option
 -  Restructure "option brackets" language option to "brackets" and "bracketsAnnounced"
 -  Restructure "stressLength" and "stressAdd" language option
 -  New Language option: "lowercaseSentence" for ending a sentence if a period is followed by a lower case letter
 -  Add voice variants
 -  Rename zh to cmn (Mandarin)
 -  Rename zhy to yue (Cantonese)
 -  cmn (Mandarin) now assumes all latin characters all English text
    Use cmn-latn-pinyin for interpreting latin characters as pinyin
 -  Update list of voice varants for Android application
 -  Add Chromium extension (guest271314)
 -  Replace `ieee80.c` by a free software implementation (Ulrich Müller)
 - bug fixes:
 -  Fix reading malformed SSML (Christopher Brannon)
 -  Fix memory allocation (Christopher Brannon)
 -  Fix building and phoneme compilation (John Bowler)
 -  Fix build scripts for Android (Peter Vágner, Minas Tirith Citizen)
 - documentation:
 - Add documentation about voice and language options.
 - Add documentation about dictionary flags.
 - updated languages:
 -  ar (Arabic) -- king-dahmanus
 -  ba (Bashkir) -- boracasli98, Valdis Vitolins, Juho Hiltunen
 -  cmn (Mandarin) -- Silas S. Brown, Rongcui Dong, Icenowy Zheng, Juho Hiltunen
 -  de (German) -- Karl Eick, Henry Krumb
 -  el (Modern Greek) -- Reece Dunn (support for variant Greek letter forms)
 -  en (English) -- Steven Presser, Ben Talagan
 -  eo (Esperanto) -- AlsoScratch
 -  eu (Basque) -- agonzalezd
 -  fa (Farsi/Persian) -- Shadyar Khodayari
 -  ga (Gaelic (Irish)) Chen, Chien-ting
 -  grc (Ancient Greek) -- Reece Dunn (support for variant Greek letter forms)
 -  hak (Hakka Chinese) -- Juho Hiltunen
 -  haw (Hawaiian) -- Juho Hiltunen
 -  ka (Georgian) -- Juho Hiltunen
 -  kok (Konkani) -- Juho Hiltunen
 -  nb (Norwegian Bokmål) -- Juho Hiltunen
 -  nci (Classical Nahuatl) -- Juho Hiltunen
 -  hy (Armenian) -- tigransimonyan
 -  ia (Interlingua) -- nesrad
 -  it (Italian) -- Christian Leo
 -  ja (Japanese) -- fukuen, Juho Hiltunen
 -  jbo (Lojban) -- Juho Hiltunen, xunsku
 -  lv (Latvian) -- Valdis Vitolins
 -  mi (Māori) -- boracasli98
 -  py (Pyash) -- Andrii Logan Zvorygin
 -  shn (Shan Tay Yai) -- ronaldaug
 -  tr (Turkish) -- boracasli98, SeanTolstoyevski
 -  ur (Urdu) -- Ejaz Shah
 -  uz (Uzbek) -- boracasli98, Valdis Vitolins, Andiv06
 -  yue (Cantonese) -- Andiv06
 - new languages:
 -  be (Belarusian) -- Sergei B
 -  chr (Cherokee) -- Michael Conrad
 -  cv (Chuvash) -- boracasli98, Valdis Vitolins
 -  en-us-nyc (English, New York City) -- Richard Calvi
 -  haw (Hawaiian) -- Valdis Vitolins
 -  he (Hebrew) -- boracasli98, Valdis Vitolins
 -  io (Ido) -- José Miguel López, Valdis Vitolins
 -  lb (Luxembourgish) -- Marco Barnig, Valdis Vitolins
 -  ltg (Latgalian) -- Valdis Vitolins
 -  nog (Nogai) -- boracasli98, Valdis Vitolins
 -  piqd (Klingon) -- Valdis Vitolins
 -  qu (Quechua) -- Valdis Vitolins
 -  qdb (Lang Belta) -- Da Def, Valdis Vitolins
 -  qya (Quenya) -- Lucas Werkmeister
 -  sjn (Sindarin) -- Lucas Werkmeister
 -  smj (Lule Saami) -- Katri Hiovain, Sebastien Le Maguer
 -  th (Thai) -- Valdis Vitolins
 -  tk (Turkmen) -- boracasli98, Valdis Vitolins
 -  ug (Uyghur) -- boracasli98, Valdis Vitolins
 -  uk (Ukrainian) -- Valdis Vitolins

OBS-URL: https://build.opensuse.org/request/show/972411
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/espeak-ng?expand=0&rev=8
factory
Dominique Leuenberger 1 year ago committed by Git OBS Bridge
commit 783f359e71

@ -1,22 +0,0 @@
diff --git a/configure.ac b/configure.ac
index 33960c2..e449788 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,7 @@ AC_LANG_PUSH(C)
AC_MSG_CHECKING([if $CC supports C99 without any flags])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
- [[static inline int c99_restrict(int *restrict c99_restrict) {}]],
+ [[static inline int c99_restrict(int *restrict c99_restrict) { return 0; }]],
[[]])],
[AC_MSG_RESULT([yes])
have_c99_native=yes],
@@ -63,7 +63,7 @@ CFLAGS="$CFLAGS -std=c99"
AC_MSG_CHECKING([if $CC supports C99 with the -std=c99 flag])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
- [[static inline int c99_restrict(int *restrict c99_restrict) {}]],
+ [[static inline int c99_restrict(int *restrict c99_restrict) { return 0; }]],
[[]])],
[AC_MSG_RESULT([yes])
have_c99_c99=yes],

@ -1,22 +0,0 @@
From 5feff569cc8b6d5817f04d9c65a0bd736f82d67d Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Thu, 9 Jan 2020 18:47:52 +0000
Subject: [PATCH] fix #699: -Wlto-type-mismatch when using gcc with -flto=4.
---
src/libespeak-ng/setlengths.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libespeak-ng/setlengths.c b/src/libespeak-ng/setlengths.c
index a99159fc4..2e6b4fb7f 100644
--- a/src/libespeak-ng/setlengths.c
+++ b/src/libespeak-ng/setlengths.c
@@ -377,7 +377,7 @@ espeak_ng_STATUS SetParameter(int parameter, int value, int relative)
int new_value = value;
int default_value;
- extern const int *param_defaults;
+ extern const int param_defaults[N_SPEECH_PARAM];
if (relative) {
if (parameter < 5) {

@ -1,22 +0,0 @@
From e11cd42b03d1628f7a0cf45c9406123282e25c63 Mon Sep 17 00:00:00 2001
From: "Reece H. Dunn" <msclrhd@gmail.com>
Date: Thu, 9 Jan 2020 21:11:42 +0000
Subject: [PATCH] fix #699: avoid samplerate clashing with LTO in gcc 10.
---
src/espeak-ng.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/espeak-ng.c b/src/espeak-ng.c
index 10b8a8879..3a7838cf9 100644
--- a/src/espeak-ng.c
+++ b/src/espeak-ng.c
@@ -117,7 +117,7 @@ static const char *help_text =
"--load Load voice from a file in current directory by name.\n"
"-h, --help Show this help.\n";
-int samplerate;
+static int samplerate;
bool quiet = false;
unsigned int samples_total = 0;
unsigned int samples_split = 0;

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5ce9f24ee662b5822a4acc45bed31425e70d7c50707b96b6c1603a335c7759fa
size 13665536

BIN
espeak-ng-1.51.tar.gz (Stored with Git LFS)

Binary file not shown.

@ -1,3 +1,87 @@
-------------------------------------------------------------------
Sun Apr 24 17:25:17 UTC 2022 - Sebastian Wagner <sebix+novell.com@sebix.at>
- added fix-configure-1171.patch to fix configure step
- remove no longer needed patches:
- espeak-ng-1.49.2-fix_no_return_nonvoid-in-configure.patch
- espeak-ng-1.50-fix_gcc10_no_common.patch
- espeak-ng-1.50-fix_gcc10_no_common_2.patch
- update to version 1.51:
- Add support for speechPlayer.
- Add more tests to check the various parts of espeak-ng.
- Various changes to clean up the codebase (Juho Hiltunen)
- Remove support for l_length_mods language option
- Restructure "option brackets" language option to "brackets" and "bracketsAnnounced"
- Restructure "stressLength" and "stressAdd" language option
- New Language option: "lowercaseSentence" for ending a sentence if a period is followed by a lower case letter
- Add voice variants
- Rename zh to cmn (Mandarin)
- Rename zhy to yue (Cantonese)
- cmn (Mandarin) now assumes all latin characters all English text
Use cmn-latn-pinyin for interpreting latin characters as pinyin
- Update list of voice varants for Android application
- Add Chromium extension (guest271314)
- Replace `ieee80.c` by a free software implementation (Ulrich Müller)
- bug fixes:
- Fix reading malformed SSML (Christopher Brannon)
- Fix memory allocation (Christopher Brannon)
- Fix building and phoneme compilation (John Bowler)
- Fix build scripts for Android (Peter Vágner, Minas Tirith Citizen)
- documentation:
- Add documentation about voice and language options.
- Add documentation about dictionary flags.
- updated languages:
- ar (Arabic) -- king-dahmanus
- ba (Bashkir) -- boracasli98, Valdis Vitolins, Juho Hiltunen
- cmn (Mandarin) -- Silas S. Brown, Rongcui Dong, Icenowy Zheng, Juho Hiltunen
- de (German) -- Karl Eick, Henry Krumb
- el (Modern Greek) -- Reece Dunn (support for variant Greek letter forms)
- en (English) -- Steven Presser, Ben Talagan
- eo (Esperanto) -- AlsoScratch
- eu (Basque) -- agonzalezd
- fa (Farsi/Persian) -- Shadyar Khodayari
- ga (Gaelic (Irish)) Chen, Chien-ting
- grc (Ancient Greek) -- Reece Dunn (support for variant Greek letter forms)
- hak (Hakka Chinese) -- Juho Hiltunen
- haw (Hawaiian) -- Juho Hiltunen
- ka (Georgian) -- Juho Hiltunen
- kok (Konkani) -- Juho Hiltunen
- nb (Norwegian Bokmål) -- Juho Hiltunen
- nci (Classical Nahuatl) -- Juho Hiltunen
- hy (Armenian) -- tigransimonyan
- ia (Interlingua) -- nesrad
- it (Italian) -- Christian Leo
- ja (Japanese) -- fukuen, Juho Hiltunen
- jbo (Lojban) -- Juho Hiltunen, xunsku
- lv (Latvian) -- Valdis Vitolins
- mi (Māori) -- boracasli98
- py (Pyash) -- Andrii Logan Zvorygin
- shn (Shan Tay Yai) -- ronaldaug
- tr (Turkish) -- boracasli98, SeanTolstoyevski
- ur (Urdu) -- Ejaz Shah
- uz (Uzbek) -- boracasli98, Valdis Vitolins, Andiv06
- yue (Cantonese) -- Andiv06
- new languages:
- be (Belarusian) -- Sergei B
- chr (Cherokee) -- Michael Conrad
- cv (Chuvash) -- boracasli98, Valdis Vitolins
- en-us-nyc (English, New York City) -- Richard Calvi
- haw (Hawaiian) -- Valdis Vitolins
- he (Hebrew) -- boracasli98, Valdis Vitolins
- io (Ido) -- José Miguel López, Valdis Vitolins
- lb (Luxembourgish) -- Marco Barnig, Valdis Vitolins
- ltg (Latgalian) -- Valdis Vitolins
- nog (Nogai) -- boracasli98, Valdis Vitolins
- piqd (Klingon) -- Valdis Vitolins
- qu (Quechua) -- Valdis Vitolins
- qdb (Lang Belta) -- Da Def, Valdis Vitolins
- qya (Quenya) -- Lucas Werkmeister
- sjn (Sindarin) -- Lucas Werkmeister
- smj (Lule Saami) -- Katri Hiovain, Sebastien Le Maguer
- th (Thai) -- Valdis Vitolins
- tk (Turkmen) -- boracasli98, Valdis Vitolins
- ug (Uyghur) -- boracasli98, Valdis Vitolins
- uk (Ukrainian) -- Valdis Vitolins
-------------------------------------------------------------------
Thu Jan 9 21:35:09 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>

@ -1,7 +1,7 @@
#
# spec file for package espeak-ng
#
# Copyright (c) 2020 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,21 +18,23 @@
%define sover 1
Name: espeak-ng
Version: 1.50
Version: 1.51
Release: 0
Summary: Software speech synthesizer (text-to-speech)
License: GPL-3.0-or-later AND BSD-2-Clause AND Apache-2.0 AND Unicode-DFS-2015
License: Apache-2.0 AND BSD-2-Clause AND GPL-3.0-or-later AND Unicode-DFS-2015
URL: https://github.com/espeak-ng/espeak-ng
Source0: https://github.com/espeak-ng/espeak-ng/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch1: espeak-ng-1.49.2-fix_no_return_nonvoid-in-configure.patch
# PATCH-FIX-UPSTREAM espeak-ng-1.50-fix_gcc10_no_common.patch
Patch2: espeak-ng-1.50-fix_gcc10_no_common.patch
# PATCH-FIX_UPSTREAM espeak-ng-1.50-fix_gcc10_no_common_2.patch
Patch3: espeak-ng-1.50-fix_gcc10_no_common_2.patch
# PATCH-FIX_UPSTREAM fix-configure-1171.patch -- https://github.com/espeak-ng/espeak-ng/issues/1171
Patch0: https://github.com/espeak-ng/espeak-ng/commit/a25849e4d54a23ae1294b129d5696ca7e144ec8b.patch#/fix-configure-1171.patch
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libtool >= 2.4.2
BuildRequires: pcaudiolib-devel
BuildRequires: pkgconfig
BuildRequires: rubygem(kramdown)
#SECTION docs
BuildRequires: rubygem(ronn)
#/SECTION
%description
The eSpeak NG (Next Generation) Text-to-Speech program is a speech
@ -61,6 +63,7 @@ This package contains executables compatible with the original espeak.
Summary: Development files for espeak-ng compatible with espeak
Requires: %{name}-compat = %{version}
Requires: espeak-ng-devel = %{version}
Requires: libespeak-ng%{sover} = %{version}
Conflicts: espeak-devel
%description compat-devel
@ -74,6 +77,15 @@ Summary: Software speech synthesizer (text-to-speech)
Software speech synthesizer (text-to-speech), support
library.
%package vim
Summary: Vim syntax highlighting for espeak-ng data files
Requires: %{name} = %{version}-%{release}
Supplements: (%{name} and vim)
BuildArch: noarch
%description vim
Optional files for syntax highlighting for espeak-ng data files in vim.
%prep
%autosetup -p1
# let's have a versioned data dir
@ -83,12 +95,10 @@ chmod -x espeak-ng-data/lang/tai/shn
%build
./autogen.sh
%configure \
--with-extdict-ru \
--with-extdict-zh \
--with-extdict-zhy
%configure
# build is not parallel-safe
make V=1
%make_build
LC_ALL=C.UTF-8 make docs
%install
%make_install
@ -96,17 +106,23 @@ find %{buildroot} \( -name *.a -o -name *.la -o -name libespeak-ng-test* \) -del
pushd %{buildroot}%{_libdir}
ln -s lib%{name}.so.%{sover} libespeak.so
popd
mv %{buildroot}%{_datadir}/vim/addons %{buildroot}%{_datadir}/vim/vimfiles
rm -vrf %{buildroot}%{_datadir}/vim/registry
%fdupes %{buildroot}
%check
ESPEAK_DATA_PATH=`pwd` LD_LIBRARY_PATH=src:${LD_LIBRARY_PATH} src/espeak-ng ...
%post -n lib%{name}%{sover} -p /sbin/ldconfig
%postun -n lib%{name}%{sover} -p /sbin/ldconfig
%files
%doc CHANGELOG.md README.md
%license COPYING COPYING.APACHE COPYING.BSD2 COPYING.IEEE COPYING.UCD
%license COPYING COPYING.APACHE COPYING.BSD2 COPYING.UCD
%{_bindir}/espeak-ng
%{_bindir}/speak-ng
%{_datadir}/vim
%{_mandir}/man1/speak-ng.1%{?ext_man}
%{_mandir}/man1/espeak-ng.1%{?ext_man}
%files devel
%exclude %{_includedir}/espeak
@ -126,4 +142,13 @@ popd
%{_datadir}/espeak-ng-data-%{version}
%{_libdir}/lib%{name}.so.%{sover}*
%files vim
%dir %{_datadir}/vim
%dir %{_datadir}/vim/vimfiles
%dir %{_datadir}/vim/vimfiles/ftdetect
%dir %{_datadir}/vim/vimfiles/syntax
%{_datadir}/vim/vimfiles/ftdetect/espeakfiletype.vim
%{_datadir}/vim/vimfiles/syntax/espeaklist.vim
%{_datadir}/vim/vimfiles/syntax/espeakrules.vim
%changelog

@ -0,0 +1,32 @@
From a25849e4d54a23ae1294b129d5696ca7e144ec8b Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sun, 24 Apr 2022 18:46:24 +0200
Subject: [PATCH] configure.ac: Fix inline function test
fixes #1171
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7af4dc971..05a4a4024 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,7 +97,7 @@ AC_LANG_PUSH(C)
AC_MSG_CHECKING([if $CC supports C99 without any flags])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
- [[static inline int c99_restrict(int *restrict c99_restrict) {}]],
+ [[static inline void c99_restrict(int *restrict c99_restrict) {}]],
[[]])],
[AC_MSG_RESULT([yes])
have_c99_native=yes],
@@ -111,7 +111,7 @@ CFLAGS="$CFLAGS -std=c99"
AC_MSG_CHECKING([if $CC supports C99 with the -std=c99 flag])
AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM(
- [[static inline int c99_restrict(int *restrict c99_restrict) {}]],
+ [[static inline void c99_restrict(int *restrict c99_restrict) {}]],
[[]])],
[AC_MSG_RESULT([yes])
have_c99_c99=yes],
Loading…
Cancel
Save