Compare commits

..

No commits in common. "c5567a17d95b1f526e33d03d646382997dae08e9" and "131080a977caca2ce153efcf137fe59e36f6bf4e" have entirely different histories.

5 changed files with 58 additions and 38 deletions

View File

@ -0,0 +1,25 @@
From b4400c86b7481cd8ffd6d1ae4dc62d0be29e1e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
Date: Fri, 9 Mar 2018 14:13:47 +0100
Subject: [PATCH] Make espeak-ng the default output module
---
config/speechd.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config/speechd.conf b/config/speechd.conf
index 140de3a..f99e3ce 100644
--- a/config/speechd.conf
+++ b/config/speechd.conf
@@ -240,7 +240,7 @@ DefaultVolume 100
# The DefaultModule selects which output module is the default. You
# must use one of the names of the modules loaded with AddModule.
-DefaultModule espeak
+DefaultModule espeak-ng
# The LanguageDefaultModule selects which output modules are prefered
# for specified languages.
--
2.14.3

View File

@ -1,15 +1,28 @@
--- speech-dispatcher-0.11.1/src/api/python/speechd_config/config.py~ 2022-01-08 16:36:58.000000000 -0600
+++ speech-dispatcher-0.11.1/src/api/python/speechd_config/config.py 2022-01-10 10:39:08.029069754 -0600
@@ -29,8 +29,6 @@
From 5ede80b0713c75b21925203c3ef389c86cb69e6d Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Fri, 20 Jul 2018 15:04:48 +0200
Subject: [PATCH] Remove pyxdg dependency
And use the same algorithm as GLib to determine the base user config
directory (XDG_CONFIG_HOME, then ~/.config then /tmp/$USERNAME/.config)
---
src/api/python/speechd_config/config.py.in | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/api/python/speechd_config/config.py.in b/src/api/python/speechd_config/config.py.in
index ccf8803..e8393e5 100644
--- a/src/api/python/speechd_config/config.py.in
+++ b/src/api/python/speechd_config/config.py.in
@@ -30,8 +30,6 @@ import socket
import sys
import time
-from xdg import BaseDirectory
-
# Configuration and sound data paths
from . import buildconfig
# Locale/gettext configuration
@@ -180,7 +178,16 @@
locale.setlocale(locale.LC_ALL, '')
@@ -167,7 +165,16 @@ class Tests:
def user_conf_dir(self):
"""Return user configuration directory"""
@ -27,3 +40,6 @@
def system_conf_dir(self):
"""Determine system configuration directory"""
--
2.17.1

Binary file not shown.

Binary file not shown.

View File

@ -1,16 +1,17 @@
Name: speech-dispatcher
Version: 0.11.1
Release: 1
Version: 0.8.8
Release: 9
Summary: Common high-level interface to speech synthesis
License: GPLv2+ and GPLv2
URL: http://devel.freebsoft.org/speechd
Source0: https://github.com/brailcom/speechd/releases/download/%{version}/speech-dispatcher-%{version}.tar.gz
Source0: http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-%{version}.tar.gz
Source1: http://www.freebsoft.org/pub/projects/sound-icons/sound-icons-0.1.tar.gz
Source2: speech-dispatcherd.service
Patch0001: 0001-Remove-pyxdg-dependency.patch
BuildRequires: alsa-lib-devel desktop-file-utils dotconf-devel espeak-ng-devel flite-devel
BuildRequires: glib2-devel intltool libao-devel libtool-ltdl-devel libsndfile-devel pulseaudio
BuildRequires: pulseaudio-libs-devel python3-devel python3-setuptools texinfo systemd gcc gcc-c++ make
Patch0001: 0001-Make-espeak-ng-the-default-output-module.patch
Patch0002: 0001-Remove-pyxdg-dependency.patch
BuildRequires: alsa-lib-devel desktop-file-utils dotconf-devel espeak-ng-devel flite-devel
BuildRequires: glib2-devel intltool libao-devel libtool-ltdl-devel libsndfile-devel
BuildRequires: pulseaudio-libs-devel python3-devel python3-setuptools texinfo systemd git
Provides: speech-dispatcher-utils = %{version}-%{release}
Obsoletes: speech-dispatcher-utils < %{version}-%{release}
Requires: python3-speechd = %{version}-%{release} speech-dispatcher-espeak-ng
@ -77,17 +78,12 @@ Requires: speech-dispatcher = %{version}-%{release}
Python v3 module for speech-dispatcher
%prep
%autosetup -n speech-dispatcher-%{version} -p1
%autosetup -n speech-dispatcher-%{version} -S git
tar xf %{SOURCE1}
%build
%configure --with-alsa --with-pulse --with-libao --without-oss --without-nas --with-flite --without-espeak \
--with-espeak-ng --sysconfdir=%{_sysconfdir} --with-default-audio-method=pulse \
--with-kali=no --with-baratinoo=no --with-voxin=no \
--with-module-bindir=%{_libdir}/speech-dispatcher-modules/
--with-espeak-ng --sysconfdir=%{_sysconfdir} --with-default-audio-method=pulse
%make_build V=1
%install
%make_install
install -d %{buildroot}%{_unitdir}
@ -140,8 +136,7 @@ if [ $1 = 0 ]; then
fi
%files -f speech-dispatcher.lang
%license COPYING.LGPL COPYING.GPL-2 COPYING.GPL-3
%doc NEWS README.md
%doc COPYING NEWS README
%dir %{_sysconfdir}/speech-dispatcher/{clients,modules}
%config(noreplace) %{_sysconfdir}/speech-dispatcher/speechd.conf
%config(noreplace) %{_sysconfdir}/speech-dispatcher/clients/*.conf
@ -169,7 +164,6 @@ fi
%files espeak-ng
%config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/espeak-ng.conf
%{_libdir}/speech-dispatcher-modules/sd_espeak-ng
%{_libdir}/speech-dispatcher-modules/sd_espeak-ng-mbrola
%files festival
%config(noreplace) %{_sysconfdir}/speech-dispatcher/modules/festival.conf
@ -183,20 +177,5 @@ fi
%{python3_sitearch}/speechd*
%changelog
* Wed Oct 26 2022 liyanan <liyanan32@h-partners.com> - 0.11.1-1
- Update package
* Thu Jan 06 2022 Chen Chen <chen_aka_jan@163.com> - 0.8.8-13
- add buildrequires pulseaudio for fix build error
* Sat Jul 31 2021 chenyanpanHW <chenyanpan@huawei.com> - 0.8.8-12
- DESC: delete -S git from %autosetup, and delete BuildRequires git
* Fri Jul 30 2021 yaokai <yaokai13@huawei.com> - 0.8.8-11
- Fix global variable gcc10
* Mon May 31 2021 huanghaitao <huanghaitao8@huawei.com> - 0.8.8-10
- Completing build dependencies to fix gcc compiler missing error
* Sat Nov 30 2019 Ling Yang <lingyang2@huawei.com> - 0.8.8-9
- Package init