[packages/speech_tools] - updated to 2.5.0 - updated soname,as-needed,pulse patches - removed outdated alsa patch
qboosh
qboosh at pld-linux.org
Fri Apr 15 23:08:04 CEST 2022
commit 8e6996b3062e511318f924fd10f8127d79406fa2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Apr 15 23:08:14 2022 +0200
- updated to 2.5.0
- updated soname,as-needed,pulse patches
- removed outdated alsa patch
speech_tools-alsa.patch | 11 -----------
speech_tools-as-needed.patch | 10 +++++-----
speech_tools-pulse.patch | 25 +++++++++++--------------
speech_tools-soname.patch | 22 +++++++++++-----------
speech_tools.spec | 18 ++++++++----------
5 files changed, 35 insertions(+), 51 deletions(-)
---
diff --git a/speech_tools.spec b/speech_tools.spec
index 3cf2b1a..2571929 100644
--- a/speech_tools.spec
+++ b/speech_tools.spec
@@ -3,16 +3,15 @@
Summary: Edinburgh Speech Tools Library
Summary(pl.UTF-8): Biblioteka narzędzi mowy Edinburgh
Name: speech_tools
-Version: 2.4
+Version: 2.5.0
Release: 1
License: distributable
Group: Applications/Sound
-Source0: http://www.festvox.org/packed/festival/2.4/%{name}-%{version}-release.tar.gz
-# Source0-md5: 3d60e563135363eb2548d947f7ef4e14
+Source0: http://www.festvox.org/packed/festival/2.5/%{name}-%{version}-release.tar.gz
+# Source0-md5: bd6edc8de6548592faffd184b67b0668
Patch0: %{name}-shared.patch
Patch1: %{name}-soname.patch
Patch2: %{name}-bin_printf.patch
-Patch3: %{name}-alsa.patch
Patch4: %{name}-as-needed.patch
Patch7: %{name}-link.patch
Patch8: %{name}-pulse.patch
@@ -79,7 +78,6 @@ Programy użytkowe narzędzi mowy Edinburgh.
%patch0 -p1
%patch1 -p1
%patch2 -p0
-%patch3 -p1
%patch4 -p1
%patch7 -p1
%patch8 -p1
@@ -164,11 +162,11 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc README
-%attr(755,root,root) %{_libdir}/libestbase.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libestbase.so.2.4
-%attr(755,root,root) %{_libdir}/libestools.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libestools.so.2.4
+%doc README.md
+%attr(755,root,root) %{_libdir}/libestbase.so.*.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libestbase.so.2.5.0
+%attr(755,root,root) %{_libdir}/libestools.so.*.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libestools.so.2.5.0
%attr(755,root,root) %{_libdir}/libeststring.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libeststring.so.1
%{_datadir}/%{name}
diff --git a/speech_tools-alsa.patch b/speech_tools-alsa.patch
deleted file mode 100644
index eadf963..0000000
--- a/speech_tools-alsa.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- speech_tools/configure.in.orig 2014-12-20 16:35:49.000000000 +0100
-+++ speech_tools/configure.in 2017-07-20 17:26:19.669578458 +0200
-@@ -85,7 +85,7 @@
- LINUXAUDIO=none
- AC_TRY_COMPILE([#include <alsa/version.h>],
- [int j=
-- #if SND_LIB_SUBMINOR >= 11
-+ #if (SND_LIB_MAJOR > 1) || ((SND_LIB_MAJOR == 1) && ((SND_LIB_MINOR > 0) || (SND_LIB_SUBMINOR >= 11)))
- 3;
- #endif],
- [LINUXAUDIO="alsa"])
diff --git a/speech_tools-as-needed.patch b/speech_tools-as-needed.patch
index 220304c..47b42fd 100644
--- a/speech_tools-as-needed.patch
+++ b/speech_tools-as-needed.patch
@@ -1,8 +1,8 @@
---- speech_tools/config/project.mak~ 2010-10-25 21:10:32.000000000 +0200
-+++ speech_tools/config/project.mak 2012-02-01 11:26:29.769223564 +0100
-@@ -108,6 +108,8 @@
- PROJECT_LIBRARY_VERSION_eststring = 1.2
- PROJECT_LIBRARY_VERSION_estjava = $(PROJECT_VERSION).1
+--- speech_tools/config/project.mak.orig 2022-04-15 21:22:09.909302724 +0200
++++ speech_tools/config/project.mak 2022-04-15 21:26:13.454649992 +0200
+@@ -112,6 +112,8 @@ PROJECT_LIBRARY_SOVERSION_estbase = $(PR
+ PROJECT_LIBRARY_SOVERSION_eststring = 1
+ PROJECT_LIBRARY_SOVERSION_estjava = $(PROJECT_VERSION)
+PROJECT_LIBRARY_NEEDS_SYSLIBS_estbase=1
+PROJECT_LIBRARY_NEEDS_SYSLIBS_estools=1
diff --git a/speech_tools-pulse.patch b/speech_tools-pulse.patch
index 18fb04c..0c09274 100644
--- a/speech_tools-pulse.patch
+++ b/speech_tools-pulse.patch
@@ -1,6 +1,5 @@
-diff -up speech_tools/audio/audioP.h.pulse speech_tools/audio/audioP.h
---- speech_tools/audio/audioP.h.pulse 2004-07-15 19:03:04.000000000 -0400
-+++ speech_tools/audio/audioP.h 2009-09-29 02:05:53.353695375 -0400
+--- speech_tools/audio/audioP.h.orig 2022-04-15 21:26:30.857889044 +0200
++++ speech_tools/audio/audioP.h 2022-04-15 21:27:25.887590923 +0200
@@ -40,6 +40,7 @@
#define __AUDIOP_H__
@@ -8,7 +7,7 @@ diff -up speech_tools/audio/audioP.h.pulse speech_tools/audio/audioP.h
+int play_pulse_wave(EST_Wave &inwave, EST_Option &al);
int play_esd_wave(EST_Wave &inwave, EST_Option &al);
int play_sun16_wave(EST_Wave &inwave, EST_Option &al);
- int play_voxware_wave(EST_Wave &inwave, EST_Option &al);
+ int play_linux_wave(EST_Wave &inwave, EST_Option &al);
@@ -49,6 +50,7 @@ int play_irix_wave(EST_Wave &inwave, EST
int play_macosx_wave(EST_Wave &inwave, EST_Option &al);
@@ -16,7 +15,7 @@ diff -up speech_tools/audio/audioP.h.pulse speech_tools/audio/audioP.h
+int record_pulse_wave(EST_Wave &inwave, EST_Option &al);
int record_esd_wave(EST_Wave &inwave, EST_Option &al);
int record_sun16_wave(EST_Wave &inwave, EST_Option &al);
- int record_voxware_wave(EST_Wave &inwave, EST_Option &al);
+ int record_linux_wave(EST_Wave &inwave, EST_Option &al);
diff -up speech_tools/audio/gen_audio.cc.pulse speech_tools/audio/gen_audio.cc
--- speech_tools/audio/gen_audio.cc.pulse 2004-09-30 08:53:35.000000000 -0400
+++ speech_tools/audio/gen_audio.cc 2009-09-29 02:05:53.354687890 -0400
@@ -68,18 +67,17 @@ diff -up speech_tools/audio/gen_audio.cc.pulse speech_tools/audio/gen_audio.cc
else if (upcase(protocol) == "ESDAUDIO")
return record_esd_wave(wave,al);
else if (upcase(protocol) == "SUN16AUDIO")
-diff -up speech_tools/audio/Makefile.pulse speech_tools/audio/Makefile
---- speech_tools/audio/Makefile.pulse 2004-07-15 19:03:04.000000000 -0400
-+++ speech_tools/audio/Makefile 2009-09-29 02:05:53.355692417 -0400
+--- speech_tools/audio/Makefile.orig 2022-04-15 21:27:49.414130135 +0200
++++ speech_tools/audio/Makefile 2022-04-15 21:29:15.460330649 +0200
@@ -44,7 +44,7 @@ LOCAL_DEFAULT_LIBRARY = estbase
H = audioP.h
- CPPSRCS = gen_audio.cc nas.cc esd.cc sun16audio.cc voxware.cc \
+ CPPSRCS = gen_audio.cc nas.cc esd.cc sun16audio.cc \
mplayer.cc win32audio.cc irixaudio.cc os2audio.cc \
- macosxaudio.cc linux_sound.cc
+ macosxaudio.cc linux_sound.cc pulseaudio.cc
SRCS = $(CPPSRCS)
- OBJS = $(CPPSRCS:.cc=.o)
+ OBJS = $(SRCS:.cc=.o)
diff -up /dev/null speech_tools/audio/pulseaudio.cc
--- /dev/null 2009-09-29 00:23:01.118964058 -0400
+++ speech_tools/audio/pulseaudio.cc 2009-09-29 02:05:53.357688202 -0400
@@ -218,11 +216,10 @@ diff -up /dev/null speech_tools/audio/pulseaudio.cc
+}
+
+#endif
-diff -up speech_tools/config/config.in.pulse speech_tools/config/config.in
---- speech_tools/config/config.in.pulse 2009-09-29 02:05:53.045693311 -0400
-+++ speech_tools/config/config.in 2009-09-29 02:05:53.358687421 -0400
+--- speech_tools/config/config.in.orig 2022-04-15 21:29:43.376846079 +0200
++++ speech_tools/config/config.in 2022-04-15 21:35:41.334906854 +0200
@@ -79,6 +79,9 @@ OPTIMISE_sigpr = 3
- ## NCD's network audio system, This is recommended.
+ ## NCD's network audio system.
# INCLUDE_MODULES += NAS_AUDIO
+## PulseAudio sound server
diff --git a/speech_tools-soname.patch b/speech_tools-soname.patch
index f377b46..b1f858c 100644
--- a/speech_tools-soname.patch
+++ b/speech_tools-soname.patch
@@ -1,10 +1,10 @@
---- speech_tools-orig/config/compilers/gcc_defaults.mak Tue Apr 22 02:24:57 2003
-+++ speech_tools/config/compilers/gcc_defaults.mak Tue Apr 22 02:25:19 2003
-@@ -78,7 +78,7 @@
- SHARED_LINKFLAGS = -fno-shared-data
-
+--- speech_tools/config/compilers/gcc_defaults.mak.orig 2022-04-15 20:41:26.185874843 +0200
++++ speech_tools/config/compilers/gcc_defaults.mak 2022-04-15 20:45:16.744625799 +0200
+@@ -83,7 +83,7 @@ SHARED_LINKFLAGS =
ifndef GCC_MAKE_SHARED_LIB
-- MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
+ # Older versions of gcc might have required -fno-shared-data
+ # MAKE_SHARED_LIB = $(CXX) -shared -fno-shared-data -o XXX
+- MAKE_SHARED_LIB = $(CXX) -shared -o XXX
+ MAKE_SHARED_LIB = $(CXX) -shared -o XXX -Wl,-soname -Wl,YYY
else
MAKE_SHARED_LIB = $(GCC_MAKE_SHARED_LIB)
@@ -20,9 +20,9 @@
@$(RM) -f shared_space/*.o $@
@ln -s $@.$(PROJECT_LIBRARY_VERSION_$*) $@
---- speech_tools/config/project.mak.orig 2012-04-07 10:25:08.664304841 +0200
-+++ speech_tools/config/project.mak 2012-04-07 18:57:14.971998561 +0200
-@@ -107,6 +107,10 @@
+--- speech_tools/config/project.mak.orig 2022-04-15 20:45:46.624463926 +0200
++++ speech_tools/config/project.mak 2022-04-15 21:20:26.766528163 +0200
+@@ -107,6 +107,10 @@ PROJECT_LIBRARY_VERSION_estools = $(PROJ
PROJECT_LIBRARY_VERSION_estbase = $(PROJECT_VERSION).1
PROJECT_LIBRARY_VERSION_eststring = 1.2
PROJECT_LIBRARY_VERSION_estjava = $(PROJECT_VERSION).1
@@ -31,5 +31,5 @@
+PROJECT_LIBRARY_SOVERSION_eststring = 1
+PROJECT_LIBRARY_SOVERSION_estjava = $(PROJECT_VERSION)
- PROJECT_LIBRARY_NEEDS_SYSLIBS_estbase=1
- PROJECT_LIBRARY_NEEDS_SYSLIBS_estools=1
+ PROJECT_LIBRARY_NEEDS_SYSLIBS_estjava=1
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/speech_tools.git/commitdiff/8e6996b3062e511318f924fd10f8127d79406fa2
More information about the pld-cvs-commit
mailing list